From owner-svn-ports-all@FreeBSD.ORG Thu Sep 25 15:18:43 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E9C2CF; Thu, 25 Sep 2014 15:18:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 37467C68; Thu, 25 Sep 2014 15:18:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8PFIhIT027771; Thu, 25 Sep 2014 15:18:43 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8PFISul027635; Thu, 25 Sep 2014 15:18:28 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201409251518.s8PFISul027635@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Thu, 25 Sep 2014 15:18:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369260 - in head: Mk Mk/Uses accessibility/at-spi2-core audio/ario audio/easytag audio/gmpc-alarm audio/gmpc-discogs audio/gmpc-lastfm audio/gmpc-lyricwiki audio/gmpc-mdcover audio/gmp... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Sep 2014 15:18:43 -0000 Author: tijl Date: Thu Sep 25 15:18:27 2014 New Revision: 369260 URL: http://svnweb.freebsd.org/changeset/ports/369260 QAT: https://qat.redports.org/buildarchive/r369260/ Log: - Set CPPFLAGS and LIBS in a number of ports so configure can find libintl.h and libintl.so. This fixes a problem where DATADIRNAME gets an incorrect value which causes locale files to be installed in the wrong place. - The only configure checks that still need to be patched are related to intltool so move DATADIRNAME patching from USES=pathfix to USE_GNOME=intlhack. - games/klavaro: remove excessive dependencies - japanese/libskk: add INSTALL_TARGET=install-strip - math/libqalculate: add INSTALL_TARGET=install-strip and remove pthread patching - multimedia/freetuxtv: remove excessive dependencies - science/gramps: fix shared-mime-info use Exp-run by: antoine Approved by: portmgr (antoine) Added: head/x11/avant-window-navigator/files/patch-configure (contents, props changed) Modified: head/Mk/Uses/pathfix.mk head/Mk/bsd.gnome.mk head/accessibility/at-spi2-core/Makefile head/audio/ario/Makefile head/audio/easytag/Makefile head/audio/gmpc-alarm/Makefile head/audio/gmpc-discogs/Makefile head/audio/gmpc-lastfm/Makefile head/audio/gmpc-lyricwiki/Makefile head/audio/gmpc-mdcover/Makefile head/audio/gmpc-shout/Makefile head/audio/gvolwheel/Makefile head/audio/paprefs/Makefile head/comms/gpredict/Makefile head/deskutils/babytrans/Makefile head/deskutils/glipper/Makefile head/devel/geany-plugins-l10n/Makefile head/devel/geany-plugins/files/Makefile.common head/devel/gitg/Makefile head/devel/gitg0/Makefile head/devel/gsettings-desktop-schemas/Makefile head/devel/libosinfo/Makefile head/devel/libpeas/Makefile head/devel/libvirt-glib/Makefile head/games/gnome-chess/Makefile head/games/klavaro/Makefile head/graphics/gimp-save-for-web/Makefile head/graphics/ocrfeeder/Makefile head/japanese/libskk/Makefile head/korean/ibus-hangul/Makefile head/math/gcalctool/Makefile head/math/libqalculate/Makefile head/math/mate-calc/Makefile head/math/qalculate/Makefile head/multimedia/banshee/Makefile head/multimedia/freetuxtv/Makefile head/multimedia/imagination/Makefile head/net-im/ekiga/Makefile head/net-im/folks04/Makefile head/net/mediastreamer/Makefile head/print/cups-pk-helper/Makefile head/print/gribouy/Makefile head/science/gramps/Makefile head/science/gramps/pkg-plist head/security/fpm2/Makefile head/security/libsecret/Makefile head/sysutils/gnome-schedule/Makefile head/textproc/lasem/Makefile head/x11-themes/lxappearance/Makefile head/x11-wm/compiz/Makefile head/x11-wm/plank/Makefile head/x11/avant-window-navigator/Makefile head/x11/mate-dialogs/Makefile head/x11/workrave/Makefile head/x11/xkeyboard-config/Makefile Modified: head/Mk/Uses/pathfix.mk ============================================================================== --- head/Mk/Uses/pathfix.mk Thu Sep 25 14:30:24 2014 (r369259) +++ head/Mk/Uses/pathfix.mk Thu Sep 25 15:18:27 2014 (r369260) @@ -28,9 +28,6 @@ pathfix: s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \ - s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' ; \ - ${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \ - 's|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|{libdir}/locale|{prefix}/share/locale|g' + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' .endif Modified: head/Mk/bsd.gnome.mk ============================================================================== --- head/Mk/bsd.gnome.mk Thu Sep 25 14:30:24 2014 (r369259) +++ head/Mk/bsd.gnome.mk Thu Sep 25 15:18:27 2014 (r369260) @@ -477,11 +477,13 @@ pygnome2_USE_GNOME_IMPL=libgnomeui pygtk intltool_DETECT= ${LOCALBASE}/bin/intltool-extract intltool_BUILD_DEPENDS= ${intltool_DETECT}:${PORTSDIR}/textproc/intltool -intlhack_PRE_PATCH= ${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \ - s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";| ; \ - s|/usr/bin/iconv|${ICONV_CMD}|g ; \ - s|unpack *[(]'"'"'U\*'"'"'|unpack ('"'"'C*'"'"'|' +intlhack_PRE_PATCH= ${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} \ + 's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \ + s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";| ; \ + s|/usr/bin/iconv|${ICONV_CMD}|g ; \ + s|unpack *[(]'"'"'U\*'"'"'|unpack ('"'"'C*'"'"'|' ; \ + ${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} \ + 's/DATADIRNAME=lib/DATADIRNAME=share/' intlhack_USE_GNOME_IMPL=intltool gtkhtml3_LIB_DEPENDS= libgtkhtml-3.14.so:${PORTSDIR}/www/gtkhtml3 Modified: head/accessibility/at-spi2-core/Makefile ============================================================================== --- head/accessibility/at-spi2-core/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/accessibility/at-spi2-core/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -25,7 +25,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-xevie CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip .include Modified: head/audio/ario/Makefile ============================================================================== --- head/audio/ario/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/audio/ario/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -22,8 +22,10 @@ LIB_DEPENDS= libgnutls.so:${PORTSDIR}/se libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \ libmpdclient.so:${PORTSDIR}/audio/libmpdclient -USES= gmake libtool pathfix pkgconfig GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gmake libtool pkgconfig USE_LDCONFIG= yes USE_GNOME= gtk20 INSTALLS_ICONS= yes Modified: head/audio/easytag/Makefile ============================================================================== --- head/audio/easytag/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/audio/easytag/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -21,12 +21,12 @@ LIB_DEPENDS= libid3.so:${PORTSDIR}/audio libFLAC.so:${PORTSDIR}/audio/flac \ libtag.so:${PORTSDIR}/audio/taglib -USES= gmake pkgconfig pathfix desktop-file-utils tar:xz +USES= desktop-file-utils gmake pkgconfig tar:xz USE_GNOME= glib20 intltool intlhack libxslt INSTALLS_ICONS= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_GTK -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-appdata-validate \ --without-help-dir \ Modified: head/audio/gmpc-alarm/Makefile ============================================================================== --- head/audio/gmpc-alarm/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/audio/gmpc-alarm/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -15,7 +15,9 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgc RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gmake gettext libtool pkgconfig USE_GNOME= glib20 gtk20 intltool -USES= gmake gettext libtool pathfix pkgconfig .include Modified: head/audio/gmpc-discogs/Makefile ============================================================================== --- head/audio/gmpc-discogs/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/audio/gmpc-discogs/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -16,7 +16,9 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgc RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gettext gmake libtool pkgconfig USE_GNOME= glib20 gtk20 intltool libxml2 -USES= gettext gmake libtool pathfix pkgconfig .include Modified: head/audio/gmpc-lastfm/Makefile ============================================================================== --- head/audio/gmpc-lastfm/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/audio/gmpc-lastfm/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -17,7 +17,9 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgc RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gettext gmake libtool pkgconfig USE_GNOME= glib20 gtk20 intltool libxml2 -USES= gettext gmake libtool pathfix pkgconfig .include Modified: head/audio/gmpc-lyricwiki/Makefile ============================================================================== --- head/audio/gmpc-lyricwiki/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/audio/gmpc-lyricwiki/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -15,7 +15,9 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgc RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gettext gmake libtool pkgconfig USE_GNOME= intltool glib20 gtk20 libxml2 -USES= gettext gmake libtool pathfix pkgconfig .include Modified: head/audio/gmpc-mdcover/Makefile ============================================================================== --- head/audio/gmpc-mdcover/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/audio/gmpc-mdcover/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -16,7 +16,9 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgc RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gettext gmake libtool pkgconfig USE_GNOME= intltool glib20 gtk20 libxml2 -USES= gettext gmake libtool pathfix pkgconfig .include Modified: head/audio/gmpc-shout/Makefile ============================================================================== --- head/audio/gmpc-shout/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/audio/gmpc-shout/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -18,7 +18,9 @@ RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc ogg123:${PORTSDIR}/audio/vorbis-tools GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gettext gmake libtool pkgconfig USE_GNOME= intltool glib20 gtk20 libxml2 -USES= gettext gmake libtool pathfix pkgconfig .include Modified: head/audio/gvolwheel/Makefile ============================================================================== --- head/audio/gvolwheel/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/audio/gvolwheel/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -12,11 +12,11 @@ COMMENT= Volume mixer LICENSE= GPLv3 -BUILD_DEPENDS= intltoolize:${PORTSDIR}/textproc/intltool - CONFIGURE_ARGS+=--enable-oss GNU_CONFIGURE= yes -USES= gmake iconv pathfix pkgconfig +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gmake iconv pkgconfig USE_GNOME= gtk30 PORTDOCS= AUTHORS ChangeLog README Modified: head/audio/paprefs/Makefile ============================================================================== --- head/audio/paprefs/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/audio/paprefs/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -11,12 +11,13 @@ MAINTAINER= romain@FreeBSD.org COMMENT= GTK configuration dialog for PulseAudio LIB_DEPENDS= libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \ - libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26 \ libpulse.so:${PORTSDIR}/audio/pulseaudio GNU_CONFIGURE= yes -USES= gmake pathfix pkgconfig -USE_GNOME= gnomeprefix intltool +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gmake pkgconfig +USE_GNOME= gconfmm26 gnomeprefix CONFIGURE_ARGS= --disable-lynx Modified: head/comms/gpredict/Makefile ============================================================================== --- head/comms/gpredict/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/comms/gpredict/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -15,9 +15,11 @@ LIB_DEPENDS= libhamlib.so:${PORTSDIR}/co libcurl.so:${PORTSDIR}/ftp/curl \ libgoocanvas.so:${PORTSDIR}/graphics/goocanvas -USES= gettext pathfix gmake pkgconfig -USE_GNOME= gtk20 GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gettext gmake pkgconfig +USE_GNOME= gtk20 post-patch: @${REINPLACE_CMD} -e \ Modified: head/deskutils/babytrans/Makefile ============================================================================== --- head/deskutils/babytrans/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/deskutils/babytrans/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -10,11 +10,14 @@ MASTER_SITES= http://fjolliton.free.fr/b MAINTAINER= ports@FreeBSD.org COMMENT= GTK+/GNOME front-end for Babylon Translator .dic files -USES= gmake gettext pathfix +DEPRECATED= Abandonware, dictionaries unavailable +EXPIRATION_DATE=2014-10-31 + +USES= gmake gettext USE_GNOME= gtk12 gnomeprefix GNU_CONFIGURE= yes CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lintl PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message Modified: head/deskutils/glipper/Makefile ============================================================================== --- head/deskutils/glipper/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/deskutils/glipper/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -16,6 +16,8 @@ USE_PYTHON= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/libexec --disable-schemas-install +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= glipper.schemas Modified: head/devel/geany-plugins-l10n/Makefile ============================================================================== --- head/devel/geany-plugins-l10n/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/devel/geany-plugins-l10n/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -7,7 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Localization messages for Geany plugins -USES= pathfix - .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include Modified: head/devel/geany-plugins/files/Makefile.common ============================================================================== --- head/devel/geany-plugins/files/Makefile.common Thu Sep 25 14:30:24 2014 (r369259) +++ head/devel/geany-plugins/files/Makefile.common Thu Sep 25 15:18:27 2014 (r369260) @@ -22,6 +22,8 @@ USE_GNOME+= gtk20 GEANY_PLUGIN= NLS NLS_DIR= po NLS_SWITCH= --enable-nls +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .endif GEANY_PLUGIN?= ${PORTNAME:S,geany-plugin-,,} Modified: head/devel/gitg/Makefile ============================================================================== --- head/devel/gitg/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/devel/gitg/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -24,13 +24,14 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules \ --disable-maintainer-mode \ --enable-compile-warnings=no -USE_GNOME= glib20 gtk30 gtksourceview3 +USE_GNOME= glib20 gtk30 gtksourceview3 intlhack INSTALL_TARGET= install-strip INSTALLS_ICONS= yes GLIB_SCHEMAS= org.gnome.gitg.gschema.xml -LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= NLS OPTIONS_SUB= yes Modified: head/devel/gitg0/Makefile ============================================================================== --- head/devel/gitg0/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/devel/gitg0/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -19,7 +19,7 @@ CONFLICTS= gitg-[0-9]* USES= tar:bzip2 gmake pkgconfig pathfix libtool GNU_CONFIGURE= yes -USE_GNOME= gconf2 gtk20 gtksourceview2 +USE_GNOME= gconf2 gtk20 gtksourceview2 intlhack INSTALL_TARGET= install-strip INSTALLS_ICONS= yes @@ -33,6 +33,6 @@ OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE=nls NLS_CPPFLAGS= -I${LOCALBASE}/include -NLS_LDFLAGS= -L${LOCALBASE}/lib +NLS_LIBS= -L${LOCALBASE}/lib .include Modified: head/devel/gsettings-desktop-schemas/Makefile ============================================================================== --- head/devel/gsettings-desktop-schemas/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/devel/gsettings-desktop-schemas/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -20,6 +20,8 @@ USES= gettext gmake pathfix perl5 pkgco USE_PERL5= build USE_GNOME= intltool glib20 gnomehier introspection:build GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.gnome.desktop.a11y.applications.gschema.xml \ org.gnome.desktop.a11y.keyboard.gschema.xml \ Modified: head/devel/libosinfo/Makefile ============================================================================== --- head/devel/libosinfo/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/devel/libosinfo/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -12,11 +12,13 @@ COMMENT= Library for managing OS informa LIB_DEPENDS= libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome USES= gmake libtool pathfix pkgconfig -USE_GNOME= gnomehier glib20 libxml2 libxslt introspection:build intltool +USE_GNOME= gnomehier glib20 libxml2 libxslt introspection:build intlhack USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --disable-tests --disable-vala +CONFIGURE_ARGS= --disable-tests --disable-vala +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= NLS OPTIONS_SUB=yes Modified: head/devel/libpeas/Makefile ============================================================================== --- head/devel/libpeas/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/devel/libpeas/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -17,11 +17,11 @@ BUILD_DEPENDS= valac:${PORTSDIR}/lang/va USE_PYTHON= 2 USE_LDCONFIG= yes USES= gettext gmake libtool:keepla pathfix pkgconfig tar:xz -USE_GNOME= gtk30 introspection:build +USE_GNOME= gtk30 intlhack introspection:build INSTALLS_ICONS= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip CONFIGURE_ARGS+=--disable-glade-catalog Modified: head/devel/libvirt-glib/Makefile ============================================================================== --- head/devel/libvirt-glib/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/devel/libvirt-glib/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -13,13 +13,14 @@ COMMENT= Glib bindings for Libvirt virtu LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-introspection USES= gmake libtool pathfix pkgconfig USE_LDCONFIG= yes -USE_GNOME= intltool introspection +USE_GNOME= intlhack introspection USE_PYTHON= 2 CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -fstack-protector -CONFIGURE_ARGS+= --enable-introspection +LDFLAGS+= -fstack-protector +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip SHLIB_VER= 1.0 Modified: head/games/gnome-chess/Makefile ============================================================================== --- head/games/gnome-chess/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/games/gnome-chess/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -16,14 +16,14 @@ BUILD_DEPENDS= crafty:${PORTSDIR}/games/ xmllint:${PORTSDIR}/textproc/libxml2 \ p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser -USES= gmake pathfix pkgconfig desktop-file-utils shared-mime-info tar:xz +USES= gmake pkgconfig desktop-file-utils shared-mime-info tar:xz USE_GL= gl glu -USE_GNOME= gtk30 librsvg2 +USE_GNOME= gtk30 intlhack librsvg2 INSTALLS_OMF= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib MAKE_ARGS= XML_I18N_UPDATE="${TRUE}" XML_I18N_EXTRACT="${TRUE}" DATADIR= ${PREFIX}/share/gnome-chess Modified: head/games/klavaro/Makefile ============================================================================== --- head/games/klavaro/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/games/klavaro/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -12,25 +12,16 @@ COMMENT= Touchtyping trainer LICENSE= GPLv3 -LIB_DEPENDS= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \ - libpcre.so:${PORTSDIR}/devel/pcre \ - libcurl.so:${PORTSDIR}/ftp/curl \ - libcairo.so:${PORTSDIR}/graphics/cairo \ - libpng15.so:${PORTSDIR}/graphics/png \ - libfreetype.so:${PORTSDIR}/print/freetype2 \ - libexpat.so:${PORTSDIR}/textproc/expat2 \ - libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ libgtkdatabox.so:${PORTSDIR}/x11-toolkits/gtkdatabox -USES= pkgconfig gettext gmake iconv pathfix tar:bzip2 -USE_XORG= pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ - xfixes xi xinerama xrandr xrender -USE_GNOME= gtk20 +USES= pkgconfig gettext gmake iconv tar:bzip2 +USE_GNOME= gtk20 intlhack USE_LDCONFIG= yes INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/gtkdatabox -LDFLAGS+= -L${LOCALBASE}/lib -rdynamic +LIBS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes Modified: head/graphics/gimp-save-for-web/Makefile ============================================================================== --- head/graphics/gimp-save-for-web/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/graphics/gimp-save-for-web/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -13,12 +13,11 @@ COMMENT= GIMP Save For Web plugin LIB_DEPENDS= libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser -USES= gettext gmake pkgconfig pathfix perl5 tar:bzip2 -USE_PERL5= build GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gettext gmake perl5 pkgconfig tar:bzip2 +USE_PERL5= build USE_GNOME= intltool -post-patch: - @${REINPLACE_CMD} -e 's|GMSGFMT = @GMSGFMT@|GMSGFMT = @MSGFMT@|g' ${WRKSRC}/po/Makefile.in.in - .include Modified: head/graphics/ocrfeeder/Makefile ============================================================================== --- head/graphics/ocrfeeder/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/graphics/ocrfeeder/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -23,12 +23,14 @@ RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}lxm gtkspell3>0:${PORTSDIR}/textproc/gtkspell3 \ ${BUILD_DEPENDS} -USES= desktop-file-utils gettext gmake pathfix pkgconfig tar:xz +USES= desktop-file-utils gettext gmake pkgconfig tar:xz USE_GNOME= gnomedocutils gnomehier gtk30 librsvg2 pygobject3 USE_GHOSTSCRIPT=yes USE_PYTHON= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e \ Modified: head/japanese/libskk/Makefile ============================================================================== --- head/japanese/libskk/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/japanese/libskk/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -17,12 +17,14 @@ BUILD_DEPENDS= valac:${PORTSDIR}/lang/va LIB_DEPENDS= libgee.so:${PORTSDIR}/devel/libgee06 \ libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib -USES= gmake libtool pathfix pkgconfig -USE_GNOME= intltool introspection:build GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +USES= gmake libtool pathfix pkgconfig +USE_GNOME= intlhack introspection:build USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PORTDOCS= ChangeLog NEWS README @@ -33,8 +35,6 @@ NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libskk.so.0 - @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} Modified: head/korean/ibus-hangul/Makefile ============================================================================== --- head/korean/ibus-hangul/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/korean/ibus-hangul/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -17,10 +17,12 @@ LIB_DEPENDS= libhangul.so:${PORTSDIR}/ko PROJECTHOST= ibus GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INSTALLS_ICONS= yes -USE_GNOME= intltool pygobject3 +USES= gmake libtool pkgconfig +USE_GNOME= intlhack pygobject3 USE_PYTHON= yes -USES= gmake libtool pathfix pkgconfig OPTIONS_DEFINE= NLS OPTIONS_SUB= NLS Modified: head/math/gcalctool/Makefile ============================================================================== --- head/math/gcalctool/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/math/gcalctool/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -15,11 +15,11 @@ COMMENT= GNOME 2 calculator tool based o CONFLICTS= gcalctool-2.31.* -USES= bison gettext gmake libtool pathfix pkgconfig tar:bzip2 +USES= bison gettext gmake libtool pkgconfig tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= gnomeprefix intlhack gconf2 gnomedocutils gtk20 CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.gnome.gcalctool.gschema.xml Modified: head/math/libqalculate/Makefile ============================================================================== --- head/math/libqalculate/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/math/libqalculate/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -13,15 +13,17 @@ COMMENT= Multi-purpose desktop calculato LIB_DEPENDS= libcln.so:${PORTSDIR}/math/cln USES= pkgconfig pathfix gmake libtool -USE_GNOME= glib20 intlhack libxml2 +USE_GNOME= glib20 intltool libxml2 USE_LDCONFIG= yes GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +INSTALL_TARGET= install-strip OPTIONS_DEFINE= NLS OPTIONS_SUB= yes -NLS_USES= gettext -NLS_CONFIGURE_ENV= GMSGFMT="${LOCALBASE}/bin/msgfmt" +NLS_USES= gettext .include @@ -30,11 +32,5 @@ post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS =/s|po ||g' ${WRKSRC}/Makefile.in .endif @${REINPLACE_CMD} -e '/^SUBDIRS =/s|docs||g' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' \ - ${WRKSRC}/${CONFIGURE_SCRIPT} \ - ${WRKSRC}/libqalculate.pc.in - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libqalculate.so* .include Modified: head/math/mate-calc/Makefile ============================================================================== --- head/math/mate-calc/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/math/mate-calc/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -14,12 +14,12 @@ BUILD_DEPENDS= itstool:${PORTSDIR}/textp PORTSCOUT= limitw:1,even -USES= gettext gmake pathfix pkgconfig tar:xz +USES= gettext gmake pkgconfig tar:xz USE_GNOME= glib20 gnomehier gtk20 intlhack libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gtk=2.0 CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.mate.calc.gschema.xml Modified: head/math/qalculate/Makefile ============================================================================== --- head/math/qalculate/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/math/qalculate/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -17,9 +17,11 @@ LIB_DEPENDS= libqalculate.so:${PORTSDIR} RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot \ wget:${PORTSDIR}/ftp/wget +USES= gettext gmake USE_GNOME= gnomehier libglade2 libgnome -USES= gettext gmake pathfix GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INSTALLS_OMF= yes post-patch: Modified: head/multimedia/banshee/Makefile ============================================================================== --- head/multimedia/banshee/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/multimedia/banshee/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -45,6 +45,8 @@ INSTALLS_ICONS= yes INSTALL_TARGET= install-strip CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-vendor-build-id=FreeBSD\ BSD\#\ Project --disable-gio-hardware --disable-boo +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .include Modified: head/multimedia/freetuxtv/Makefile ============================================================================== --- head/multimedia/freetuxtv/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/multimedia/freetuxtv/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -3,7 +3,7 @@ PORTNAME= freetuxtv PORTVERSION= 0.6.5 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= multimedia MASTER_SITES= GOOGLE_CODE @@ -12,26 +12,19 @@ COMMENT= WebTV player based on GTK2+ and LICENSE= GPLv3 -BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser LIB_DEPENDS= libvlc.so:${PORTSDIR}/multimedia/vlc \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ libcurl.so:${PORTSDIR}/ftp/curl \ libnotify.so:${PORTSDIR}/devel/libnotify \ - libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \ - libpcre.so:${PORTSDIR}/devel/pcre \ - libpng15.so:${PORTSDIR}/graphics/png \ - libfreetype.so:${PORTSDIR}/print/freetype2 \ - libexpat.so:${PORTSDIR}/textproc/expat2 \ - libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig - -USES= gmake iconv libtool pathfix pkgconfig -USE_GNOME= gtk20 cairo -USE_XORG= pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \ - xi xinerama xrandr xrender + +USES= gmake iconv libtool pkgconfig +USE_GNOME= gtk20 GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-gtk=2.0 +CONFIGURE_ARGS= --with-gtk=2.0 CFLAGS+= -Wno-return-type -w +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INSTALLS_ICONS= yes PORTDOCS= AUTHORS ChangeLog README @@ -48,7 +41,7 @@ SUB_FILES= pkg-message PORTSCOUT= ignore:1 post-patch: - @${REINPLACE_CMD} -e 's|$${pkgdatadir}/doc|$${PREFIX}/share/doc/${PORTNAME}|' \ + @${REINPLACE_CMD} -e 's|$${pkgdatadir}/doc|$${pkgdocdir}|' \ -e 's|install-data-am: install-freetuxtvdocDATA|install-data-am: |' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's/libvlc_media_new_path/libvlc_media_new_location/' \ Modified: head/multimedia/imagination/Makefile ============================================================================== --- head/multimedia/imagination/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/multimedia/imagination/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -14,8 +14,10 @@ LIB_DEPENDS= libsox.so:${PORTSDIR}/audio libavcodec.so:${PORTSDIR}/multimedia/ffmpeg GNU_CONFIGURE= yes -USES= gmake pkgconfig pathfix libtool -USE_GNOME= gtk20 intltool intlhack libxslt +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gmake pkgconfig libtool +USE_GNOME= gtk20 intltool libxslt INSTALLS_ICONS= yes INSTALL_TARGET= install-strip Modified: head/net-im/ekiga/Makefile ============================================================================== --- head/net-im/ekiga/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/net-im/ekiga/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -21,14 +21,14 @@ LIB_DEPENDS= libboost_signals.so:${PORTS RUN_DEPENDS= gnome-icon-theme>=3.0.0:${PORTSDIR}/misc/gnome-icon-theme GNU_CONFIGURE= yes -USES= gettext gmake libtool pathfix perl5 pkgconfig tar:xz +USES= gettext gmake libtool perl5 pkgconfig tar:xz USE_XORG= xv USE_GNOME= gtk20 intltool libxml2 INSTALLS_OMF= yes INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -I${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= LDAP NOTIFY EVOLUTION GCONF DBUS AVAHI GNOMEHELP OPTIONS_DEFAULT=NOTIFY DBUS GCONF AVAHI Modified: head/net-im/folks04/Makefile ============================================================================== --- head/net-im/folks04/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/net-im/folks04/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -23,7 +23,7 @@ USE_LDCONFIG= yes USE_GNOME= intlhack gnomehier introspection:build GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip PLIST_SUB= VERSION=22 Modified: head/net/mediastreamer/Makefile ============================================================================== --- head/net/mediastreamer/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/net/mediastreamer/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -25,7 +25,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip USES= gmake libtool pathfix pkgconfig -USE_GNOME= gnomehier intltool +USE_GNOME= gnomehier intlhack USE_LDCONFIG= yes OPTIONS_DEFINE= IPV6 NLS UPNP VIDEO Modified: head/print/cups-pk-helper/Makefile ============================================================================== --- head/print/cups-pk-helper/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/print/cups-pk-helper/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -13,11 +13,11 @@ COMMENT= Helper that makes system-config LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client \ libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit -USE_GNOME= glib20 intlhack -USES= gettext gmake pathfix pkgconfig tar:xz +USE_GNOME= glib20 intltool +USES= gettext gmake pkgconfig tar:xz GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/libs +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip .include Modified: head/print/gribouy/Makefile ============================================================================== --- head/print/gribouy/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/print/gribouy/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -10,9 +10,11 @@ MASTER_SITES= LOCAL/bland MAINTAINER= gnome@FreeBSD.org COMMENT= Gribouy is a Type1 font editor -USES= gmake pkgconfig pathfix gettext -USE_GNOME= gnomeprefix libglade2 libgnomeui GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gettext gmake pkgconfig +USE_GNOME= gnomeprefix libglade2 libgnomeui USE_GCC= any Modified: head/science/gramps/Makefile ============================================================================== --- head/science/gramps/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/science/gramps/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -3,7 +3,7 @@ PORTNAME= gramps PORTVERSION= 3.4.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science gnome python MASTER_SITES= SF/${PORTNAME}/Stable/${PORTVERSION} @@ -19,12 +19,14 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsdd USE_BDB= 5+ USE_PYTHON= yes -USES= desktop-file-utils gettext pathfix shared-mime-info gmake +USES= desktop-file-utils gettext shared-mime-info gmake USE_GNOME= pygtk2 GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-mime-install +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INSTALLS_OMF= yes INSTALLS_ICONS= yes -CONFIGURE_ENV+= GMSGFMT="${LOCALBASE}/bin/msgfmt" WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= ENCHANT PYWEBKITGTK GNOME GRAPHVIZ EXIV Modified: head/science/gramps/pkg-plist ============================================================================== --- head/science/gramps/pkg-plist Thu Sep 25 14:30:24 2014 (r369259) +++ head/science/gramps/pkg-plist Thu Sep 25 15:18:27 2014 (r369260) @@ -3149,23 +3149,7 @@ share/locale/vi/LC_MESSAGES/gramps.mo share/locale/zh_CN/LC_MESSAGES/gramps.mo share/mime-info/gramps.keys share/mime-info/gramps.mime -share/mime/XMLnamespaces -share/mime/aliases -share/mime/application/x-geneweb.xml -share/mime/application/x-gramps-package.xml -share/mime/application/x-gramps-xml.xml -share/mime/application/x-gramps.xml -share/mime/generic-icons -share/mime/globs -share/mime/globs2 -share/mime/icons -share/mime/magic -share/mime/mime.cache share/mime/packages/gramps.xml -share/mime/subclasses -share/mime/treemagic -share/mime/types -share/mime/version share/pixmaps/gramps.png @dirrmtry man/cs/man1 @dirrmtry man/cs @@ -3255,4 +3239,3 @@ share/pixmaps/gramps.png @dirrmtry share/icons/gnome/scalable/mimetypes @dirrmtry share/icons/gnome/scalable @dirrmtry share/icons/gnome -@dirrmtry share/mime/application Modified: head/security/fpm2/Makefile ============================================================================== --- head/security/fpm2/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/security/fpm2/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -13,10 +13,12 @@ LICENSE= GPLv2 BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser -USES= gmake pathfix pkgconfig tar:bzip2 +USES= gmake pkgconfig tar:bzip2 USE_GNOME= gtk20 INSTALLS_OMF= yes GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PORTDOCS= AUTHORS ChangeLog README Modified: head/security/libsecret/Makefile ============================================================================== --- head/security/libsecret/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/security/libsecret/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -19,6 +19,8 @@ USES= gettext gmake libtool:keepla path USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-introspection --disable-vala +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsecret-1.so.0 Modified: head/sysutils/gnome-schedule/Makefile ============================================================================== --- head/sysutils/gnome-schedule/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/sysutils/gnome-schedule/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -25,6 +25,8 @@ USE_PYTHON= yes USE_GNOME= gnomeprefix pygnome2 INSTALLS_OMF= yes GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip APPLET_CONFIGURE_ENABLE= applet Modified: head/textproc/lasem/Makefile ============================================================================== --- head/textproc/lasem/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/textproc/lasem/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -16,6 +16,8 @@ LICENSE= GPLv2 RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/stix:${PORTSDIR}/x11-fonts/stix-fonts GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USES= gettext gmake libtool pathfix pkgconfig tar:xz USE_GNOME= glib20 pango intltool gdkpixbuf2 libxml2 introspection:build Modified: head/x11-themes/lxappearance/Makefile ============================================================================== --- head/x11-themes/lxappearance/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/x11-themes/lxappearance/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -15,8 +15,10 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDI USES= gmake pathfix pkgconfig tar:xz GNU_CONFIGURE= yes -USE_GNOME= gtk20 intlhack +USE_GNOME= gtk20 CONFIGURE_ARGS= --enable-dbus +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PORTDOCS= AUTHORS README Modified: head/x11-wm/compiz/Makefile ============================================================================== --- head/x11-wm/compiz/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/x11-wm/compiz/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -60,7 +60,8 @@ GCONF_SCHEMAS= gwd.schemas \ compiz-zoom.schemas CONFIGURE_ARGS= --disable-kde4 --disable-kde -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= SVG GTK2 METACITY GNOME DBUS FUSE OPTIONS_DEFAULT= SVG GTK2 METACITY GNOME DBUS Modified: head/x11-wm/plank/Makefile ============================================================================== --- head/x11-wm/plank/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/x11-wm/plank/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -15,11 +15,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen LIB_DEPENDS= libbamf3.so:${PORTSDIR}/sysutils/bamf \ - libgee-0.8.so:${PORTSDIR}/devel/libgee + libgee-0.8.so:${PORTSDIR}/devel/libgee -USES= tar:xz pkgconfig gmake pathfix libtool +USES= tar:xz pkgconfig gmake pathfix libtool GNU_CONFIGURE= yes -USE_GNOME= glib20 gtk30 gdkpixbuf2 libxml2 libwnck3 +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USE_GNOME= glib20 gtk30 gdkpixbuf2 intlhack libxml2 libwnck3 USE_XORG= x11 INSTALLS_ICONS= yes OPTIONS_SUB= yes Modified: head/x11/avant-window-navigator/Makefile ============================================================================== --- head/x11/avant-window-navigator/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/x11/avant-window-navigator/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -24,7 +24,7 @@ USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_XORG= x11 xproto xcomposite xrender CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib AWN_DESKTOP?= agnostic Added: head/x11/avant-window-navigator/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/avant-window-navigator/files/patch-configure Thu Sep 25 15:18:27 2014 (r369260) @@ -0,0 +1,11 @@ +--- configure.orig 2009-05-02 19:05:57 UTC ++++ configure +@@ -21567,6 +21567,8 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + # save current global flags ++ ac_save_LIBS="$LIBS" ++ ac_save_CPPFLAGS="$CPPFLAGS" + LIBS="$ac_save_LIBS $PYTHON_LDFLAGS" + CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" + cat >conftest.$ac_ext <<_ACEOF Modified: head/x11/mate-dialogs/Makefile ============================================================================== --- head/x11/mate-dialogs/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/x11/mate-dialogs/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -14,12 +14,12 @@ BUILD_DEPENDS= itstool:${PORTSDIR}/textp PORTSCOUT= limitw:1,even -USES= gettext gmake pathfix pkgconfig tar:xz -USE_GNOME= gnomehier gtk20 intlhack +USES= gettext gmake pkgconfig tar:xz +USE_GNOME= gnomehier gtk20 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gtk=2.0 CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -I${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= NOTIFY OPTIONS_DEFAULT=NOTIFY Modified: head/x11/workrave/Makefile ============================================================================== --- head/x11/workrave/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/x11/workrave/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -25,7 +25,7 @@ CONFIGURE_ARGS= --disable-silent-rules - INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= GNOME GSTREAMER PULSEAUDIO OPTIONS_DEFAULT= GSTREAMER Modified: head/x11/xkeyboard-config/Makefile ============================================================================== --- head/x11/xkeyboard-config/Makefile Thu Sep 25 14:30:24 2014 (r369259) +++ head/x11/xkeyboard-config/Makefile Thu Sep 25 15:18:27 2014 (r369260) @@ -22,7 +22,7 @@ INSTALL_TARGET= install-strip CONFIGURE_ARGS= --with-xkb-base=${PREFIX}/share/X11/xkb \ --with-xkb-rules-symlink=xorg CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= ETERSOFT ETERSOFT_DESC= Add pre-1918 Russian letters to typographic layout