Attachment 147533 Details for Bug 193782 – patch2

[patch] patch2

pathfix.mk.patch (text/plain), 21.83 KB, created by Tijl Coosemans on 2014-09-21 18:55:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2014-09-21 18:55:46 UTC

Size: 21.83 KB

patch

obsolete

>Index: Mk/Uses/pathfix.mk
>===================================================================
>--- Mk/Uses/pathfix.mk	(revision 368737)
>+++ Mk/Uses/pathfix.mk	(working copy)
>@@ -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
>Index: Mk/bsd.gnome.mk
>===================================================================
>--- Mk/bsd.gnome.mk	(revision 368737)
>+++ Mk/bsd.gnome.mk	(working copy)
>@@ -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
>Index: accessibility/at-spi2-core/Makefile
>===================================================================
>--- accessibility/at-spi2-core/Makefile	(revision 368737)
>+++ accessibility/at-spi2-core/Makefile	(working copy)
>@@ -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 <bsd.port.mk>
>Index: audio/easytag/Makefile
>===================================================================
>--- audio/easytag/Makefile	(revision 368737)
>+++ audio/easytag/Makefile	(working copy)
>@@ -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 \
>Index: audio/paprefs/Makefile
>===================================================================
>--- audio/paprefs/Makefile	(revision 368737)
>+++ audio/paprefs/Makefile	(working copy)
>@@ -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
> 
>Index: comms/gpredict/Makefile
>===================================================================
>--- comms/gpredict/Makefile	(revision 368737)
>+++ comms/gpredict/Makefile	(working copy)
>@@ -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 \
>Index: deskutils/babytrans/Makefile
>===================================================================
>--- deskutils/babytrans/Makefile	(revision 368737)
>+++ deskutils/babytrans/Makefile	(working copy)
>@@ -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
> 
>Index: devel/geany-plugins/files/Makefile.common
>===================================================================
>--- devel/geany-plugins/files/Makefile.common	(revision 368737)
>+++ devel/geany-plugins/files/Makefile.common	(working copy)
>@@ -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-,,}
>Index: devel/geany-plugins-l10n/Makefile
>===================================================================
>--- devel/geany-plugins-l10n/Makefile	(revision 368737)
>+++ devel/geany-plugins-l10n/Makefile	(working copy)
>@@ -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 <bsd.port.mk>
>Index: devel/gitg0/Makefile
>===================================================================
>--- devel/gitg0/Makefile	(revision 368737)
>+++ devel/gitg0/Makefile	(working copy)
>@@ -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 <bsd.port.mk>
>Index: devel/gsettings-desktop-schemas/Makefile
>===================================================================
>--- devel/gsettings-desktop-schemas/Makefile	(revision 368737)
>+++ devel/gsettings-desktop-schemas/Makefile	(working copy)
>@@ -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 \
>Index: devel/libvirt-glib/Makefile
>===================================================================
>--- devel/libvirt-glib/Makefile	(revision 368737)
>+++ devel/libvirt-glib/Makefile	(working copy)
>@@ -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
>Index: games/klavaro/Makefile
>===================================================================
>--- games/klavaro/Makefile	(revision 368737)
>+++ games/klavaro/Makefile	(working copy)
>@@ -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
> 
>Index: japanese/libskk/Makefile
>===================================================================
>--- japanese/libskk/Makefile	(revision 368737)
>+++ japanese/libskk/Makefile	(working copy)
>@@ -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}
> 
>Index: math/gcalctool/Makefile
>===================================================================
>--- math/gcalctool/Makefile	(revision 368737)
>+++ math/gcalctool/Makefile	(working copy)
>@@ -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
> 
>Index: math/libqalculate/Makefile
>===================================================================
>--- math/libqalculate/Makefile	(revision 368737)
>+++ math/libqalculate/Makefile	(working copy)
>@@ -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 <bsd.port.options.mk>
> 
>@@ -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 <bsd.port.mk>
>Index: math/mate-calc/Makefile
>===================================================================
>--- math/mate-calc/Makefile	(revision 368737)
>+++ math/mate-calc/Makefile	(working copy)
>@@ -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
> 
>Index: multimedia/freetuxtv/Makefile
>===================================================================
>--- multimedia/freetuxtv/Makefile	(revision 368737)
>+++ multimedia/freetuxtv/Makefile	(working copy)
>@@ -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/' \
>Index: multimedia/imagination/Makefile
>===================================================================
>--- multimedia/imagination/Makefile	(revision 368737)
>+++ multimedia/imagination/Makefile	(working copy)
>@@ -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
> 
>Index: net/mediastreamer/Makefile
>===================================================================
>--- net/mediastreamer/Makefile	(revision 368737)
>+++ net/mediastreamer/Makefile	(working copy)
>@@ -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
>Index: net-im/ekiga/Makefile
>===================================================================
>--- net-im/ekiga/Makefile	(revision 368737)
>+++ net-im/ekiga/Makefile	(working copy)
>@@ -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
>Index: net-im/folks04/Makefile
>===================================================================
>--- net-im/folks04/Makefile	(revision 368737)
>+++ net-im/folks04/Makefile	(working copy)
>@@ -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
>Index: print/cups-pk-helper/Makefile
>===================================================================
>--- print/cups-pk-helper/Makefile	(revision 368737)
>+++ print/cups-pk-helper/Makefile	(working copy)
>@@ -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 <bsd.port.mk>
>Index: security/fpm2/Makefile
>===================================================================
>--- security/fpm2/Makefile	(revision 368737)
>+++ security/fpm2/Makefile	(working copy)
>@@ -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
> 
>Index: security/libsecret/Makefile
>===================================================================
>--- security/libsecret/Makefile	(revision 368737)
>+++ security/libsecret/Makefile	(working copy)
>@@ -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
>Index: textproc/lasem/Makefile
>===================================================================
>--- textproc/lasem/Makefile	(revision 368737)
>+++ textproc/lasem/Makefile	(working copy)
>@@ -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
> 
>Index: x11/avant-window-navigator/Makefile
>===================================================================
>--- x11/avant-window-navigator/Makefile	(revision 368737)
>+++ x11/avant-window-navigator/Makefile	(working copy)
>@@ -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
> 
>Index: x11/avant-window-navigator/files/patch-configure
>===================================================================
>--- x11/avant-window-navigator/files/patch-configure	(revision 0)
>+++ x11/avant-window-navigator/files/patch-configure	(working copy)
>@@ -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
>
>Property changes on: x11/avant-window-navigator/files/patch-configure
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: x11/mate-dialogs/Makefile
>===================================================================
>--- x11/mate-dialogs/Makefile	(revision 368737)
>+++ x11/mate-dialogs/Makefile	(working copy)
>@@ -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
>Index: x11/workrave/Makefile
>===================================================================
>--- x11/workrave/Makefile	(revision 368737)
>+++ x11/workrave/Makefile	(working copy)
>@@ -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
>Index: x11/xkeyboard-config/Makefile
>===================================================================
>--- x11/xkeyboard-config/Makefile	(revision 368737)
>+++ x11/xkeyboard-config/Makefile	(working copy)
>@@ -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
>Index: x11-themes/lxappearance/Makefile
>===================================================================
>--- x11-themes/lxappearance/Makefile	(revision 368737)
>+++ x11-themes/lxappearance/Makefile	(working copy)
>@@ -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
>

Actions: View | Diff

Attachments on bug 193782: 147489 | 147533 | 147593