diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-12-20 19:02:42 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-12-20 19:02:42 +0800 |
| commit | 9e3581b15da1ca2f16eb75c34650d1dd9350922e (patch) | |
| tree | 39733a7f2f2d9d829bace29bcd2122bf3389a7b7 | |
| parent | 83d97469cd2ab30c8ca40e9c622abaa3bfb26189 (diff) | |
| download | marcuscom-ports-9e3581b15da1ca2f16eb75c34650d1dd9350922e.tar marcuscom-ports-9e3581b15da1ca2f16eb75c34650d1dd9350922e.tar.gz marcuscom-ports-9e3581b15da1ca2f16eb75c34650d1dd9350922e.tar.bz2 marcuscom-ports-9e3581b15da1ca2f16eb75c34650d1dd9350922e.tar.lz marcuscom-ports-9e3581b15da1ca2f16eb75c34650d1dd9350922e.tar.xz marcuscom-ports-9e3581b15da1ca2f16eb75c34650d1dd9350922e.tar.zst marcuscom-ports-9e3581b15da1ca2f16eb75c34650d1dd9350922e.zip | |
Stageify, and misc small cleanups.
Move net/libgweather3 -> net/libgweather.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18965 df743ca5-7f9a-e211-a948-0013205c9059
108 files changed, 1050 insertions, 337 deletions
diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile index 61b419aa4..400ff1612 100644 --- a/accessibility/at-spi2-atk/Makefile +++ b/accessibility/at-spi2-atk/Makefile @@ -1,5 +1,5 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> -# $FreeBSD: head/accessibility/at-spi2-atk/Makefile 313819 2013-03-10 09:18:33Z kwm $ +# $FreeBSD$ # $MCom$ PORTNAME= at-spi2-atk @@ -19,7 +19,6 @@ RUN_DEPENDS= at-spi2-core>=2.8.0:${PORTSDIR}/accessibility/at-spi2-core PORTSCOUT= limitw:1,even -NO_STAGE= yes USE_XZ= yes USES= gmake pathfix pkgconfig USE_GNOME= gnomehier intlhack glib20 atk @@ -29,4 +28,8 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-p2p +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libatk-bridge-2.0.so.0 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/modules/libatk-bridge.so + .include <bsd.port.mk> diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile index a74e748ae..97a133048 100644 --- a/accessibility/at-spi2-core/Makefile +++ b/accessibility/at-spi2-core/Makefile @@ -1,5 +1,5 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> -# $FreeBSD: head/accessibility/at-spi2-core/Makefile 313633 2013-03-08 10:51:34Z kwm $ +# $FreeBSD$ # $MCom$ PORTNAME= at-spi2-core @@ -17,16 +17,17 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus PORTSCOUT= limitw:1,even -NO_STAGE= yes USES= gettext gmake pathfix pkgconfig USE_XZ= yes USE_GNOME= gnomehier glib20 intlhack introspection:build USE_XORG= x11 xi xtst xext USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-static \ - --disable-xevie +CONFIGURE_ARGS= --disable-xevie CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libatspi.so.0 + .include <bsd.port.mk> diff --git a/accessibility/at-spi2-core/pkg-plist b/accessibility/at-spi2-core/pkg-plist index 19ad675f8..cc746c358 100644 --- a/accessibility/at-spi2-core/pkg-plist +++ b/accessibility/at-spi2-core/pkg-plist @@ -31,7 +31,6 @@ include/at-spi-2.0/atspi/atspi-text.h include/at-spi-2.0/atspi/atspi-types.h include/at-spi-2.0/atspi/atspi-value.h lib/girepository-1.0/Atspi-2.0.typelib -lib/libatspi.a lib/libatspi.la lib/libatspi.so lib/libatspi.so.0 diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile index ad3365e81..ba1d50e6c 100644 --- a/accessibility/caribou/Makefile +++ b/accessibility/caribou/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/accessibility/caribou/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= caribou PORTVERSION= 0.4.10 @@ -19,7 +19,6 @@ LIB_DEPENDS= libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter \ libxklavier.so:${PORTSDIR}/x11/libxklavier RUN_DEPENDS= py*-atspi>=2.1.91:${PORTSDIR}/accessibility/py-atspi -NO_STAGE= yes USE_XZ= yes USES= gettext gmake pathfix pkgconfig shebangfix SHEBANG_FILES= tools/fix_gir.py tools/make_schema.py @@ -34,4 +33,9 @@ CONFIGURE_ARGS= --enable-gtk2-module=no GLIB_SCHEMAS= org.gnome.caribou.gschema.xml \ org.gnome.antler.gschema.xml +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcaribou.so.0 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules/libcaribou-gtk-module.so + .include <bsd.port.mk> + diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile index 0bb36cd2f..5e2335253 100644 --- a/accessibility/py-atspi/Makefile +++ b/accessibility/py-atspi/Makefile @@ -1,6 +1,6 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/accessibility/py-atspi/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= atspi PORTVERSION= 2.8.0 @@ -18,7 +18,6 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at CONFLICTS= at-spi-1.[0-9]* -NO_STAGE= yes USE_XZ= yes USES= gettext gmake pathfix pkgconfig USE_GNOME= gnomehier intlhack pygobject3 diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index 65027ecba..0a3c29ae6 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -1,5 +1,5 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> -# $FreeBSD: head/audio/libcanberra/Makefile 309632 2012-12-29 20:57:20Z mezz $ +# $FreeBSD$ # $MCom$ PORTNAME= libcanberra diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 7757472ea..8ad31af29 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/databases/evolution-data-server3/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= evolution-data-server PORTVERSION= 3.6.4 @@ -60,7 +60,7 @@ KRB5_LIB= `/usr/bin/krb5-config gssapi --libs` .endif .if ${PORT_OPTIONS:MWEATHER} -LIB_DEPENDS+= libgweather-3.so:${PORTSDIR}/net/libgweather3 +LIB_DEPENDS+= libgweather-3.so:${PORTSDIR}/net/libgweather CONFIGURE_ARGS+= --enable-weather PLIST_SUB+= WEATHER="" .else diff --git a/databases/glom/Makefile b/databases/glom/Makefile index 952f2b265..235202b50 100644 --- a/databases/glom/Makefile +++ b/databases/glom/Makefile @@ -1,6 +1,6 @@ # Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/databases/glom/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= glom PORTVERSION= 1.24.0 @@ -23,12 +23,11 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co ${LOCALBASE}/libdata/pkgconfig/libgda-mysql-5.0.pc:${PORTSDIR}/databases/libgda5-mysql \ ${LOCALBASE}/libdata/pkgconfig/libgda-postgres-5.0.pc:${PORTSDIR}/databases/libgda5-postgresql -NO_STAGE= yes USE_XZ= yes USE_PYTHON= yes GNU_CONFIGURE= yes -USES= gettext gmake pathfix pkgconfig shared-mime-info \ - desktop-file-utils +USES= desktop-file-utils gettext gmake pathfix pkgconfig \ + shared-mime-info USE_GNOME= gnomedocutils gnomeprefix intltool pygobject3 libxml2 \ gtksourceviewmm3 libgdamm5 USE_LDCONFIG= yes @@ -61,4 +60,8 @@ post-patch: ${WRKSRC}/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc \ ${WRKSRC}/glom/main.cc +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.* + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/*.so + .include <bsd.port.mk> diff --git a/databases/glom/pkg-plist b/databases/glom/pkg-plist index 2fdbaf305..2ac8b5980 100644 --- a/databases/glom/pkg-plist +++ b/databases/glom/pkg-plist @@ -310,7 +310,6 @@ share/locale/sv/LC_MESSAGES/glom.mo share/locale/tr/LC_MESSAGES/glom.mo share/locale/vi/LC_MESSAGES/glom.mo share/locale/zh_CN/LC_MESSAGES/glom.mo -share/mime/application/x-glom.xml share/mime/packages/glom.xml share/omf/glom/glom-C.omf share/omf/glom/glom-de.omf diff --git a/deskutils/baobab/Makefile b/deskutils/baobab/Makefile index efb9d8f1a..ea135b21e 100644 --- a/deskutils/baobab/Makefile +++ b/deskutils/baobab/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/deskutils/baobab/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= baobab PORTVERSION= 3.6.2 @@ -17,16 +17,14 @@ LIB_DEPENDS= libgtop-2.0.so:${PORTSDIR}/devel/libgtop CONFLICTS= gnome-utils-2.[0-9]* -NO_STAGE= yes USE_XZ= yes -USES= gettext gmake pathfix pkgconfig +USES= desktop-file-utils gettext gmake pathfix pkgconfig USE_GNOME= gnomeprefix intlhack libxml2 gtk30 GNU_CONFIGURE= yes INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= baobab.1 GLIB_SCHEMAS= org.gnome.baobab.gschema.xml post-patch: diff --git a/deskutils/baobab/pkg-plist b/deskutils/baobab/pkg-plist index d816ac4c0..3b604f351 100644 --- a/deskutils/baobab/pkg-plist +++ b/deskutils/baobab/pkg-plist @@ -1,4 +1,5 @@ bin/baobab +man/man1/baobab.1.gz share/applications/baobab.desktop share/help/C/baobab/index.page share/help/C/baobab/introduction.page diff --git a/deskutils/gnome-dictionary/Makefile b/deskutils/gnome-dictionary/Makefile index b5f6edaf7..0f45b1ea3 100644 --- a/deskutils/gnome-dictionary/Makefile +++ b/deskutils/gnome-dictionary/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/deskutils/gnome-dictionary/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= gnome-dictionary PORTVERSION= 3.6.0 @@ -16,7 +16,6 @@ BUILD_DEPENDS= gtkdoc-check:${PORTSDIR}/textproc/gtk-doc \ CONFLICTS= gnome-utils-2.[0-9]* -NO_STAGE= yes USE_XZ= yes USES= gettext gmake pathfix pkgconfig USE_LDCONFIG= yes @@ -26,7 +25,9 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= gnome-dictionary.1 GLIB_SCHEMAS= org.gnome.dictionary.gschema.xml +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdict-1.0.so.6 + .include <bsd.port.mk> diff --git a/deskutils/gnome-dictionary/pkg-plist b/deskutils/gnome-dictionary/pkg-plist index 43cb7e058..09c88cc0f 100644 --- a/deskutils/gnome-dictionary/pkg-plist +++ b/deskutils/gnome-dictionary/pkg-plist @@ -16,6 +16,7 @@ lib/libgdict-1.0.la lib/libgdict-1.0.so lib/libgdict-1.0.so.6 libdata/pkgconfig/gdict-1.0.pc +man/man1/gnome-dictionary.1.gz share/applications/gnome-dictionary.desktop share/doc/gdict/GdictClientContext.html share/doc/gdict/GdictDatabaseChooser.html diff --git a/deskutils/gnome-font-viewer/Makefile b/deskutils/gnome-font-viewer/Makefile index b110d0c68..1712656cf 100644 --- a/deskutils/gnome-font-viewer/Makefile +++ b/deskutils/gnome-font-viewer/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/deskutils/gnome-font-viewer/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= gnome-font-viewer PORTVERSION= 3.6.1 @@ -16,9 +16,8 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ CONFLICTS= gnome-utils-2.[0-9]* -NO_STAGE= yes USE_XZ= yes -USES= gettext gmake pathfix pkgconfig +USES= desktop-file-utils gettext gmake pathfix pkgconfig USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GNOME= gnomeprefix intlhack gtk30 gnomedesktop3 diff --git a/deskutils/gnome-screenshot/Makefile b/deskutils/gnome-screenshot/Makefile index 742a68c7d..258ccb64b 100644 --- a/deskutils/gnome-screenshot/Makefile +++ b/deskutils/gnome-screenshot/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/deskutils/gnome-screenshot/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= gnome-screenshot PORTVERSION= 3.6.1 @@ -15,7 +15,6 @@ LIB_DEPENDS= libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 CONFLICTS= gnome-utils-2.[0-9]* -NO_STAGE= yes USE_XZ= yes USES= gettext gmake pathfix pkgconfig USE_GNOME= gnomeprefix intlhack gtk30 @@ -23,7 +22,6 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= gnome-screenshot.1 GLIB_SCHEMAS= org.gnome.gnome-screenshot.gschema.xml .include <bsd.port.mk> diff --git a/deskutils/gnome-screenshot/pkg-plist b/deskutils/gnome-screenshot/pkg-plist index 4319571d0..4d265572d 100644 --- a/deskutils/gnome-screenshot/pkg-plist +++ b/deskutils/gnome-screenshot/pkg-plist @@ -1,4 +1,5 @@ bin/gnome-screenshot +man/man1/gnome-screenshot.1.gz share/GConf/gsettings/gnome-screenshot.convert share/applications/gnome-screenshot.desktop share/locale/af/LC_MESSAGES/gnome-screenshot.mo diff --git a/deskutils/gnome-search-tool/Makefile b/deskutils/gnome-search-tool/Makefile index 8e5be7974..7e807884b 100644 --- a/deskutils/gnome-search-tool/Makefile +++ b/deskutils/gnome-search-tool/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/deskutils/gnome-search-tool/Makefile 18554 2013-06-17 14:46:47Z kwm $ +# $MCom$ PORTNAME= gnome-search-tool PORTVERSION= 3.6.0 @@ -15,7 +15,6 @@ BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool CONFLICTS= gnome-utils-2.[0-9]* -NO_STAGE= yes USE_XZ= yes USES= gettext gmake pathfix pkgconfig USE_LDCONFIG= yes @@ -25,7 +24,6 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= gnome-search-tool.1 GLIB_SCHEMAS= org.gnome.gnome-search-tool.gschema.xml .include <bsd.port.mk> diff --git a/deskutils/gnome-search-tool/pkg-plist b/deskutils/gnome-search-tool/pkg-plist index 6f7d8e151..84f9dd41e 100644 --- a/deskutils/gnome-search-tool/pkg-plist +++ b/deskutils/gnome-search-tool/pkg-plist @@ -1,4 +1,5 @@ bin/gnome-search-tool +man/man1/gnome-search-tool.1.gz share/GConf/gsettings/gnome-search-tool.convert share/applications/gnome-search-tool.desktop share/help/C/gnome-search-tool/index.docbook diff --git a/deskutils/gnome-system-log/Makefile b/deskutils/gnome-system-log/Makefile index 51f78e95f..050d25476 100644 --- a/deskutils/gnome-system-log/Makefile +++ b/deskutils/gnome-system-log/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/deskutils/gnome-system-log/Makefile 18571 2013-06-18 09:29:00Z kwm $ +# $MCom$ PORTNAME= gnome-system-log PORTVERSION= 3.6.1 @@ -15,7 +15,6 @@ BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool CONFLICTS= gnome-utils-2.[0-9]* -NO_STAGE= yes USE_XZ= yes USES= gettext gmake pathfix pkgconfig USE_LDCONFIG= yes @@ -25,7 +24,6 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= gnome-system-log.1 GLIB_SCHEMAS= org.gnome.gnome-system-log.gschema.xml .include <bsd.port.mk> diff --git a/deskutils/gnome-system-log/pkg-plist b/deskutils/gnome-system-log/pkg-plist index bfe22b918..e09e87eac 100644 --- a/deskutils/gnome-system-log/pkg-plist +++ b/deskutils/gnome-system-log/pkg-plist @@ -1,4 +1,5 @@ bin/gnome-system-log +man/man1/gnome-system-log.1.gz share/GConf/gsettings/logview.convert share/applications/gnome-system-log.desktop share/help/C/gnome-system-log/figures/log-viewer-main.png diff --git a/deskutils/gnome-tweak-tool/Makefile b/deskutils/gnome-tweak-tool/Makefile index 619203684..06738f650 100644 --- a/deskutils/gnome-tweak-tool/Makefile +++ b/deskutils/gnome-tweak-tool/Makefile @@ -1,6 +1,6 @@ # Created by: Jeremy Messenger <mezz@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/deskutils/gnome-tweak-tool/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= gnome-tweak-tool PORTVERSION= 3.6.1 @@ -13,7 +13,6 @@ COMMENT= Allows to tweak some hidden settings in GTK3 / GNOME3 BUILD_DEPENDS= gsettings-desktop-schemas>=3.4.0:${PORTSDIR}/devel/gsettings-desktop-schemas RUN_DEPENDS= gsettings-desktop-schemas>=3.4.0:${PORTSDIR}/devel/gsettings-desktop-schemas -NO_STAGE= yes USE_XZ= yes USE_GNOME= gnomeprefix gconf2 pygobject3 USE_PYTHON= yes diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile index 81796ff6a..922084317 100644 --- a/deskutils/notification-daemon/Makefile +++ b/deskutils/notification-daemon/Makefile @@ -1,6 +1,6 @@ # Created by: Andreas Kohn <andreas@syndrom23.de> # $FreeBSD$ -# $MCom: ports/trunk/deskutils/notification-daemon/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= notification-daemon PORTVERSION= 0.7.6 @@ -16,7 +16,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 -NO_STAGE= yes +CONFLICTS= xfce4-notification-daemon-[0-9]* xfce4-notifyd-[0-9]* + USE_XZ= yes USE_GNOME= gnomeprefix intlhack gtk30 USES= gettext gmake pathfix pkgconfig @@ -27,6 +28,4 @@ CONFIGURE_ARGS= --with-dbus-services=${PREFIX}/share/dbus-1/services CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFLICTS= xfce4-notification-daemon-[0-9]* xfce4-notifyd-[0-9]* - .include <bsd.port.mk> diff --git a/deskutils/notification-daemon/pkg-plist b/deskutils/notification-daemon/pkg-plist index f3103ef58..b2beaeffd 100644 --- a/deskutils/notification-daemon/pkg-plist +++ b/deskutils/notification-daemon/pkg-plist @@ -35,6 +35,7 @@ share/locale/kn/LC_MESSAGES/notification-daemon.mo share/locale/ko/LC_MESSAGES/notification-daemon.mo share/locale/lt/LC_MESSAGES/notification-daemon.mo share/locale/lv/LC_MESSAGES/notification-daemon.mo +share/locale/mr/LC_MESSAGES/notification-daemon.mo share/locale/ms/LC_MESSAGES/notification-daemon.mo share/locale/nb/LC_MESSAGES/notification-daemon.mo share/locale/nl/LC_MESSAGES/notification-daemon.mo @@ -75,6 +76,8 @@ share/locale/zu/LC_MESSAGES/notification-daemon.mo @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @dirrmtry share/locale/sr@latin +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/km/LC_MESSAGES @dirrmtry share/locale/km @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/devel/dconf-editor/Makefile b/devel/dconf-editor/Makefile index 732f06bb2..26f10f621 100644 --- a/devel/dconf-editor/Makefile +++ b/devel/dconf-editor/Makefile @@ -1,5 +1,5 @@ # Created by: Koop Mast <kwm@FreeBSD.org> -# $FreeBSD: devel/dconf-editor/Makefile 313633 2013-03-08 10:51:34Z kwm $ +# $FreeBSD$ # $MCom$ PORTNAME= dconf diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile index 9df3bf655..f4dd00997 100644 --- a/devel/dconf/Makefile +++ b/devel/dconf/Makefile @@ -1,5 +1,5 @@ # Created by: Koop Mast <kwm@FreeBSD.org> -# $FreeBSD: devel/dconf/Makefile 313956 2013-03-12 09:45:07Z kwm $ +# $FreeBSD$ # $MCom$ PORTNAME?= dconf diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 15b775432..73520bc8f 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,5 +1,5 @@ # Created by: Vanilla I. Shu <vanilla@FreeBSD.org> -# $FreeBSD: head/devel/glib20/Makefile 326307 2013-09-04 18:06:07Z madpilot $ +# $FreeBSD$ # $MCom$ PORTNAME= glib diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index 91befc83d..a5eb6acee 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -1,5 +1,5 @@ # Created by: Adam Weinberger <adamw@FreeBSD.org> -# $FreeBSD: head/devel/glibmm/Makefile 313633 2013-03-08 10:51:34Z kwm $ +# $FreeBSD$ # $MCom$ PORTNAME= glibmm diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index 371d9709c..2f30bd3ab 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -1,5 +1,5 @@ # Created by: Alexander Logvinov <avl@FreeBSD.org> -# $FreeBSD: head/devel/gobject-introspection/Makefile 314706 2013-03-20 02:39:49Z mezz $ +# $FreeBSD$ # $MCom$ PORTNAME= gobject-introspection @@ -16,13 +16,11 @@ COMMENT= Generate interface introspection data for GObject libraries BUILD_DEPENDS= cairo-trace:${PORTSDIR}/graphics/cairo LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi -NO_STAGE= yes USES= bison gettext gmake pathfix pkgconfig USE_XZ= yes GNU_CONFIGURE= yes USE_GNOME= gnomehier glib20 ltverhack USE_PYTHON= -2.7 -USE_AUTOTOOLS= libtool USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes CPPFLAGS+= -I${LOCALBASE}/include @@ -31,10 +29,12 @@ LDFLAGS+= -L${LOCALBASE}/lib # Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260 MAKE_ENV= HOME=${WRKDIR} -MAN1= g-ir-compiler.1 g-ir-generate.1 g-ir-scanner.1 - post-patch: @${REINPLACE_CMD} -e 's|'gcc'|'cc'|g' \ ${WRKSRC}/giscanner/dumper.py +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgirepository-1.0.so.1 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gobject-introspection/giscanner/_giscanner.so + .include <bsd.port.mk> diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist index 6493d3590..9785796c0 100644 --- a/devel/gobject-introspection/pkg-plist +++ b/devel/gobject-introspection/pkg-plist @@ -158,6 +158,9 @@ lib/libgirepository-1.0.so lib/libgirepository-1.0.so.1 libdata/pkgconfig/gobject-introspection-1.0.pc libdata/pkgconfig/gobject-introspection-no-export-1.0.pc +man/man1/g-ir-compiler.1.gz +man/man1/g-ir-generate.1.gz +man/man1/g-ir-scanner.1.gz share/aclocal/introspection.m4 share/gir-1.0/DBus-1.0.gir share/gir-1.0/DBusGLib-1.0.gir diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile index 84edc9a19..289d0ac0f 100644 --- a/devel/gsettings-desktop-schemas/Makefile +++ b/devel/gsettings-desktop-schemas/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/gsettings-desktop-schemas/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= gsettings-desktop-schemas PORTVERSION= 3.6.1 @@ -16,7 +16,6 @@ LICENSE= LGPL21 RUN_DEPENDS= ${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:${PORTSDIR}/x11-fonts/cantarell-fonts -NO_STAGE= yes USE_XZ= yes USES= gettext gmake pathfix perl5 pkgconfig USE_PERL5= build diff --git a/devel/libgdata06/Makefile b/devel/libgdata06/Makefile index 79038f57e..13382dc81 100644 --- a/devel/libgdata06/Makefile +++ b/devel/libgdata06/Makefile @@ -1,12 +1,13 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/libgdata06/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= libgdata PORTVERSION= 0.6.6 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GNOME +PKGNAMESUFFIX= 06 MAINTAINER= kwm@FreeBSD.org COMMENT= GLib based implimentation of the GData protocol @@ -15,15 +16,16 @@ LIB_DEPENDS= libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome CONFLICTS= libgdata-0.10.* -NO_STAGE= yes -LATEST_LINK= libgdata06 USE_BZIP2= yes USE_LDCONFIG= yes +GNU_CONFIGURE= yes USES= gettext gmake pathfix pkgconfig -USE_AUTOTOOLS= libtool USE_GNOME= intltool ltverhack glib20 introspection:build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--with-html-dir="${PREFIX}/share/doc" +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdata.so.7 + .include <bsd.port.mk> diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile index da51afc98..6e3a53aa6 100644 --- a/devel/libgee/Makefile +++ b/devel/libgee/Makefile @@ -1,6 +1,6 @@ # Created by: Frank Steinborn <steinex@nognu.de> # $FreeBSD$ -# $MCom: ports/trunk/devel/libgee/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= libgee PORTVERSION= 0.8.6 @@ -10,7 +10,6 @@ MASTER_SITES= GNOME MAINTAINER= kwm@FreeBSD.org COMMENT= GObject collection library -NO_STAGE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-introspection=yes USE_XZ= yes @@ -18,4 +17,7 @@ USES= gmake pathfix pkgconfig USE_GNOME= glib20 gnomehier introspection:build USE_LDCONFIG= yes +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* + .include <bsd.port.mk> diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index ae0f9a0fd..7f08383ac 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -1,5 +1,5 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> -# $FreeBSD: head/devel/libgtop/Makefile 330901 2013-10-19 16:21:20Z kwm $ +# $FreeBSD$ # $MCom$ PORTNAME= libgtop diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile index ec1747e86..2db283cf9 100644 --- a/devel/libnotify/Makefile +++ b/devel/libnotify/Makefile @@ -1,6 +1,6 @@ # Created by: Andreas Kohn <andreas@syndrom23.de> # $FreeBSD$ -# $MCom: ports/trunk/devel/libnotify/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= libnotify PORTVERSION= 0.7.5 @@ -13,7 +13,6 @@ COMMENT= Library for desktop notifications LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -NO_STAGE= yes USE_XZ= yes USE_GNOME= intlhack glib20 gdkpixbuf2 ltverhack introspection USES= gettext gmake pathfix pkgconfig @@ -22,4 +21,7 @@ USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotify.so.4 + .include <bsd.port.mk> diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile index b0a435a45..bf6d2b49a 100644 --- a/devel/libpeas/Makefile +++ b/devel/libpeas/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/libpeas/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= libpeas PORTVERSION= 1.6.1 @@ -13,11 +13,9 @@ COMMENT= Next evolution of the Gedit plugins engine BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala -NO_STAGE= yes USE_XZ= yes USE_PYTHON= 2.5+ USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool USES= gettext gmake pathfix pkgconfig USE_GNOME= gtk30 ltverhack introspection:build INSTALLS_ICONS= yes @@ -66,4 +64,9 @@ PLIST_SUB+= GJS="@comment " PLIST_SUB+= VALA="@comment " +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpeas-1.0/loaders/lib*.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/peas-demo/plugins/*/*.so + .include <bsd.port.mk> diff --git a/devel/libpeas/pkg-plist b/devel/libpeas/pkg-plist index ce93eee9e..ce29592c7 100644 --- a/devel/libpeas/pkg-plist +++ b/devel/libpeas/pkg-plist @@ -13,40 +13,32 @@ include/libpeas-1.0/libpeas-gtk/peas-gtk-plugin-manager.h include/libpeas-1.0/libpeas-gtk/peas-gtk.h lib/girepository-1.0/Peas-1.0.typelib lib/girepository-1.0/PeasGtk-1.0.typelib -lib/libpeas-1.0.a lib/libpeas-1.0.la lib/libpeas-1.0.so lib/libpeas-1.0.so.0 -%%GJS%%lib/libpeas-1.0/loaders/libgjsloader.a %%GJS%%lib/libpeas-1.0/loaders/libgjsloader.la %%GJS%%lib/libpeas-1.0/loaders/libgjsloader.so -%%PYTHONS%%lib/libpeas-1.0/loaders/libpythonloader.a %%PYTHONS%%lib/libpeas-1.0/loaders/libpythonloader.la %%PYTHONS%%lib/libpeas-1.0/loaders/libpythonloader.so -%%SEED%%lib/libpeas-1.0/loaders/libseedloader.a %%SEED%%lib/libpeas-1.0/loaders/libseedloader.la %%SEED%%lib/libpeas-1.0/loaders/libseedloader.so -lib/libpeas-gtk-1.0.a lib/libpeas-gtk-1.0.la lib/libpeas-gtk-1.0.so lib/libpeas-gtk-1.0.so.0 %%GJS%%lib/peas-demo/plugins/gjshello/gjshello.js %%GJS%%lib/peas-demo/plugins/gjshello/gjshello.plugin lib/peas-demo/plugins/helloworld/helloworld.plugin -lib/peas-demo/plugins/helloworld/libhelloworld.a lib/peas-demo/plugins/helloworld/libhelloworld.la lib/peas-demo/plugins/helloworld/libhelloworld.so %%PYTHONS%%lib/peas-demo/plugins/pythonhello/pythonhello.plugin %%PYTHONS%%lib/peas-demo/plugins/pythonhello/pythonhello.py %%PYTHONS%%lib/peas-demo/plugins/pythonhello/pythonhello.pyc %%PYTHONS%%lib/peas-demo/plugins/pythonhello/pythonhello.pyo -lib/peas-demo/plugins/secondtime/libsecondtime.a lib/peas-demo/plugins/secondtime/libsecondtime.la lib/peas-demo/plugins/secondtime/libsecondtime.so lib/peas-demo/plugins/secondtime/secondtime.plugin %%SEED%%lib/peas-demo/plugins/seedhello/seedhello.js %%SEED%%lib/peas-demo/plugins/seedhello/seedhello.plugin -%%VALA%%lib/peas-demo/plugins/valahello/libvalahello.a %%VALA%%lib/peas-demo/plugins/valahello/libvalahello.la %%VALA%%lib/peas-demo/plugins/valahello/libvalahello.so %%VALA%%lib/peas-demo/plugins/valahello/valahello.plugin diff --git a/devel/libsoup-gnome/Makefile b/devel/libsoup-gnome/Makefile index a2e044f45..1e7373c52 100644 --- a/devel/libsoup-gnome/Makefile +++ b/devel/libsoup-gnome/Makefile @@ -1,5 +1,5 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> -# $FreeBSD: head/devel/libsoup-gnome/Makefile 300896 2012-07-14 13:54:48Z beat $ +# $FreeBSD$ # $MCom$ PORTREVISION= 0 diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile index f536c8f6e..4d5273953 100644 --- a/devel/py-gobject/Makefile +++ b/devel/py-gobject/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/py-gobject/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= gobject PORTVERSION= 2.28.6 @@ -22,7 +22,6 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo -NO_STAGE= yes USE_XZ= yes USES= gmake pathfix pkgconfig USE_GNOME= glib20 introspection:build @@ -35,7 +34,14 @@ CONFLICTS= py*-gtk-0* PLIST_SUB= PYTHON_VER="${PYTHON_VER}" post-install: - @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ - ${PREFIX}/share/pygobject/2.0/codegen + ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -f ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -f ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -f ${STAGEDIR}${PREFIX}/share/pygobject/2.0/codegen + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyglib-2.0-${PYTHON_VERSION}.so.0 + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/*/*.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/*/*/*.so .include <bsd.port.mk> diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile index 236242237..93ad0fad5 100644 --- a/devel/py-gobject3/Makefile +++ b/devel/py-gobject3/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/py-gobject3/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= gobject PORTVERSION= 3.8.1 @@ -8,6 +8,7 @@ CATEGORIES= devel python MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 3 DISTNAME= pygobject-${PORTVERSION} DIST_SUBDIR= gnome3 @@ -21,8 +22,6 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo -NO_STAGE= yes -LATEST_LINK= ${PYTHON_PKGNAMEPREFIX}${PORTNAME}3 USE_XZ= yes USES= gmake pathfix pkgconfig USE_GNOME= glib20 introspection @@ -45,4 +44,9 @@ post-patch: @${REINPLACE_CMD} -e 's|SUBDIRS = examples gi tests|SUBDIRS = examples gi|g' \ ${WRKSRC}/Makefile.in +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyglib-gi-2.0-${PYTHON_VERSION}.so.0 + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gi/*.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gi/*/*.so + .include <bsd.port.post.mk> diff --git a/graphics/colord-gtk/Makefile b/graphics/colord-gtk/Makefile index 0de43e915..675ca1a54 100644 --- a/graphics/colord-gtk/Makefile +++ b/graphics/colord-gtk/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/graphics/colord-gtk/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= colord-gtk PORTVERSION= 0.1.25 @@ -15,7 +15,6 @@ LIB_DEPENDS= libcolord.so:${PORTSDIR}/graphics/colord \ libdbus-1.so:${PORTSDIR}/devel/dbus \ liblcms2.so:${PORTSDIR}/graphics/lcms2 -NO_STAGE= yes USE_XZ= yes USE_GNOME= gnomehier gtk30 intlhack introspection:build USES= gettext gmake pathfix pkgconfig @@ -34,4 +33,7 @@ post-patch: -e 's|-Wmissing-parameter-type||g' \ ${WRKSRC}/configure +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcolord-gtk.so.1 + .include <bsd.port.mk> diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile index 783ec208c..0d1728795 100644 --- a/graphics/colord/Makefile +++ b/graphics/colord/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/graphics/colord/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= colord PORTVERSION= 1.0.1 @@ -17,7 +17,6 @@ LIB_DEPENDS= libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \ USERS= colord GROUPS= colord -NO_STAGE= yes USE_XZ= yes USE_GNOME= gnomehier glib20 intlhack introspection:build USES= gettext gmake pathfix pkgconfig @@ -48,7 +47,9 @@ OPTIONS_DEFINE= MANPAGES .if ${PORT_OPTIONS:MMANPAGES} BUILD_DEPENDS+= docbook2html:${PORTSDIR}/textproc/docbook-utils \ ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 -MAN1= cd-create-profile.1 cd-fix-profile.1 colormgr.1 +PLIST_SUB+= MAN="" +.else +PLIST_SUB+= MAN="@comment " .endif post-patch: @@ -70,6 +71,8 @@ post-patch: .endif post-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + ${MKDIR} ${STAGEDIR}/var/db/colord/icc + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/colord-sensors/lib*.so .include <bsd.port.mk> diff --git a/graphics/colord/pkg-plist b/graphics/colord/pkg-plist index bb35fb489..975d1febb 100644 --- a/graphics/colord/pkg-plist +++ b/graphics/colord/pkg-plist @@ -48,6 +48,10 @@ lib/libcolordprivate.so.1 libdata/pkgconfig/colord.pc libexec/colord libexec/colord-session +%%MAN%%man/man1/cd-create-profile.1.gz +%%MAN%%man/man1/cd-fix-profile.1.gz +%%MAN%%man/man1/colord.conf.1.gz +%%MAN%%man/man1/colormgr.1.gz share/color/icc/colord/AdobeRGB1998.icc share/color/icc/colord/AppleRGB.icc share/color/icc/colord/BestRGB.icc diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index f03e566fd..09779f1f7 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -1,5 +1,5 @@ # Created by: Ade Lovett <ade@lovett.com> -# $FreeBSD: head/graphics/gdk-pixbuf2/Makefile 332360 2013-11-01 12:19:48Z kwm $ +# $FreeBSD$ # $MCom$ PORTNAME= gdk-pixbuf diff --git a/graphics/gnome-color-manager/Makefile b/graphics/gnome-color-manager/Makefile index 6723ec4e2..eefb59f8f 100644 --- a/graphics/gnome-color-manager/Makefile +++ b/graphics/gnome-color-manager/Makefile @@ -1,6 +1,6 @@ # Created by: FreeBSD GNOME Team <gnome@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/graphics/gnome-color-manager/Makefile 18575 2013-06-18 16:28:35Z kwm $ +# $MCom$ PORTNAME= gnome-color-manager PORTVERSION= 3.6.1 @@ -20,7 +20,6 @@ LIB_DEPENDS= liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \ libexif.so:${PORTSDIR}/graphics/libexif -NO_STAGE= yes USE_XZ= yes USE_XORG= xrandr USE_GNOME= gnomedesktop3 gnomeprefix gtk30 intlhack vte3 @@ -32,9 +31,6 @@ CONFIGURE_ARGS= --enable-clutter=no CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= gcm-calibrate.1 gcm-import.1 gcm-inspect.1 gcm-picker.1 \ - gcm-viewer.1 - OPTIONS_DEFINE= RAW OPTIONS_DEFAULT=RAW diff --git a/graphics/gnome-color-manager/pkg-plist b/graphics/gnome-color-manager/pkg-plist index 920168a14..f199bcc24 100644 --- a/graphics/gnome-color-manager/pkg-plist +++ b/graphics/gnome-color-manager/pkg-plist @@ -4,6 +4,11 @@ bin/gcm-inspect bin/gcm-picker bin/gcm-viewer %%RAW%%libexec/gcm-helper-exiv +man/man1/gcm-calibrate.1.gz +man/man1/gcm-import.1.gz +man/man1/gcm-inspect.1.gz +man/man1/gcm-picker.1.gz +man/man1/gcm-viewer.1.gz share/applications/gcm-calibrate.desktop share/applications/gcm-import.desktop share/applications/gcm-picker.desktop @@ -69,6 +74,10 @@ share/help/es/gnome-color-manager/color-import-linux.page share/help/es/gnome-color-manager/color-import-osx.page share/help/es/gnome-color-manager/color-import-windows.page share/help/es/gnome-color-manager/legal.xml +share/help/fr/gnome-color-manager/color-import-linux.page +share/help/fr/gnome-color-manager/color-import-osx.page +share/help/fr/gnome-color-manager/color-import-windows.page +share/help/fr/gnome-color-manager/legal.xml share/icons/hicolor/16x16/apps/gnome-color-manager.png share/icons/hicolor/16x16/mimetypes/application-vnd.iccprofile.png share/icons/hicolor/22x22/apps/gnome-color-manager.png @@ -88,6 +97,7 @@ share/icons/hicolor/scalable/mimetypes/application-vnd.iccprofile.svg share/locale/as/LC_MESSAGES/gnome-color-manager.mo share/locale/ar/LC_MESSAGES/gnome-color-manager.mo share/locale/bg/LC_MESSAGES/gnome-color-manager.mo +share/locale/bn_IN/LC_MESSAGES/gnome-color-manager.mo share/locale/ca/LC_MESSAGES/gnome-color-manager.mo share/locale/ca@valencia/LC_MESSAGES/gnome-color-manager.mo share/locale/cs/LC_MESSAGES/gnome-color-manager.mo @@ -117,17 +127,20 @@ share/locale/lv/LC_MESSAGES/gnome-color-manager.mo share/locale/mr/LC_MESSAGES/gnome-color-manager.mo share/locale/ml/LC_MESSAGES/gnome-color-manager.mo share/locale/nb/LC_MESSAGES/gnome-color-manager.mo +share/locale/or/LC_MESSAGES/gnome-color-manager.mo share/locale/pa/LC_MESSAGES/gnome-color-manager.mo share/locale/pl/LC_MESSAGES/gnome-color-manager.mo share/locale/pt/LC_MESSAGES/gnome-color-manager.mo share/locale/pt_BR/LC_MESSAGES/gnome-color-manager.mo share/locale/ro/LC_MESSAGES/gnome-color-manager.mo share/locale/ru/LC_MESSAGES/gnome-color-manager.mo +share/locale/sk/LC_MESSAGES/gnome-color-manager.mo share/locale/sl/LC_MESSAGES/gnome-color-manager.mo share/locale/sr/LC_MESSAGES/gnome-color-manager.mo share/locale/sr@latin/LC_MESSAGES/gnome-color-manager.mo share/locale/sv/LC_MESSAGES/gnome-color-manager.mo share/locale/ta/LC_MESSAGES/gnome-color-manager.mo +share/locale/te/LC_MESSAGES/gnome-color-manager.mo share/locale/th/LC_MESSAGES/gnome-color-manager.mo share/locale/ug/LC_MESSAGES/gnome-color-manager.mo share/locale/uk/LC_MESSAGES/gnome-color-manager.mo @@ -141,14 +154,19 @@ share/locale/zh_TW/LC_MESSAGES/gnome-color-manager.mo @dirrmtry share/locale/ug @dirrmtry share/locale/sr@latin/LC_MESSAGES @dirrmtry share/locale/sr@latin +@dirrmtry share/locale/or/LC_MESSAGES +@dirrmtry share/locale/or @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrm share/help/fr/gnome-color-manager +@dirrm share/help/es/gnome-color-manager +@dirrm share/help/el/gnome-color-manager +@dirrm share/help/de/gnome-color-manager +@dirrm share/help/C/gnome-color-manager @dirrm %%DATADIR%%/ti1 @dirrm %%DATADIR%%/targets @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%%/figures @dirrm %%DATADIR%% -@dirrm share/help/es/gnome-color-manager -@dirrm share/help/el/gnome-color-manager -@dirrm share/help/de/gnome-color-manager -@dirrm share/help/C/gnome-color-manager diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile index 7a96d75ba..6bf5f00bc 100644 --- a/graphics/libchamplain/Makefile +++ b/graphics/libchamplain/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/graphics/libchamplain/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= libchamplain PORTVERSION= 0.12.4 @@ -13,11 +13,9 @@ COMMENT= C library aimed to provide a Gtk+ widget to display rasterized maps and LIB_DEPENDS= libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \ libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome -NO_STAGE= yes USE_XZ= yes USES= gmake pathfix pkgconfig USE_GNOME= gtk30 ltverhack gnomehier introspection:build -USE_AUTOTOOLS= libtool USE_GL= gl USE_SQLITE= 3 GNU_CONFIGURE= yes @@ -33,4 +31,7 @@ post-patch: ${WRKSRC}/docs/reference/Makefile.in \ ${WRKSRC}/docs/reference-gtk/Makefile.in +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.* + .include <bsd.port.mk> diff --git a/graphics/libchamplain08/Makefile b/graphics/libchamplain08/Makefile index b07a6dc8e..594e3808c 100644 --- a/graphics/libchamplain08/Makefile +++ b/graphics/libchamplain08/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/graphics/libchamplain08/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= libchamplain PORTVERSION= 0.8.3 @@ -13,13 +13,11 @@ COMMENT= C library aimed to provide a Gtk+ widget to display rasterized maps and LIB_DEPENDS= libclutter-gtk-0.10.so:${PORTSDIR}/graphics/clutter-gtk \ libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome -NO_STAGE= yes LATEST_LINK= libchamplain08 USE_BZIP2= yes USES= gmake pathfix pkgconfig -USE_GNOME= gtk20 ltverhack:1 gnomehier +USE_GNOME= gtk20 ltverhack gnomehier USE_GL= gl -USE_AUTOTOOLS= libtool USE_SQLITE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes @@ -43,4 +41,7 @@ CONFIGURE_ARGS+= --enable-python=no PLIST_SUB+= PYTHON="@comment " .endif +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.* + .include <bsd.port.mk> diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 0e73fb2af..810eef609 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -1,6 +1,6 @@ # Created by: Ade Lovett <ade@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/graphics/librsvg2/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= librsvg PORTVERSION= 2.36.4 @@ -16,23 +16,26 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ libcroco-0.6.so:${PORTSDIR}/textproc/libcroco RUN_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2 -NO_STAGE= yes USE_XZ= yes USES= gettext gmake pathfix pkgconfig USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes USE_GNOME= gnomehier gnomeprefix libgsf ltverhack gtk20 \ introspection:build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-svgz \ + --disable-vala \ --with-croco \ --disable-Bsymbolic \ --enable-gtk-theme -MAN1= rsvg-convert.1 post-patch: @${REINPLACE_CMD} -e 's|GTK3_REQUIRED=3.0.0|GTK3_REQUIRED=9.90.0|g' \ ${WRKSRC}/configure +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.* + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*/*/*/*.so + .include <bsd.port.mk> diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index dc1e5ea6a..fd119d909 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -15,6 +15,7 @@ lib/librsvg-2.la lib/librsvg-2.so lib/librsvg-2.so.2 libdata/pkgconfig/librsvg-2.0.pc +man/man1/rsvg-convert.1.gz share/doc/rsvg-2.0/RsvgHandle.html share/doc/rsvg-2.0/annotation-glossary.html share/doc/rsvg-2.0/api-index-2-14.html diff --git a/graphics/shared-color-profiles/Makefile b/graphics/shared-color-profiles/Makefile index 4c8532720..cb5637ff8 100644 --- a/graphics/shared-color-profiles/Makefile +++ b/graphics/shared-color-profiles/Makefile @@ -1,16 +1,15 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/graphics/shared-color-profiles/Makefile 18393 2013-04-26 21:23:07Z kwm $ +# $MCom$ PORTNAME= shared-color-profiles PORTVERSION= 0.1.5 CATEGORIES= graphics MASTER_SITES= http://people.freedesktop.org/~hughsient/releases/ -MAINTAINER= ahze@FreeBSD.org +MAINTAINER= gnome@FreeBSD.org COMMENT= Color profiles from contributors for color calibration -NO_STAGE= yes GNU_CONFIGURE= yes .include <bsd.port.mk> diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile index 1f25bdd89..9c7433754 100644 --- a/lang/gjs/Makefile +++ b/lang/gjs/Makefile @@ -1,7 +1,6 @@ - # Created by: Pawel Worach <pawel.worach@gmail.com> # $FreeBSD$ -# $MCom: ports/trunk/lang/gjs/Makefile 18581 2013-06-23 10:50:00Z kwm $ +# $MCom$ PORTNAME= gjs PORTVERSION= 1.34.0 @@ -17,11 +16,10 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ CONFLICTS_BUILD=spidermonkey17-1.7.* -NO_STAGE= yes USE_XZ= yes USES= gettext gmake pathfix pkgconfig shebangfix USE_PYTHON_BUILD=yes -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes USE_GNOME= cairo glib20 gnomeprefix introspection:build \ intlhack ltverhack USE_LDCONFIG= yes @@ -30,4 +28,8 @@ LDFLAGS+= -L${LOCALBASE}/lib SHEBANG_FILES= scripts/make-tests +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gjs-1.0/*.so + .include <bsd.port.mk> diff --git a/lang/gjs/pkg-plist b/lang/gjs/pkg-plist index 1a5a0558e..203ac5252 100644 --- a/lang/gjs/pkg-plist +++ b/lang/gjs/pkg-plist @@ -28,39 +28,28 @@ include/gjs-1.0/gjs/jsapi-util.h include/gjs-1.0/gjs/mem.h include/gjs-1.0/gjs/native.h include/gjs-1.0/gjs/type-module.h -lib/gjs-1.0/cairoNative.a lib/gjs-1.0/cairoNative.la lib/gjs-1.0/cairoNative.so -lib/gjs-1.0/console.a lib/gjs-1.0/console.la lib/gjs-1.0/console.so -lib/gjs-1.0/dbusNative.a lib/gjs-1.0/dbusNative.la lib/gjs-1.0/dbusNative.so -lib/gjs-1.0/debugger.a lib/gjs-1.0/debugger.la lib/gjs-1.0/debugger.so -lib/gjs-1.0/formatNative.a lib/gjs-1.0/formatNative.la lib/gjs-1.0/formatNative.so -lib/gjs-1.0/gettextNative.a lib/gjs-1.0/gettextNative.la lib/gjs-1.0/gettextNative.so -lib/gjs-1.0/langNative.a lib/gjs-1.0/langNative.la lib/gjs-1.0/langNative.so -lib/gjs-1.0/mainloop.a lib/gjs-1.0/mainloop.la lib/gjs-1.0/mainloop.so -lib/gjs-1.0/system.a lib/gjs-1.0/system.la lib/gjs-1.0/system.so lib/gjs/girepository-1.0/GjsPrivate-1.0.typelib -lib/libgjs-dbus.a lib/libgjs-dbus.la lib/libgjs-dbus.so lib/libgjs-dbus.so.0 -lib/libgjs.a lib/libgjs.la lib/libgjs.so lib/libgjs.so.0 diff --git a/lang/vala-vapigen/Makefile b/lang/vala-vapigen/Makefile index 89c298072..ca89701fd 100644 --- a/lang/vala-vapigen/Makefile +++ b/lang/vala-vapigen/Makefile @@ -1,5 +1,5 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> -# $FreeBSD: head/lang/vala-vapigen/Makefile 313633 2013-03-08 10:51:34Z kwm $ +# $FreeBSD$ # $MCom$ PORTREVISION= 0 @@ -7,7 +7,7 @@ CATEGORIES= devel gnome PKGNAMESUFFIX= -vapigen MAINTAINER= gnome@FreeBSD.org -COMMENT= The vapigen program from vala +COMMENT= Vapigen program from vala MASTERDIR= ${.CURDIR}/../vala BUILD_WRKSRC= ${WRKSRC}/vapigen diff --git a/lang/vala-vapigen/pkg-plist b/lang/vala-vapigen/pkg-plist index b95270d07..52bf13b41 100644 --- a/lang/vala-vapigen/pkg-plist +++ b/lang/vala-vapigen/pkg-plist @@ -7,6 +7,8 @@ bin/vapigen-%%VERSION%% lib/vala-%%VERSION%%/gen-introspect-%%VERSION%% libdata/pkgconfig/vapigen-%%VERSION%%.pc libdata/pkgconfig/vapigen.pc +man/man1/vala-gen-introspect.1.gz +man/man1/vapigen.1.gz share/aclocal/vapigen.m4 %%DATADIR%%/Makefile.vapigen @dirrm lib/vala-%%VERSION%% diff --git a/lang/vala/Makefile b/lang/vala/Makefile index c8a107a82..2002ebe4f 100644 --- a/lang/vala/Makefile +++ b/lang/vala/Makefile @@ -1,5 +1,5 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> -# $FreeBSD: head/lang/vala/Makefile 313635 2013-03-08 11:32:11Z bapt $ +# $FreeBSD$ # $MCom$ PORTNAME= vala @@ -12,7 +12,6 @@ COMMENT= Programming language and compiler that converts Vala code into C code LICENSE= LGPL21 -NO_STAGE= yes USES= bison gettext gmake pathfix pkgconfig USE_XZ= yes USE_GNOME= glib20 gnomeprefix libxslt @@ -21,7 +20,6 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes -MAN1?= valac.1 valac-${VALA_VER}.1 VALA_VER= ${PORTVERSION:R} PLIST_SUB= VERSION=${VALA_VER} @@ -31,7 +29,6 @@ LIB_DEPENDS+= libvala-${VALA_VER}.so:${PORTSDIR}/lang/vala CONFIGURE_ARGS+=--enable-vapigen BUILD_DEPENDS+= p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML RUN_DEPENDS+= p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML -MAN1= vala-gen-introspect.1 vapigen.1 .else CONFIGURE_ARGS+=--disable-vapigen .endif @@ -54,13 +51,14 @@ pre-build: ${GMAKE} gen-introspect post-install: - @cd ${WRKSRC}/gobject-introspection && ${GMAKE} install + @cd ${WRKSRC}/gobject-introspection && DESTDIR=${STAGEDIR} ${GMAKE} install @${INSTALL_MAN} ${WRKSRC}/doc/vapigen.1 ${WRKSRC}/doc/vala-gen-introspect.1 \ - ${PREFIX}/man/man1/ + ${STAGEDIR}${PREFIX}/man/man1/ .else post-install: ${LN} -fs ${PREFIX}/libdata/pkgconfig/libvala-${VALA_VER}.pc \ - ${PREFIX}/libdata/pkgconfig/vala-1.0.pc + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/vala-1.0.pc + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.* .endif .include <bsd.port.mk> diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist index 241299a6c..c47d38df5 100644 --- a/lang/vala/pkg-plist +++ b/lang/vala/pkg-plist @@ -11,6 +11,8 @@ lib/libvala-%%VERSION%%.so lib/libvala-%%VERSION%%.so.0 libdata/pkgconfig/libvala-%%VERSION%%.pc libdata/pkgconfig/vala-1.0.pc +man/man1/valac-%%VERSION%%.1.gz +man/man1/valac.1.gz share/aclocal/vala.m4 share/devhelp/books/vala-%%VERSION%%/attributes.html share/devhelp/books/vala-%%VERSION%%/classes.html diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index b0bf877ce..255935d6e 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,6 +1,6 @@ # Created by: Ade Lovett <ade@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/mail/evolution3/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= evolution PORTVERSION= 3.6.4 @@ -80,7 +80,7 @@ CONFIGURE_ARGS+=--with-openldap=no .endif .if ${PORT_OPTIONS:MWEATHER} -LIB_DEPENDS+= libgweather-3.so:${PORTSDIR}/net/libgweather3 +LIB_DEPENDS+= libgweather-3.so:${PORTSDIR}/net/libgweather CONFIGURE_ARGS+=--enable-weather PLIST_SUB+= WEATHER="" .else diff --git a/multimedia/libgnome-media-profiles/Makefile b/multimedia/libgnome-media-profiles/Makefile index 1a45190b0..91184ebce 100644 --- a/multimedia/libgnome-media-profiles/Makefile +++ b/multimedia/libgnome-media-profiles/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/multimedia/libgnome-media-profiles/Makefile 18393 2013-04-26 21:23:07Z kwm $ +# $MCom$ PORTNAME= libgnome-media-profiles PORTVERSION= 3.0.0 @@ -12,7 +12,6 @@ COMMENT= Library that contains code to manage media profiles CONFLICTS= gnome-media-2.[0-9]* -NO_STAGE= yes USE_GNOME= gtk30 gconf2 intlhack gnomedocutils GNU_CONFIGURE= yes USE_GSTREAMER= yes @@ -25,4 +24,7 @@ GCONF_SCHEMAS= gnome-media-profiles.schemas post-patch: @${REINPLACE_CMD} -e 's|gladeui-3.0|gladeui-5.0|g' ${WRKSRC}/configure +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* + .include <bsd.port.mk> diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index ca75de06a..c6d9bbbce 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -1,6 +1,6 @@ # Created by: Hendrik Scholz <hendrik@scholz.net> # $FreeBSD$ -# $MCom: ports/trunk/multimedia/totem3/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= totem PORTVERSION= 3.6.3 @@ -26,7 +26,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co gnome-icon-theme-symbolic>=2.91.0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \ grilo-plugins>=0.2:${PORTSDIR}/net/grilo-plugins -NO_STAGE= yes USE_PYTHON= yes USE_XORG= x11 xproto xtst ice sm USE_XZ= yes @@ -35,24 +34,22 @@ USE_GNOME= gnomeprefix intlhack gtk30 libxml2 nautilus3 ltverhack \ pygobject3 gnomedocutils gnomehier introspection:build USE_GSTREAMER1= core good bad soup ugly INSTALLS_ICONS= yes -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALLS_OMF= yes PKGMESSAGE= ${WRKDIR}/pkg-message CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= LIBS="-lXrandr" \ - BROWSER_PLUGIN_DIR="${WEBPLUGINS_DIR}" +CONFIGURE_ENV= LIBS="-lXrandr" CONFIGURE_ARGS= --with-plugins="${TOTEM_PLUGINS}" SHEBANG_FILES= data/totem-bugreport.py -MAN1= totem.1 totem-video-thumbnailer.1 GLIB_SCHEMAS= org.gnome.totem.enums.xml \ org.gnome.totem.gschema.xml \ org.gnome.totem.plugins.opensubtitles.gschema.xml OPTIONS_DEFINE= LIRC BROWSER_PLUGINS -BROWSER_PLUGINS_DESC= Plugins for gecko browser +BROWSER_PLUGINS_DESC= Web browser plugins TRACKER_DESC= Tracker local search plugin OPTIONS_DEFAULT=BROWSER_PLUGINS @@ -91,11 +88,12 @@ CONFIGURE_ARGS+=--enable-browser-plugins \ --enable-narrowspace-plugin PLIST_SUB+= BROWSER_PLUGINS="" -USE_WEBPLUGINS= webkit-gtk3 -WEBPLUGINS_FILES= libtotem-cone-plugin.so libtotem-gmp-plugin.so \ +USES+= webplugin:native +WEBPLUGIN_FILES= libtotem-cone-plugin.so libtotem-gmp-plugin.so \ libtotem-mully-plugin.so \ libtotem-narrowspace-plugin.so -.include "${PORTSDIR}/www/firefox/Makefile.webplugins" +CONFIGURE_ENV+= BROWSER_PLUGIN_DIR="${WEBPLUGIN_DIR}" + .else CONFIGURE_ARGS+=--disable-browser-plugins \ --disable-basic-plugin \ @@ -123,7 +121,5 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtotem.so.0 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/nautilus/extensions-3.0/libtotem-properties-page.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/browser_plugins/totem/libtotem-*-plugin.so -# remove after stage conversion - @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist index c171ad1fe..6ce67b883 100644 --- a/multimedia/totem/pkg-plist +++ b/multimedia/totem/pkg-plist @@ -7,21 +7,21 @@ include/totem/1.0/totem-interface.h include/totem/1.0/totem-plugin.h include/totem/1.0/totem-video-list.h include/totem/1.0/totem.h -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.a -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.la -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.so -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.a -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.la -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.so -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-mully-plugin.a -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-mully-plugin.la -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-mully-plugin.so -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.a -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.la -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.so -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-vegas-plugin.a -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-vegas-plugin.la -%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-vegas-plugin.so +%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-cone-plugin.a +%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-cone-plugin.la +%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-cone-plugin.so +%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-gmp-plugin.a +%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-gmp-plugin.la +%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-gmp-plugin.so +%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-mully-plugin.a +%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-mully-plugin.la +%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-mully-plugin.so +%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-narrowspace-plugin.a +%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-narrowspace-plugin.la +%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-narrowspace-plugin.so +%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-vegas-plugin.a +%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-vegas-plugin.la +%%BROWSER_PLUGINS%%%%WEBPLUGIN_DIR%%/libtotem-vegas-plugin.so lib/girepository-1.0/Totem-1.0.typelib lib/libtotem.a lib/libtotem.la @@ -104,8 +104,8 @@ lib/totem/plugins/skipto/skipto.ui libdata/pkgconfig/totem.pc %%BROWSER_PLUGINS%%libexec/totem-plugin-viewer libexec/totem/totem-bugreport.py -@comment man/man1/totem.1.gz -@comment man/man1/totem-video-thumbnailer.1.gz +man/man1/totem.1.gz +man/man1/totem-video-thumbnailer.1.gz share/GConf/gsettings/opensubtitles.convert share/GConf/gsettings/totem.convert share/applications/totem.desktop @@ -660,6 +660,6 @@ share/thumbnailers/totem.thumbnailer @dirrm lib/totem/plugins/brasero-disc-recorder @dirrm lib/totem/plugins @dirrm lib/totem -%%BROWSER_PLUGINS%%@dirrmtry %%WEBPLUGINS_DIR%% +%%BROWSER_PLUGINS%%@dirrmtry %%WEBPLUGIN_DIR%% @dirrm include/totem/1.0 @dirrm include/totem diff --git a/net-im/ekiga/Makefile b/net-im/ekiga/Makefile index 39a2d8a9a..f33c97376 100644 --- a/net-im/ekiga/Makefile +++ b/net-im/ekiga/Makefile @@ -1,5 +1,5 @@ # Created by: Charlie & <root@ws.ipfw.ru> -# $FreeBSD: net-im/ekiga/Makefile 327752 2013-09-20 21:52:21Z kwm $ +# $FreeBSD$ # $MCom$ PORTNAME= ekiga diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile index b525737ae..aa5f461f9 100644 --- a/net-im/farsight2/Makefile +++ b/net-im/farsight2/Makefile @@ -1,5 +1,5 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> -# $FreeBSD: head/net-im/farsight2/Makefile 327756 2013-09-20 22:13:34Z bapt $ +# $FreeBSD$ # $MCom$ PORTNAME= farsight2 diff --git a/net-im/libnice-gst010/Makefile b/net-im/libnice-gst010/Makefile index 489d6328e..4ff21203b 100644 --- a/net-im/libnice-gst010/Makefile +++ b/net-im/libnice-gst010/Makefile @@ -7,7 +7,7 @@ PKGNAMESUFFIX= -gst010 MAINTAINER= gnome@FreeBSD.org COMMENT= GStreamer 0.10 plugin from libnice -LIB_DEPENDS= nice:${PORTSDIR}/net-im/libnice +LIB_DEPENDS= libnice.so:${PORTSDIR}/net-im/libnice MASTERDIR= ${.CURDIR}/../libnice DESCR= ${.CURDIR}/pkg-descr diff --git a/net-im/libnice-gst1/Makefile b/net-im/libnice-gst1/Makefile index fd3f7ff3f..e2d1dd8c1 100644 --- a/net-im/libnice-gst1/Makefile +++ b/net-im/libnice-gst1/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -gst1 MAINTAINER= gnome@FreeBSD.org COMMENT= GStreamer 1 plugin from libnice -LIB_DEPENDS= nice:${PORTSDIR}/net-im/libnice +LIB_DEPENDS= libnice.so:${PORTSDIR}/net-im/libnice MASTERDIR= ${.CURDIR}/../libnice DESCR= ${.CURDIR}/pkg-descr diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile index 7fe7168ca..e566fa661 100644 --- a/net-im/libnice/Makefile +++ b/net-im/libnice/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/net-im/libnice/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= libnice PORTVERSION= 0.1.4 @@ -10,11 +10,10 @@ MASTER_SITES= http://nice.freedesktop.org/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= Library and transmitter that implements ICE-19 -NO_STAGE= yes USES= gettext gmake pathfix pkgconfig USE_LDCONFIG= yes USE_GNOME= glib20 ltverhack -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_GETIFADDRS LDFLAGS+= -L${LOCALBASE}/lib @@ -50,4 +49,11 @@ post-patch: @${REINPLACE_CMD} -e 's|-Wno-missing-field-initializers|#|g' \ ${WRKSRC}/common.mk +post-install: +.if !defined(LIBNICE_SLAVE) + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* +.else + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*/lib*.so +.endif + .include <bsd.port.mk> diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile index 7fac34996..ee8496ed1 100644 --- a/net-im/loudmouth/Makefile +++ b/net-im/loudmouth/Makefile @@ -12,10 +12,9 @@ COMMENT= Lightweight Jabber client library LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn -NO_STAGE= yes USE_BZIP2= yes USES= gettext gmake pathfix pkgconfig -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_GNOME= glib20 ltverhack CONFIGURE_ARGS= --disable-gtk-doc @@ -47,4 +46,7 @@ post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/loudmouth/lm-ssl-gnutls.c +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* + .include <bsd.port.mk> diff --git a/net-im/telepathy-farstream/Makefile b/net-im/telepathy-farstream/Makefile index 8fa7b8fa8..068bf684a 100644 --- a/net-im/telepathy-farstream/Makefile +++ b/net-im/telepathy-farstream/Makefile @@ -15,14 +15,11 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \ libfarstream-0.2.so:${PORTSDIR}/net-im/farstream -NO_STAGE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_PYTHON= yes -USE_AUTOTOOLS= libtool USES= gmake pathfix pkgconfig USE_GNOME= glib20 libxslt:build ltverhack -CONFIGURE_ENV= LIBS="-pthread" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -30,4 +27,7 @@ post-patch: @${REINPLACE_CMD} -e 's|\(^pkgconfigdir =\).*|\1 ${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/telepathy-farstream/Makefile.in +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* + .include <bsd.port.mk> diff --git a/net-im/telepathy-farstream/pkg-plist b/net-im/telepathy-farstream/pkg-plist index 8e7afbb89..99c71aa1e 100644 --- a/net-im/telepathy-farstream/pkg-plist +++ b/net-im/telepathy-farstream/pkg-plist @@ -8,16 +8,19 @@ lib/libtelepathy-farstream.so lib/libtelepathy-farstream.so.3 libdata/pkgconfig/telepathy-farstream.pc share/gir-1.0/TelepathyFarstream-0.6.gir -share/doc/telepathy-farstream/TfChannel.html -share/doc/telepathy-farstream/TfContent.html -share/doc/telepathy-farstream/ch01.html -share/doc/telepathy-farstream/home.png -share/doc/telepathy-farstream/index.html -share/doc/telepathy-farstream/index.sgml -share/doc/telepathy-farstream/left.png -share/doc/telepathy-farstream/right.png -share/doc/telepathy-farstream/style.css -share/doc/telepathy-farstream/up.png -share/doc/telepathy-farstream/telepathy-farstream.devhelp2 -@dirrm share/doc/telepathy-farstream +share/gtk-doc/html/telepathy-farstream/TfChannel.html +share/gtk-doc/html/telepathy-farstream/TfContent.html +share/gtk-doc/html/telepathy-farstream/ch01.html +share/gtk-doc/html/telepathy-farstream/home.png +share/gtk-doc/html/telepathy-farstream/index.html +share/gtk-doc/html/telepathy-farstream/index.sgml +share/gtk-doc/html/telepathy-farstream/left.png +share/gtk-doc/html/telepathy-farstream/right.png +share/gtk-doc/html/telepathy-farstream/style.css +share/gtk-doc/html/telepathy-farstream/telepathy-farstream.devhelp2 +share/gtk-doc/html/telepathy-farstream/up.png +@dirrm share/gtk-doc/html/telepathy-farstream +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc @dirrm include/telepathy-1.0/telepathy-farstream + diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile index cbc7e0077..352640558 100644 --- a/net-im/telepathy-glib/Makefile +++ b/net-im/telepathy-glib/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -# $MCom: ports/trunk/net-im/telepathy-glib/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= telepathy-glib PORTVERSION= 0.20.2 @@ -15,8 +15,6 @@ RUN_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen PORTSCOUT= limitw:1,even -NO_STAGE= yes -USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USES= gmake pathfix pkgconfig USE_GNOME= glib20 gnomehier introspection:build libxslt:build ltverhack @@ -25,4 +23,7 @@ MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-vala-bindings +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* + .include <bsd.port.mk> diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile index 0421fa840..199390253 100644 --- a/net-im/telepathy-qt4/Makefile +++ b/net-im/telepathy-qt4/Makefile @@ -1,5 +1,5 @@ # Created by: Alberto Villa <avilla@FreeBSD.org> -# $FreeBSD: net-im/telepathy-qt4/Makefile 327756 2013-09-20 22:13:34Z bapt $ +# $FreeBSD$ # $MCom$ PORTNAME= telepathy-qt4 diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile index ce8cbdab8..2b9e40e19 100644 --- a/net-im/telepathy-salut/Makefile +++ b/net-im/telepathy-salut/Makefile @@ -1,6 +1,6 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/net-im/telepathy-salut/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= telepathy-salut PORTVERSION= 0.8.0 @@ -14,7 +14,6 @@ LIB_DEPENDS= libavahi-glib.so:${PORTSDIR}/net/avahi-app \ libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \ libsoup-2.4.so:${PORTSDIR}/devel/libsoup -NO_STAGE= yes GNU_CONFIGURE= yes USES= gmake pathfix pkgconfig USE_GNOME= glib20 libxslt:build @@ -25,11 +24,12 @@ CONFIGURE_ARGS= --disable-Werror --enable-avahi-tests=no CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -MAN8= telepathy-salut.8 - post-patch: @${REINPLACE_CMD} -e 's|make -C|${GMAKE} -C|g' \ ${WRKSRC}/src/Makefile.in \ ${WRKSRC}/tests/Makefile.in +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/telepathy/salut-0/lib/lib*.so + .include <bsd.port.mk> diff --git a/net-im/telepathy-salut/pkg-plist b/net-im/telepathy-salut/pkg-plist index 9e7944e82..228910651 100644 --- a/net-im/telepathy-salut/pkg-plist +++ b/net-im/telepathy-salut/pkg-plist @@ -6,6 +6,7 @@ lib/telepathy/salut-0/lib/libwocky.a lib/telepathy/salut-0/lib/libwocky.la lib/telepathy/salut-0/lib/libwocky.so libexec/telepathy-salut +man/man8/telepathy-salut.8.gz share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.salut.service %%DOCSDIR%%/clique.html share/telepathy/managers/salut.manager diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile index 65c7c7b75..2998e32be 100644 --- a/net/glib-networking/Makefile +++ b/net/glib-networking/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/net/glib-networking/Makefile 18537 2013-06-16 20:08:30Z kwm $ +# $MCom$ PORTNAME= glib-networking PORTVERSION= 2.36.2 @@ -20,7 +20,6 @@ LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas -NO_STAGE= yes USE_XZ= yes GNU_CONFIGURE= yes USE_GNOME= glib20 intltool @@ -32,4 +31,7 @@ LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e' s|-Wmissing-include-dirs||g' ${WRKSRC}/configure +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gio/modules/lib*.so + .include <bsd.port.mk> diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile index c6c7a53d6..a89f26a21 100644 --- a/net/gtk-vnc/Makefile +++ b/net/gtk-vnc/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gtk-vnc -PORTVERSION= 0.3.10 -PORTREVISION= 8 +PORTVERSION= 0.4.4 CATEGORIES= net gnome MASTER_SITES= GNOME @@ -12,19 +11,23 @@ COMMENT= VNC viewer widget for GTK+ LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ - libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \ - libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext + libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 -CONFLICTS= gtk-vnc-0.4.[0-9]* +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING.LIB -NO_STAGE= yes -USE_GNOME= pygtk2 +USE_XZ= yes +USE_GNOME= gtk20 introspection:build USES= gettext gmake pathfix pkgconfig USE_LDCONFIG= yes -USE_PYTHON= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --with-gtkglext=yes +CONFIGURE_ARGS= --with-gtk=2.0 --enable-introspection \ + --disable-plugin --without-python +MAKE_JOBS_UNSAFE=yes + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.0 .include <bsd.port.mk> diff --git a/net/gtk-vnc/distinfo b/net/gtk-vnc/distinfo index ef8bf092a..764f4cc43 100644 --- a/net/gtk-vnc/distinfo +++ b/net/gtk-vnc/distinfo @@ -1,2 +1,2 @@ -SHA256 (gtk-vnc-0.3.10.tar.gz) = 61fdc1824e5621ba77a116fae7e512ced377a914ad34b2a694188277ca679384 -SIZE (gtk-vnc-0.3.10.tar.gz) = 604228 +SHA256 (gtk-vnc-0.4.4.tar.xz) = c93fdb53c78b52a1cfa067c1a0be0b93d4adfc17ccea1215f20eeab2818308b7 +SIZE (gtk-vnc-0.4.4.tar.xz) = 377304 diff --git a/net/gtk-vnc/files/patch-configure b/net/gtk-vnc/files/patch-configure new file mode 100644 index 000000000..eb14a6abc --- /dev/null +++ b/net/gtk-vnc/files/patch-configure @@ -0,0 +1,427 @@ +--- configure.orig 2013-12-15 11:12:43.000000000 +0100 ++++ configure 2013-12-15 11:18:53.000000000 +0100 +@@ -620,14 +620,16 @@ + WITH_VALA_FALSE + WITH_VALA_TRUE + VAPIGEN +-G_IR_SCANNER_SYMBOL_PREFIX_FALSE +-G_IR_SCANNER_SYMBOL_PREFIX_TRUE +-WITH_GOBJECT_INTROSPECTION_FALSE +-WITH_GOBJECT_INTROSPECTION_TRUE +-G_IR_COMPILER +-G_IR_SCANNER +-GOBJECT_INTROSPECTION_LIBS +-GOBJECT_INTROSPECTION_CFLAGS ++HAVE_INTROSPECTION_FALSE ++HAVE_INTROSPECTION_TRUE ++INTROSPECTION_MAKEFILE ++INTROSPECTION_LIBS ++INTROSPECTION_CFLAGS ++INTROSPECTION_TYPELIBDIR ++INTROSPECTION_GIRDIR ++INTROSPECTION_GENERATE ++INTROSPECTION_COMPILER ++INTROSPECTION_SCANNER + ENABLE_PLUGIN_FALSE + ENABLE_PLUGIN_TRUE + WITH_EXAMPLES_FALSE +@@ -915,9 +917,7 @@ + FIREFOX_PLUGIN_CFLAGS + FIREFOX_PLUGIN_LIBS + MOZILLA_PLUGIN_CFLAGS +-MOZILLA_PLUGIN_LIBS +-GOBJECT_INTROSPECTION_CFLAGS +-GOBJECT_INTROSPECTION_LIBS' ++MOZILLA_PLUGIN_LIBS' + + + # Initialize some variables set by options. +@@ -1555,7 +1555,8 @@ + --enable-iso-c Try to warn if code is not ISO C + --enable-plugin=no/yes enable browser plugin default=no + --disable-rebuilds disable all source autogeneration rules +- --enable-introspection enable GObject introspection ++ --enable-introspection=[no/auto/yes] ++ Enable introspection for this build + --enable-vala enable Vala binding generation + + Optional Packages: +@@ -1624,11 +1625,6 @@ + C compiler flags for MOZILLA_PLUGIN, overriding pkg-config + MOZILLA_PLUGIN_LIBS + linker flags for MOZILLA_PLUGIN, overriding pkg-config +- GOBJECT_INTROSPECTION_CFLAGS +- C compiler flags for GOBJECT_INTROSPECTION, overriding +- pkg-config +- GOBJECT_INTROSPECTION_LIBS +- linker flags for GOBJECT_INTROSPECTION, overriding pkg-config + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. +@@ -15735,286 +15731,98 @@ + fi + + +-# Check whether --enable-introspection was given. +-if test "${enable_introspection+set}" = set; then : +- enableval=$enable_introspection; +-else +- enable_introspection=check +-fi +- +- +-has_symbol_prefix=no +-if test "x$enable_introspection" != "xno" ; then +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT_INTROSPECTION" >&5 +-$as_echo_n "checking for GOBJECT_INTROSPECTION... " >&6; } +- +-if test -n "$GOBJECT_INTROSPECTION_CFLAGS"; then +- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS="$GOBJECT_INTROSPECTION_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_DESIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$GOBJECT_INTROSPECTION_LIBS"; then +- pkg_cv_GOBJECT_INTROSPECTION_LIBS="$GOBJECT_INTROSPECTION_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_DESIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GOBJECT_INTROSPECTION_LIBS=`$PKG_CONFIG --libs "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- + +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes ++ # Check whether --enable-introspection was given. ++if test "${enable_introspection+set}" = set; then : ++ enableval=$enable_introspection; + else +- _pkg_short_errors_supported=no ++ enable_introspection=auto + fi +- if test $_pkg_short_errors_supported = yes; then +- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>&1` +- else +- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$GOBJECT_INTROSPECTION_PKG_ERRORS" >&5 +- + + +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT_INTROSPECTION" >&5 +-$as_echo_n "checking for GOBJECT_INTROSPECTION... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5 ++$as_echo_n "checking for gobject-introspection... " >&6; } + +-if test -n "$GOBJECT_INTROSPECTION_CFLAGS"; then +- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS="$GOBJECT_INTROSPECTION_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$GOBJECT_INTROSPECTION_LIBS"; then +- pkg_cv_GOBJECT_INTROSPECTION_LIBS="$GOBJECT_INTROSPECTION_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5 ++ case $enable_introspection in #( ++ no) : ++ found_introspection="no (disabled, use --enable-introspection to enable)" ++ ;; #( ++ yes) : ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GOBJECT_INTROSPECTION_LIBS=`$PKG_CONFIG --libs "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1` +- else +- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$GOBJECT_INTROSPECTION_PKG_ERRORS" >&5 +- +- +- if test "x$enable_introspection" = "xcheck"; then +- enable_introspection=no +- else +- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5 +- fi +- +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +- if test "x$enable_introspection" = "xcheck"; then +- enable_introspection=no +- else +- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5 +- fi +- ++ : + else +- GOBJECT_INTROSPECTION_CFLAGS=$pkg_cv_GOBJECT_INTROSPECTION_CFLAGS +- GOBJECT_INTROSPECTION_LIBS=$pkg_cv_GOBJECT_INTROSPECTION_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +- enable_introspection=yes +- has_symbol_prefix=no +- ++ as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5 + fi +- +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT_INTROSPECTION" >&5 +-$as_echo_n "checking for GOBJECT_INTROSPECTION... " >&6; } +- +-if test -n "$GOBJECT_INTROSPECTION_CFLAGS"; then +- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS="$GOBJECT_INTROSPECTION_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5 ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.4\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null` ++ found_introspection=yes + else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried ++ as_fn_error $? "You need to have gobject-introspection >= 0.9.4 installed to build gtk-vnc" "$LINENO" 5 + fi +-if test -n "$GOBJECT_INTROSPECTION_LIBS"; then +- pkg_cv_GOBJECT_INTROSPECTION_LIBS="$GOBJECT_INTROSPECTION_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5 ++ ;; #( ++ auto) : ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.4\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GOBJECT_INTROSPECTION_LIBS=`$PKG_CONFIG --libs "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null` ++ found_introspection=yes + else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried ++ found_introspection=no + fi ++ enable_introspection=$found_introspection ++ ;; #( ++ *) : ++ as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 ++ ;; ++esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5 ++$as_echo "$found_introspection" >&6; } + ++ INTROSPECTION_SCANNER= ++ INTROSPECTION_COMPILER= ++ INTROSPECTION_GENERATE= ++ INTROSPECTION_GIRDIR= ++ INTROSPECTION_TYPELIBDIR= ++ if test "x$found_introspection" = "xyes"; then ++ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` ++ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` ++ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` ++ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` ++ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" ++ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` ++ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` ++ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection ++ fi + + +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1` +- else +- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$GOBJECT_INTROSPECTION_PKG_ERRORS" >&5 +- + +- if test "x$enable_introspection" = "xcheck"; then +- enable_introspection=no +- else +- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5 +- fi + +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + +- if test "x$enable_introspection" = "xcheck"; then +- enable_introspection=no +- else +- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5 +- fi + +-else +- GOBJECT_INTROSPECTION_CFLAGS=$pkg_cv_GOBJECT_INTROSPECTION_CFLAGS +- GOBJECT_INTROSPECTION_LIBS=$pkg_cv_GOBJECT_INTROSPECTION_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } + +- enable_introspection=yes +- has_symbol_prefix=no + +-fi + ++ if test "x$found_introspection" = "xyes"; then ++ HAVE_INTROSPECTION_TRUE= ++ HAVE_INTROSPECTION_FALSE='#' + else +- GOBJECT_INTROSPECTION_CFLAGS=$pkg_cv_GOBJECT_INTROSPECTION_CFLAGS +- GOBJECT_INTROSPECTION_LIBS=$pkg_cv_GOBJECT_INTROSPECTION_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +- enable_introspection=yes +- has_symbol_prefix=yes +- ++ HAVE_INTROSPECTION_TRUE='#' ++ HAVE_INTROSPECTION_FALSE= + fi + +- if test "x$enable_introspection" = "xyes" ; then +- +-$as_echo "#define WITH_GOBJECT_INTROSPECTION 1" >>confdefs.h +- +- +- +- G_IR_SCANNER=$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0) + +- G_IR_COMPILER=$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0) +- +- fi +-fi +- if test "x$enable_introspection" = "xyes"; then +- WITH_GOBJECT_INTROSPECTION_TRUE= +- WITH_GOBJECT_INTROSPECTION_FALSE='#' +-else +- WITH_GOBJECT_INTROSPECTION_TRUE='#' +- WITH_GOBJECT_INTROSPECTION_FALSE= +-fi +- +- if test "x$has_symbol_prefix" = "xyes"; then +- G_IR_SCANNER_SYMBOL_PREFIX_TRUE= +- G_IR_SCANNER_SYMBOL_PREFIX_FALSE='#' +-else +- G_IR_SCANNER_SYMBOL_PREFIX_TRUE='#' +- G_IR_SCANNER_SYMBOL_PREFIX_FALSE= +-fi + + + if test "x$with_gtk" = "x3.0"; then +@@ -16030,7 +15838,7 @@ + enable_vala="$default_vala" + fi + +-if test "x$enable_introspection" = "xyes" ; then ++if test "x$found_introspection" = "xyes" ; then + if test "x$enable_vala" != "xno" ; then + # Extract the first word of "vapigen", so it can be a program name with args. + set dummy vapigen; ac_word=$2 +@@ -16264,12 +16072,8 @@ + as_fn_error $? "conditional \"ENABLE_PLUGIN\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi +-if test -z "${WITH_GOBJECT_INTROSPECTION_TRUE}" && test -z "${WITH_GOBJECT_INTROSPECTION_FALSE}"; then +- as_fn_error $? "conditional \"WITH_GOBJECT_INTROSPECTION\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${G_IR_SCANNER_SYMBOL_PREFIX_TRUE}" && test -z "${G_IR_SCANNER_SYMBOL_PREFIX_FALSE}"; then +- as_fn_error $? "conditional \"G_IR_SCANNER_SYMBOL_PREFIX\" was never defined. ++if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WITH_VALA_TRUE}" && test -z "${WITH_VALA_FALSE}"; then diff --git a/net/gtk-vnc/files/patch-src_Makefile.in b/net/gtk-vnc/files/patch-src_Makefile.in new file mode 100644 index 000000000..a87c4399b --- /dev/null +++ b/net/gtk-vnc/files/patch-src_Makefile.in @@ -0,0 +1,206 @@ +--- src/Makefile.in.orig 2013-12-15 11:10:12.000000000 +0100 ++++ src/Makefile.in 2013-12-15 11:07:30.000000000 +0100 +@@ -95,10 +95,13 @@ + @WITH_PYTHON_TRUE@am__append_11 = vnc.defs vncmodule.defs.c + @WITH_PYTHON_TRUE@am__append_12 = vnc.override + @WITH_PYTHON_FALSE@am__append_13 = vnc.override vncmodule.c +-@HAVE_GTK_2_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE@am__append_14 = \ +-@HAVE_GTK_2_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncimageframebuffer.h $(srcdir)/vncimageframebuffer.c ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_14 = \ ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncimageframebuffer.h $(srcdir)/vncimageframebuffer.c + +-@WITH_GOBJECT_INTROSPECTION_TRUE@am__append_15 = $(gir_DATA) $(typelibs_DATA) ++@HAVE_INTROSPECTION_TRUE@am__append_15 = GVnc-1.0.gir ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_16 = GtkVnc-1.0.gir ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@am__append_17 = GtkVnc-2.0.gir ++@HAVE_INTROSPECTION_TRUE@am__append_18 = $(gir_DATA) $(typelibs_DATA) + subdir = src + DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/mkinstalldirs \ +@@ -355,8 +358,6 @@ + GNUTLS_LIBS = @GNUTLS_LIBS@ + GNUTLS_REQUIRED = @GNUTLS_REQUIRED@ + GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +-GOBJECT_INTROSPECTION_CFLAGS = @GOBJECT_INTROSPECTION_CFLAGS@ +-GOBJECT_INTROSPECTION_LIBS = @GOBJECT_INTROSPECTION_LIBS@ + GOBJECT_LIBS = @GOBJECT_LIBS@ + GOBJECT_REQUIRED = @GOBJECT_REQUIRED@ + GREP = @GREP@ +@@ -367,8 +368,6 @@ + GTK_LIBS = @GTK_LIBS@ + GTK_REQUIRED = @GTK_REQUIRED@ + GTK_VNC_API_VERSION = @GTK_VNC_API_VERSION@ +-G_IR_COMPILER = @G_IR_COMPILER@ +-G_IR_SCANNER = @G_IR_SCANNER@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -380,6 +379,14 @@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ ++INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ ++INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ ++INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ ++INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ ++INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ ++INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ ++INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ ++INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ +@@ -613,7 +620,7 @@ + vncconnectionenums.h vncconnectionenums.c + + CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_11) \ +- $(am__append_15) ++ $(am__append_18) + @WITH_PYTHON_TRUE@pyexec_LTLIBRARIES = gtkvnc.la + @WITH_PYTHON_TRUE@gtkvnc_la_LIBADD = libgtk-vnc-$(GTK_VNC_API_VERSION).la @PYGTK_LIBS@ + @WITH_PYTHON_TRUE@gtkvnc_la_CFLAGS = @GTK_CFLAGS@ @PYTHON_INCLUDES@ \ +@@ -624,31 +631,62 @@ + @WITH_PYTHON_TRUE@nodist_gtkvnc_la_SOURCES = vncmodule.defs.c + @WITH_PYTHON_TRUE@CODEGENDIR = $(shell pkg-config --variable=codegendir pygtk-2.0) + @WITH_PYTHON_TRUE@DEFSDIR = $(shell pkg-config --variable=defsdir pygtk-2.0) +-@WITH_GOBJECT_INTROSPECTION_TRUE@GVNC_INTROSPECTION_SRCS = \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncpixelformat.h \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncframebuffer.h $(srcdir)/vncframebuffer.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncbaseframebuffer.h $(srcdir)/vncbaseframebuffer.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncconnectionenums.h $(builddir)/vncconnectionenums.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncutil.h $(srcdir)/vncutil.c +- +-@WITH_GOBJECT_INTROSPECTION_TRUE@GTK_VNC_INTROSPECTION_SRCS = $(srcdir)/vnccairoframebuffer.h \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccairoframebuffer.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.h \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.h \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.h \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.c \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(am__append_14) +-@G_IR_SCANNER_SYMBOL_PREFIX_FALSE@@WITH_GOBJECT_INTROSPECTION_TRUE@PREFIX_ARGS = --strip-prefix=Vnc +-@G_IR_SCANNER_SYMBOL_PREFIX_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE@PREFIX_ARGS = --symbol-prefix=vnc --identifier-prefix=Vnc +-@WITH_GOBJECT_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 +-@WITH_GOBJECT_INTROSPECTION_TRUE@gir_DATA = GVnc-1.0.gir GtkVnc-$(GTK_VNC_API_VERSION).gir +-@WITH_GOBJECT_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0 +-@WITH_GOBJECT_INTROSPECTION_TRUE@typelibs_DATA = GVnc-1.0.typelib GtkVnc-$(GTK_VNC_API_VERSION).typelib ++INTROSPECTION_GIRS = $(am__append_15) $(am__append_16) \ ++ $(am__append_17) ++INTROSPECTION_SCANNER_ARGS = --symbol-prefix=vnc \ ++ --identifier-prefix=Vnc \ ++ --add-include-path=$(top_srcdir) \ ++ --add-include-path=$(srcdir) \ ++ --add-include-path=$(builddir) ++ ++INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir) \ ++ --includedir=$(srcdir) ++ ++@HAVE_INTROSPECTION_TRUE@GVNC_INTROSPECTION_SRCS = \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncpixelformat.h \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncframebuffer.h $(srcdir)/vncframebuffer.c \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncbaseframebuffer.h $(srcdir)/vncbaseframebuffer.c \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \ ++@HAVE_INTROSPECTION_TRUE@ $(builddir)/vncconnectionenums.h $(builddir)/vncconnectionenums.c \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncutil.h $(srcdir)/vncutil.c ++ ++@HAVE_INTROSPECTION_TRUE@GTK_VNC_INTROSPECTION_SRCS = \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccairoframebuffer.h \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccairoframebuffer.c \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.h \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.c \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.h \ ++@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.c \ ++@HAVE_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.h \ ++@HAVE_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.c \ ++@HAVE_INTROSPECTION_TRUE@ $(am__append_14) ++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_INCLUDES = GObject-2.0 ++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_PACKAGES = gobject-2.0 ++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_EXPORT_PACKAGES = gvnc-1.0 ++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_LIBS = libgvnc-1.0.la ++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_FILES = $(GVNC_INTROSPECTION_SRCS) ++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) ++@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_SCANNERFLAGS = --c-include="gvnc.h" ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_INCLUDES = GObject-2.0 GVnc-1.0 ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_PACKAGES = gobject-2.0 gtk+-$(GTK_API_VERSION) ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_EXPORT_PACKAGES = gtk-vnc-$(GTK_VNC_API_VERSION) ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_LIBS = libgvnc-1.0.la libgtk-vnc-$(GTK_VNC_API_VERSION).la ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_FILES = $(GTK_VNC_INTROSPECTION_SRCS) ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) $(libgvncpulse_1_0_la_CFLAGS) ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_SCANNERFLAGS = --c-include="gtk-vnc.h" ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_INCLUDES = GObject-2.0 GVnc-1.0 ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_PACKAGES = gobject-2.0 gtk+-$(GTK_API_VERSION) ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_EXPORT_PACKAGES = gtk-vnc-$(GKT_VNC_API_VERSION) ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_LIBS = libgvnc-1.0.la libgtk-vnc-$(GTK_VNC_API_VERSION).la ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_FILES = $(GTK_VNC_INTROSPECTION_SRCS) ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) $(libgvncpulse_1_0_la_CFLAGS) ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_SCANNERFLAGS = --c-include="gtk-vnc.h" ++@HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 ++@HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS) ++@HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0 ++@HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +@@ -1452,50 +1490,12 @@ + @WITH_PYTHON_TRUE@ --register $(DEFSDIR)/gtk-types.defs \ + @WITH_PYTHON_TRUE@ --override $(srcdir)/vnc.override vnc.defs > $@ + +-@WITH_GOBJECT_INTROSPECTION_TRUE@GVnc-1.0.gir: libgvnc-1.0.la $(G_IR_SCANNER) Makefile.am +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir) $(G_IR_SCANNER) -v \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --namespace GVnc \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --nsversion 1.0 \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include GObject-2.0 \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(PREFIX_ARGS) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --library=$(builddir)/libgvnc-1.0.la \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(top_srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(builddir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --c-include="gvnc.h" \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --output $@ \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(top_srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --verbose \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --pkg=gvnc-1.0 \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(GVNC_INTROSPECTION_SRCS) +- +-@WITH_GOBJECT_INTROSPECTION_TRUE@GtkVnc-$(GTK_VNC_API_VERSION).gir: GVnc-1.0.gir libgtk-vnc-$(GTK_VNC_API_VERSION).la $(G_IR_SCANNER) Makefile.am +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir) $(G_IR_SCANNER) -v \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --namespace GtkVnc \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --nsversion $(GTK_VNC_API_VERSION) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include GObject-2.0 \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include Gtk-$(GTK_API_VERSION) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include GVnc-1.0 \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(PREFIX_ARGS) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --library=$(builddir)/libgtk-vnc-$(GTK_VNC_API_VERSION).la \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(top_srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(builddir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --c-include="gtk-vnc.h" \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --output $@ \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(top_srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --verbose \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --pkg=gtk-vnc-$(GTK_VNC_API_VERSION) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(GTK_VNC_INTROSPECTION_SRCS) +- +-@WITH_GOBJECT_INTROSPECTION_TRUE@%.typelib: %.gir +-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(AM_V_GEN)$(G_IR_COMPILER) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --includedir=$(srcdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --includedir=$(builddir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ --includedir=$(girdir) \ +-@WITH_GOBJECT_INTROSPECTION_TRUE@ -o $@ $< ++-include $(INTROSPECTION_MAKEFILE) ++ ++@HAVE_INTROSPECTION_TRUE@GVnc-1.0.gir: libgvnc-1.0.la ++ ++@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc-1.0.gir: libgtk-vnc-$(GTK_VNC_API_VERSION).la ++@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc-2.0.gir: libgtk-vnc-2.0.la + + -include $(top_srcdir)/git.mk + diff --git a/net/gtk-vnc/files/patch-src_continuation.h b/net/gtk-vnc/files/patch-src_continuation.h index 549af869b..6b4878259 100644 --- a/net/gtk-vnc/files/patch-src_continuation.h +++ b/net/gtk-vnc/files/patch-src_continuation.h @@ -1,6 +1,6 @@ ---- src/continuation.h.orig 2007-12-16 13:58:18.000000000 -0500 -+++ src/continuation.h 2007-12-16 13:58:39.000000000 -0500 -@@ -11,6 +11,7 @@ +--- src/continuation.h.orig 2011-02-18 16:29:10.000000000 +0000 ++++ src/continuation.h 2011-02-20 17:50:37.000000000 +0000 +@@ -21,6 +21,7 @@ #ifndef _CONTINUATION_H_ #define _CONTINUATION_H_ diff --git a/net/gtk-vnc/files/patch-src_coroutine_ucontext.c b/net/gtk-vnc/files/patch-src_coroutine_ucontext.c index 7a52f6e10..e50fb8576 100644 --- a/net/gtk-vnc/files/patch-src_coroutine_ucontext.c +++ b/net/gtk-vnc/files/patch-src_coroutine_ucontext.c @@ -1,6 +1,6 @@ ---- src/coroutine_ucontext.c.orig 2007-12-16 13:59:13.000000000 -0500 -+++ src/coroutine_ucontext.c 2007-12-16 13:59:21.000000000 -0500 -@@ -48,7 +48,7 @@ int coroutine_init(struct coroutine *co) +--- src/coroutine_ucontext.c.orig 2011-02-18 16:29:10.000000000 +0000 ++++ src/coroutine_ucontext.c 2011-02-20 17:51:14.000000000 +0000 +@@ -60,7 +60,7 @@ int coroutine_init(struct coroutine *co) co->cc.stack_size = co->stack_size; co->cc.stack = mmap(0, co->stack_size, PROT_READ | PROT_WRITE, diff --git a/net/gtk-vnc/files/patch-src_gvnc.c b/net/gtk-vnc/files/patch-src_gvnc.c deleted file mode 100644 index dcf479f23..000000000 --- a/net/gtk-vnc/files/patch-src_gvnc.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gvnc.c.orig 2012-03-17 12:30:12.000000000 -0500 -+++ src/gvnc.c 2012-03-17 12:31:37.000000000 -0500 -@@ -3543,7 +3543,7 @@ - gvnc->minor = 8; - } - -- snprintf(version, 12, "RFB %03d.%03d\n", gvnc->major, gvnc->minor); -+ snprintf(version, 13, "RFB %03d.%03d\n", gvnc->major, gvnc->minor); - gvnc_write(gvnc, version, 12); - gvnc_flush(gvnc); - GVNC_DEBUG("Using version: %d.%d", gvnc->major, gvnc->minor); diff --git a/net/gtk-vnc/files/patch-src_gvnc.h b/net/gtk-vnc/files/patch-src_gvnc.h deleted file mode 100644 index 150b05330..000000000 --- a/net/gtk-vnc/files/patch-src_gvnc.h +++ /dev/null @@ -1,22 +0,0 @@ ---- src/gvnc.h.orig 2008-03-24 11:39:20.000000000 -0400 -+++ src/gvnc.h 2008-03-24 11:40:22.000000000 -0400 -@@ -3,6 +3,19 @@ - - #include <glib.h> - #include <stdint.h> -+#ifdef __FreeBSD__ -+#include <sys/endian.h> -+ -+#define __BYTE_ORDER _BYTE_ORDER -+#define __LITTLE_ENDIAN _LITTLE_ENDIAN -+#define __BIG_ENDIAN _BIG_ENDIAN -+ -+#define bswap_16 bswap16 -+#define bswap_32 bswap32 -+#define bswap_64 bswap64 -+#else -+#include <endian.h> -+#endif - - struct gvnc; - diff --git a/net/gtk-vnc/pkg-plist b/net/gtk-vnc/pkg-plist index e57277615..371858669 100644 --- a/net/gtk-vnc/pkg-plist +++ b/net/gtk-vnc/pkg-plist @@ -1,23 +1,68 @@ +bin/gvnccapture +include/gtk-vnc-1.0/gtk-vnc.h include/gtk-vnc-1.0/vncdisplay.h -lib/libgtk-vnc-1.0.a +include/gtk-vnc-1.0/vncdisplayenums.h +include/gtk-vnc-1.0/vncgrabsequence.h +include/gtk-vnc-1.0/vncimageframebuffer.h +include/gvnc-1.0/gvnc.h +include/gvnc-1.0/vncbaseframebuffer.h +include/gvnc-1.0/vnccolormap.h +include/gvnc-1.0/vncconnection.h +include/gvnc-1.0/vncconnectionenums.h +include/gvnc-1.0/vnccursor.h +include/gvnc-1.0/vncframebuffer.h +include/gvnc-1.0/vncpixelformat.h +include/gvnc-1.0/vncutil.h +lib/girepository-1.0/GVnc-1.0.typelib +lib/girepository-1.0/GtkVnc-1.0.typelib lib/libgtk-vnc-1.0.la lib/libgtk-vnc-1.0.so lib/libgtk-vnc-1.0.so.0 -%%PYTHON_SITELIBDIR%%/gtkvnc.a -%%PYTHON_SITELIBDIR%%/gtkvnc.la -%%PYTHON_SITELIBDIR%%/gtkvnc.so +lib/libgvnc-1.0.la +lib/libgvnc-1.0.so +lib/libgvnc-1.0.so.0 libdata/pkgconfig/gtk-vnc-1.0.pc +libdata/pkgconfig/gvnc-1.0.pc +man/man1/gvnccapture.1.gz +share/gir-1.0/GVnc-1.0.gir +share/gir-1.0/GtkVnc-1.0.gir +share/locale/ca/LC_MESSAGES/gtk-vnc.mo +share/locale/ca@valencia/LC_MESSAGES/gtk-vnc.mo +share/locale/cs/LC_MESSAGES/gtk-vnc.mo +share/locale/da/LC_MESSAGES/gtk-vnc.mo share/locale/de/LC_MESSAGES/gtk-vnc.mo share/locale/el/LC_MESSAGES/gtk-vnc.mo share/locale/en_GB/LC_MESSAGES/gtk-vnc.mo +share/locale/eo/LC_MESSAGES/gtk-vnc.mo share/locale/es/LC_MESSAGES/gtk-vnc.mo share/locale/eu/LC_MESSAGES/gtk-vnc.mo share/locale/fr/LC_MESSAGES/gtk-vnc.mo share/locale/gl/LC_MESSAGES/gtk-vnc.mo share/locale/hu/LC_MESSAGES/gtk-vnc.mo share/locale/it/LC_MESSAGES/gtk-vnc.mo +share/locale/ja/LC_MESSAGES/gtk-vnc.mo +share/locale/ko/LC_MESSAGES/gtk-vnc.mo +share/locale/nb/LC_MESSAGES/gtk-vnc.mo +share/locale/nds/LC_MESSAGES/gtk-vnc.mo +share/locale/pa/LC_MESSAGES/gtk-vnc.mo share/locale/pl/LC_MESSAGES/gtk-vnc.mo share/locale/pt/LC_MESSAGES/gtk-vnc.mo share/locale/pt_BR/LC_MESSAGES/gtk-vnc.mo +share/locale/ro/LC_MESSAGES/gtk-vnc.mo +share/locale/ru/LC_MESSAGES/gtk-vnc.mo +share/locale/sk/LC_MESSAGES/gtk-vnc.mo +share/locale/sl/LC_MESSAGES/gtk-vnc.mo share/locale/sv/LC_MESSAGES/gtk-vnc.mo +share/locale/th/LC_MESSAGES/gtk-vnc.mo +share/locale/tr/LC_MESSAGES/gtk-vnc.mo +share/locale/zh_CN/LC_MESSAGES/gtk-vnc.mo +share/locale/zh_HK/LC_MESSAGES/gtk-vnc.mo +share/locale/zh_TW/LC_MESSAGES/gtk-vnc.mo +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrm include/gtk-vnc-1.0 +@dirrm include/gvnc-1.0 diff --git a/net/libgweather3/Makefile b/net/libgweather/Makefile index 5cbd7022c..da5d333af 100644 --- a/net/libgweather3/Makefile +++ b/net/libgweather/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/net/libgweather3/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= libgweather PORTVERSION= 3.6.2 @@ -14,19 +14,18 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/mi LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme -CONFLICTS= libgweather-2.[0-9]* - -NO_STAGE= yes -LATEST_LINK= libgweather3 USES= gettext gmake pathfix pkgconfig USE_XZ= yes INSTALLS_ICONS= yes USE_GNOME= gnomehier gnomeprefix intlhack gconf2 ltverhack gtk30 USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.gnome.GWeather.enums.xml \ org.gnome.GWeather.gschema.xml +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.* + .include <bsd.port.mk> diff --git a/net/libgweather3/distinfo b/net/libgweather/distinfo index 5059f7980..5059f7980 100644 --- a/net/libgweather3/distinfo +++ b/net/libgweather/distinfo diff --git a/net/libgweather3/pkg-descr b/net/libgweather/pkg-descr index 99ea830ef..99ea830ef 100644 --- a/net/libgweather3/pkg-descr +++ b/net/libgweather/pkg-descr diff --git a/net/libgweather3/pkg-plist b/net/libgweather/pkg-plist index 4732bed13..5c3425bdf 100644 --- a/net/libgweather3/pkg-plist +++ b/net/libgweather/pkg-plist @@ -8,10 +8,9 @@ include/libgweather-3.0/libgweather/gweather-xml.h include/libgweather-3.0/libgweather/location-entry.h include/libgweather-3.0/libgweather/timezone-menu.h include/libgweather-3.0/libgweather/gweather-weather.h -lib/libgweather-3.a lib/libgweather-3.la lib/libgweather-3.so -lib/libgweather-3.so.1 +lib/libgweather-3.so.2 libdata/pkgconfig/gweather-3.0.pc %%DOCSDIR%%-3.0/GWeatherLocation.html %%DOCSDIR%%-3.0/GWeatherLocationEntry.html diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile index 0f1a92873..8ba30da56 100644 --- a/net/libproxy/Makefile +++ b/net/libproxy/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/net/libproxy/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= libproxy PORTVERSION= 0.4.6 @@ -11,7 +11,6 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= gnome@FreeBSD.org COMMENT?= Library that provides automatic proxy configuration management -NO_STAGE= yes USES= cmake USE_GNOME= gnomehier @@ -67,6 +66,6 @@ CMAKE_ARGS+= -DWITH_MOZJS:BOOL=OFF .endif post-install: - @${MKDIR} ${PREFIX}/lib/libproxy/${PORTVERSION}/modules/ + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/libproxy/${PORTVERSION}/modules/ .include <bsd.port.mk> diff --git a/ports-mgmt/packagekit-qt4/Makefile b/ports-mgmt/packagekit-qt4/Makefile index 29ea5cb9e..3a459f237 100644 --- a/ports-mgmt/packagekit-qt4/Makefile +++ b/ports-mgmt/packagekit-qt4/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/ports-mgmt/packagekit-qt4/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= packagekit-qt4 PORTVERSION= 0.8.8 @@ -14,7 +14,6 @@ COMMENT= Qt4 bindings to packagekit BUILD_DEPENDS= packagekit>=0.8.8:${PORTSDIR}/ports-mgmt/packagekit RUN_DEPENDS= packagekit>=0.8.8:${PORTSDIR}/ports-mgmt/packagekit -NO_STAGE= yes USE_XZ= yes USE_LDCONFIG= yes USES= cmake:outsource pkgconfig diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile index ef0a63459..c25fcc995 100644 --- a/ports-mgmt/packagekit/Makefile +++ b/ports-mgmt/packagekit/Makefile @@ -1,6 +1,6 @@ # Created by: Anders F Bjorklund <afb@users.sourceforge.net> # $FreeBSD$ -# $MCom: ports/trunk/ports-mgmt/packagekit/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= packagekit PORTVERSION= 0.8.9 @@ -16,7 +16,6 @@ LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof -NO_STAGE= yes USE_XZ= yes USES= gettext gmake iconv pathfix shared-mime-info USE_GNOME= glib20 intltool introspection @@ -44,9 +43,10 @@ OPTIONS_DEFINE= MANPAGES BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl USE_GNOME+= libxslt:build -MAN1= pkcon.1 pkmon.1 pkgenpack.1 pk-debuginfo-install.1 +PLIST_SUB+= MAN="" .else CONFIGURE_ARGS+=--disable-man-pages +PLIST_SUB+= MAN="@comment " .endif # IMO we should just enable the new (not writted pkgng backend) on systems @@ -70,6 +70,9 @@ post-patch: ${WRKSRC}/src/plugins/pk-lsof.c post-install: - @${MKDIR} /var/cache/PackageKit/downloads + @${MKDIR} ${STAGEDIR}/var/cache/PackageKit/downloads + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/packagekit-backend/libpk*.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/packagekit-plugins/libpk*.so .include <bsd.port.mk> diff --git a/security/gcr/Makefile b/security/gcr/Makefile index 9f164b1ec..c2fd85ed5 100644 --- a/security/gcr/Makefile +++ b/security/gcr/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/security/gcr/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= gcr PORTVERSION= 3.6.2 @@ -18,14 +18,17 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ CONFLICTS= gnome-keyring-2.[0-9]* -NO_STAGE= yes USE_XZ= yes USE_GNOME= gtk30 intlhack introspection:build -USES= gettext gmake pathfix pkgconfig shared-mime-info +USES= desktop-file-utils gettext gmake pathfix pkgconfig \ + shared-mime-info GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes GLIB_SCHEMAS= org.gnome.crypto.pgp.gschema.xml +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* + .include <bsd.port.mk> diff --git a/security/gcr/pkg-plist b/security/gcr/pkg-plist index 5d7d6aefa..643b9e07a 100644 --- a/security/gcr/pkg-plist +++ b/security/gcr/pkg-plist @@ -271,16 +271,6 @@ share/locale/xh/LC_MESSAGES/gcr.mo share/locale/zh_CN/LC_MESSAGES/gcr.mo share/locale/zh_HK/LC_MESSAGES/gcr.mo share/locale/zh_TW/LC_MESSAGES/gcr.mo -share/mime/application/pkcs10+pem.xml -share/mime/application/pkcs12+pem.xml -share/mime/application/pkcs7-mime+pem.xml -share/mime/application/pkcs8+pem.xml -share/mime/application/pkix-cert+pem.xml -share/mime/application/pkix-crl+pem.xml -share/mime/application/x-pem-file.xml -share/mime/application/x-pem-key.xml -share/mime/application/x-spkac+base64.xml -share/mime/application/x-spkac.xml share/mime/packages/gcr-crypto-types.xml @dirrm share/gtk-doc/html/gcr-3 @dirrm share/gtk-doc/html/gck diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index 47a5eb93b..a8fa342a1 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/security/gnome-keyring/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= gnome-keyring PORTVERSION= 2.32.1 @@ -18,11 +18,11 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro CONFLICTS= gnome-keyring-3.[0-9]* gcr-3.[0-9]* -NO_STAGE= yes +NO_STAGE FUCK YEAH! USE_BZIP2= yes USE_GNOME= gnomeprefix gtk20 ltverhack intlhack USES= gettext gmake pathfix pkgconfig -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --with-pam-dir="${PREFIX}/lib" \ --with-root-certs="${LOCALBASE}/share/certs/ca-root-nss.crt" diff --git a/security/libgnome-keyring/Makefile b/security/libgnome-keyring/Makefile index c58009f7c..3102558a9 100644 --- a/security/libgnome-keyring/Makefile +++ b/security/libgnome-keyring/Makefile @@ -1,6 +1,6 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/security/libgnome-keyring/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= libgnome-keyring PORTVERSION= 3.6.0 @@ -13,14 +13,17 @@ COMMENT= Program that keeps passwords and other secrets LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libgcrypt.so:${PORTSDIR}/security/libgcrypt -NO_STAGE= yes USE_XZ= yes USE_GNOME= glib20 gnomehier gnomeprefix intlhack \ introspection:build ltverhack USES= gettext gmake pathfix pkgconfig -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ARGS= --disable-vala + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* .include <bsd.port.mk> diff --git a/security/libgnome-keyring/pkg-plist b/security/libgnome-keyring/pkg-plist index aaadd03dd..da56865c6 100644 --- a/security/libgnome-keyring/pkg-plist +++ b/security/libgnome-keyring/pkg-plist @@ -2,7 +2,6 @@ include/gnome-keyring-1/gnome-keyring-memory.h include/gnome-keyring-1/gnome-keyring-result.h include/gnome-keyring-1/gnome-keyring.h lib/girepository-1.0/GnomeKeyring-1.0.typelib -lib/libgnome-keyring.a lib/libgnome-keyring.la lib/libgnome-keyring.so lib/libgnome-keyring.so.0 diff --git a/security/libpwquality/Makefile b/security/libpwquality/Makefile index d36a82fd7..d5c5789b5 100644 --- a/security/libpwquality/Makefile +++ b/security/libpwquality/Makefile @@ -11,10 +11,8 @@ COMMENT= Library for generating random passwords and quality checking LIB_DEPENDS= libcrack.so:${PORTSDIR}/security/cracklib -NO_STAGE= yes USES= gettext gmake pathfix USE_BZIP2= yes -USE_AUTOTOOLS= libtool USE_GNOME= intltool GNU_CONFIGURE= yes USE_LDCONFIG= yes @@ -24,9 +22,6 @@ LDFLAGS+= -L${LOCALBASE}/lib # configure needs to be fixed CONFIGURE_ENV+= LIBS="-lintl" -MAN1= pwmake.1 pwscore.1 -MAN5= pwquality.conf.5 - OPTIONS_DEFINE= PYTHON OPTIONS_DEFAULT=PYTHON diff --git a/security/libpwquality/pkg-plist b/security/libpwquality/pkg-plist index f73d0044e..8b9110b0b 100644 --- a/security/libpwquality/pkg-plist +++ b/security/libpwquality/pkg-plist @@ -8,6 +8,9 @@ lib/libpwquality.so lib/libpwquality.so.1 %%PYTHON%%%%PYTHON_SITELIBDIR%%/pwquality.so libdata/pkgconfig/pwquality.pc +man/man1/pwmake.1.gz +man/man1/pwscore.1.gz +man/man5/pwquality.conf.5.gz share/locale/ar/LC_MESSAGES/libpwquality.mo share/locale/as/LC_MESSAGES/libpwquality.mo share/locale/bg/LC_MESSAGES/libpwquality.mo @@ -54,4 +57,22 @@ share/locale/vi/LC_MESSAGES/libpwquality.mo share/locale/zh_CN/LC_MESSAGES/libpwquality.mo share/locale/zh_TW/LC_MESSAGES/libpwquality.mo share/locale/zu/LC_MESSAGES/libpwquality.mo +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/si/LC_MESSAGES +@dirrmtry share/locale/si +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/km/LC_MESSAGES +@dirrmtry share/locale/km +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as @dirrmtry etc/security diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile index cce5eca45..794639e06 100644 --- a/sysutils/accountsservice/Makefile +++ b/sysutils/accountsservice/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/sysutils/accountsservice/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= accountsservice PORTVERSION= 0.6.24 @@ -14,13 +14,12 @@ COMMENT= D-Bus interface for user account query and manipulation LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit -NO_STAGE= yes USE_XZ= yes USE_GNOME= glib20 gnomehier intlhack introspection:build libxslt USES= gettext gmake pathfix pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --disable-systemd --localstatedir=/var/ +CONFIGURE_ARGS= --disable-systemd --localstatedir=/var/ --disable-vala CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -31,6 +30,7 @@ post-patch: ${WRKSRC}/src/user.c ${WRKSRC}/src/Makefile.in post-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* .include <bsd.port.mk> + diff --git a/sysutils/drwright/Makefile b/sysutils/drwright/Makefile index 3fe61384b..eb2208388 100644 --- a/sysutils/drwright/Makefile +++ b/sysutils/drwright/Makefile @@ -1,9 +1,9 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/sysutils/drwright/Makefile 18393 2013-04-26 21:23:07Z kwm $ +# $MCom$ PORTNAME= drwright -PORTVERSION= 3.2.5 +PORTVERSION= 3.5.0 CATEGORIES= sysutils gnome MASTER_SITES= GNOME @@ -13,7 +13,6 @@ COMMENT= GNOME 3 RSI prevention tool LIB_DEPENDS= libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \ libnotify.so:${PORTSDIR}/devel/libnotify -NO_STAGE= yes USE_XZ= yes USE_GNOME= intlhack gtk30 gnomecontrolcenter3 USE_XORG= x11 xscrnsaver diff --git a/sysutils/drwright/distinfo b/sysutils/drwright/distinfo index 328a2b90e..4334cf6fb 100644 --- a/sysutils/drwright/distinfo +++ b/sysutils/drwright/distinfo @@ -1,2 +1,2 @@ -SHA256 (drwright-3.2.5.tar.xz) = fc0c8bfc87ee35eb9b5768dd32736747cf4a7aeda4ea86e813b46261a30616f8 -SIZE (drwright-3.2.5.tar.xz) = 1451424 +SHA256 (drwright-3.5.0.tar.xz) = a8b64b27fdf0aa8c6703141a0e83e2619e34b8d1303afdeef304761814bcfbb8 +SIZE (drwright-3.5.0.tar.xz) = 1441336 diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile index f59c3c1b3..52317997c 100644 --- a/sysutils/polkit/Makefile +++ b/sysutils/polkit/Makefile @@ -1,6 +1,6 @@ # Created by: Koop Mast<kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/sysutils/polkit/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= polkit PORTVERSION= 0.105 @@ -14,7 +14,6 @@ COMMENT= Framework for controlling access to system-wide components LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 RUN_DEPENDS= dbus-launch:${PORTSDIR}/devel/dbus -NO_STAGE= yes USE_GNOME= glib20 intlhack gnomehier introspection USES= gettext gmake pathfix pkgconfig GNU_CONFIGURE= yes @@ -51,15 +50,11 @@ post-patch: ${WRKSRC}/src/examples/org.freedesktop.policykit.examples.pkexec.policy.in post-install: - ${MKDIR} ${PREFIX}/etc/dbus-1/system.d/ - if [ ! -f ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ]; then \ - ${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \ - ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ; \ - fi + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/ + @${MKDIR} ${STAGEDIR}${PREFIX}/share/polkit-1/rules.d/ ${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \ - ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif + ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/polkit-1/extensions/lib*.so .include <bsd.port.mk> diff --git a/sysutils/polkit/pkg-plist b/sysutils/polkit/pkg-plist index 1c9aa117a..65f8b0486 100644 --- a/sysutils/polkit/pkg-plist +++ b/sysutils/polkit/pkg-plist @@ -96,7 +96,6 @@ share/polkit-1/actions/org.freedesktop.policykit.policy @dirrmtry var/lib/polkit-1/localauthority/20-org.d @dirrmtry var/lib/polkit-1/localauthority/10-vendor.d @dirrmtry var/lib/polkit-1/localauthority -@dirrmtry var/lib/polkit-1/localauthority @dirrmtry var/lib/polkit-1 @dirrmtry var/lib @cwd diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile index 74f6a331f..5c55ebaeb 100644 --- a/sysutils/upower/Makefile +++ b/sysutils/upower/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/sysutils/upower/Makefile 18681 2013-09-15 22:52:32Z marcus $ +# $MCom$ PORTNAME= upower PORTVERSION= 0.9.21 @@ -16,11 +16,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -NO_STAGE= yes USES= gettext gmake pathfix pkgconfig USE_XZ= yes USE_GNOME= intlhack ltverhack glib20 introspection:build -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_PYTHON= yes CONFIGURE_ARGS= --disable-gtk-doc \ @@ -31,14 +30,16 @@ CONFIGURE_ENV= GTKDOC="false" .if defined(NO_INSTALL_MANPAGES) CONFIGURE_ARGS+=--disable-man-pages +PLIST_SUB+= MAN="@comment " .else BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \ ${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl USE_GNOME+= libxslt:build -MAN1= upower.1 -MAN7= UPower.7 -MAN8= upowerd.8 +PLIST_SUB+= MAN="" .endif +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* + .include <bsd.port.mk> diff --git a/sysutils/upower/pkg-plist b/sysutils/upower/pkg-plist index df8f0ffdd..31d9b6923 100644 --- a/sysutils/upower/pkg-plist +++ b/sysutils/upower/pkg-plist @@ -18,6 +18,9 @@ lib/libupower-glib.so lib/libupower-glib.so.1 libdata/pkgconfig/upower-glib.pc libexec/upowerd +%%MAN%%man/man1/upower.1.gz +%%MAN%%man/man7/UPower.7.gz +%%MAN%%man/man8/upowerd.8.gz share/dbus-1/interfaces/org.freedesktop.UPower.Device.xml share/dbus-1/interfaces/org.freedesktop.UPower.KbdBacklight.xml share/dbus-1/interfaces/org.freedesktop.UPower.QoS.xml diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index 03fb144a1..727bd27a0 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -1,6 +1,6 @@ # Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/textproc/gnome-doc-utils/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= gnome-doc-utils PORTVERSION= 0.20.10 @@ -11,14 +11,12 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME doc utils BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \ - ${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \ - gawk:${PORTSDIR}/lang/gawk + ${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \ ${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \ ${LOCALBASE}/share/xml/docbook/4.3/catalog.xml:${PORTSDIR}/textproc/docbook-xml-430 \ ${LOCALBASE}/share/xml/docbook/4.4/catalog.xml:${PORTSDIR}/textproc/docbook-xml-440 -NO_STAGE= yes USE_XZ= yes MAKE_JOBS_UNSAFE=yes USES= gettext gmake pathfix pkgconfig @@ -30,8 +28,6 @@ CONFIGURE_ARGS= --with-omf-dir=${PREFIX}/share/omf CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= xml2po.1 - post-install: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR}/xml2po @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR}/xml2po/modes diff --git a/textproc/gnome-doc-utils/files/patch-tools_gnome-doc-tool.in b/textproc/gnome-doc-utils/files/patch-tools_gnome-doc-tool.in new file mode 100644 index 000000000..55148f713 --- /dev/null +++ b/textproc/gnome-doc-utils/files/patch-tools_gnome-doc-tool.in @@ -0,0 +1,8 @@ +--- tools/gnome-doc-tool.in.orig 2013-12-19 16:08:52.000000000 +0100 ++++ tools/gnome-doc-tool.in 2013-12-19 16:08:59.000000000 +0100 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # gnome-doc-html - Convert documentation to HTML + # gnome-doc-html. Generated from gnome-doc-html.in by configure. + # Copyright (C) 2006 Shaun McCance <shaunm@gnome.org> diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist index e760e82d2..703473186 100644 --- a/textproc/gnome-doc-utils/pkg-plist +++ b/textproc/gnome-doc-utils/pkg-plist @@ -27,6 +27,7 @@ libdata/pkgconfig/xml2po.pc %%PYTHON_SITELIBDIR%%/xml2po/modes/xhtml.py %%PYTHON_SITELIBDIR%%/xml2po/modes/xhtml.pyc %%PYTHON_SITELIBDIR%%/xml2po/modes/xhtml.pyo +man/man1/xml2po.1.gz share/aclocal/gnome-doc-utils.m4 %%DATADIR%%/gnome-doc-utils.make %%DATADIR%%/icons/hicolor/48x48/status/admon-bug.png diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile index 3c83010d3..20f5a5b22 100644 --- a/x11-toolkits/gtksourceview3/Makefile +++ b/x11-toolkits/gtksourceview3/Makefile @@ -1,5 +1,5 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> -# $FreeBSD: head/x11-toolkits/gtksourceview3/Makefile 316407 2013-04-24 07:35:40Z ak $ +# $FreeBSD$ # $MCom$ PORTNAME= gtksourceview diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 6fe794fc5..542482d97 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/x11/gnome-panel3/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= gnome-panel PORTVERSION= 3.6.2 @@ -16,7 +16,7 @@ USE_XZ= yes .if !defined(REFERENCE_PORT) BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool -LIB_DEPENDS= libgweather-3.so:${PORTSDIR}/net/libgweather3 \ +LIB_DEPENDS= libgweather-3.so:${PORTSDIR}/net/libgweather \ libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \ libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \ libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit |