Attachment 146130 Details for Bug 192062 – binutils.ports.2

[patch] binutils.ports.2

binutils.ports.patch (text/plain), 161.67 KB, created by Tijl Coosemans on 2014-08-21 21:09:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2014-08-21 21:09:57 UTC

Size: 161.67 KB

patch

obsolete

>Index: accessibility/gnopernicus/Makefile
>===================================================================
>--- accessibility/gnopernicus/Makefile	(revision 365596)
>+++ accessibility/gnopernicus/Makefile	(working copy)
>@@ -16,10 +16,12 @@ LIB_DEPENDS=	libgnome-mag.so:${PORTSDIR}
> 
> USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
> USE_LDCONFIG=	yes
>+USE_XORG=	x11
> INSTALLS_OMF=	yes
> INSTALLS_ICONS=	yes
> USE_GNOME=	gnomeprefix intlhack libgnomeui atspi gnomespeech
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	X_LIBS=-lX11
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> MAKE_ENV=	SED="${SED}"
>Index: audio/gqradio/Makefile
>===================================================================
>--- audio/gqradio/Makefile	(revision 365596)
>+++ audio/gqradio/Makefile	(working copy)
>@@ -14,10 +14,11 @@ LICENSE=	GPLv2
> 
> USES=		gettext pathfix pkgconfig
> USE_GNOME=	gtk20
>+USE_XORG=	x11
> GNU_CONFIGURE=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LIBS+=		-L${LOCALBASE}/lib -lm
>+LIBS+=		-L${LOCALBASE}/lib -lm -lX11
> 
> OPTIONS_DEFINE=		DOCS V4L
> 
>Index: audio/jack-rack/Makefile
>===================================================================
>--- audio/jack-rack/Makefile	(revision 365596)
>+++ audio/jack-rack/Makefile	(working copy)
>@@ -20,7 +20,7 @@ USES=		gettext shebangfix pkgconfig tar:
> USE_PYTHON=	yes
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lm
> CONFIGURE_ARGS=	--disable-ladcca --disable-lash --disable-aseq
> SHEBANG_FILES=	ecarack
> 
>Index: audio/padevchooser/Makefile
>===================================================================
>--- audio/padevchooser/Makefile	(revision 365596)
>+++ audio/padevchooser/Makefile	(working copy)
>@@ -16,7 +16,9 @@ LIB_DEPENDS=	libglademm-2.4.so:${PORTSDI
> RUN_DEPENDES=	dbus-daemon:${PORTSDIR}/devel/dbus
> 
> GNU_CONFIGURE=	yes
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> USES=		gmake pkgconfig
>+USE_XORG=	x11
> 
> CONFIGURE_ARGS=	--disable-lynx
> 
>Index: comms/kb/files/Makefile
>===================================================================
>--- comms/kb/files/Makefile	(revision 365596)
>+++ comms/kb/files/Makefile	(working copy)
>@@ -13,4 +13,4 @@ kb_server:	kb_server.c
> 
> kb:	boxes.c fboxes.c kb.c radio.c bsd_bells.c fields.c sboxes.c \
> 	couzon.c init.c kb_server.c support.c elogs.c io.c network.c tree.c
>-	${CC} ${CFLAGS} -DSPKR -I. ${LIBS} kb.c -o kb
>+	${CC} ${CFLAGS} -DSPKR -I. ${LIBS} kb.c -o kb -lm
>Index: deskutils/fusenshi/Makefile
>===================================================================
>--- deskutils/fusenshi/Makefile	(revision 365596)
>+++ deskutils/fusenshi/Makefile	(working copy)
>@@ -10,11 +10,9 @@ MASTER_SITES=	http://www.ongs.co.jp/proj
> MAINTAINER=	ozawa@ongs.co.jp
> COMMENT=	Post-it(R) like application with network support
> 
>-LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
>-		libgtksourceview-1.0.so:${PORTSDIR}/x11-toolkits/gtksourceview
>-
> USES=		pkgconfig tar:tgz
>-USE_GNOME=	libxml2
>+USE_GNOME=	gtkmm24 gtksourceview libxml2
>+USE_XORG=	x11
> MAKE_JOBS_UNSAFE=	yes
> 
> .ifdef WITHOUT_SSL
>Index: deskutils/fusenshi/files/patch-src-Makefile
>===================================================================
>--- deskutils/fusenshi/files/patch-src-Makefile	(revision 365596)
>+++ deskutils/fusenshi/files/patch-src-Makefile	(working copy)
>@@ -1,6 +1,15 @@
> --- src/Makefile.orig	2014-07-05 00:11:32.020240534 +0800
> +++ src/Makefile	2014-07-05 00:12:26.524236990 +0800
>-@@ -98,12 +98,12 @@ build: ${OBJ}
>+@@ -34,7 +34,7 @@
>+ .include "../Makefile.inc"
>+ 
>+ LIB_DEPS= gtkmm-2.4 gdkmm-2.4 atkmm-1.6 pangomm-1.4 gtksourceview-1.0 \
>+-		  gthread-2.0 libxml-2.0
>++		  gthread-2.0 libxml-2.0 x11
>+ 
>+ #ifndef WITHOUT_SSL
>+ LIB_DEPS+= gnutls
>+@@ -98,12 +98,12 @@
>  	${CXX} ${CXXFLAGS} -o ${<:.cpp=.o} -c $<
>  
>  install:
>Index: deskutils/glabels/Makefile
>===================================================================
>--- deskutils/glabels/Makefile	(revision 365596)
>+++ deskutils/glabels/Makefile	(working copy)
>@@ -34,5 +34,6 @@ CONFIGURE_ARGS+=	--without-libebook
> post-patch:
> 	@${REINPLACE_CMD} -e 's|malloc\.h|stdlib\.h|g' \
> 		${WRKSRC}/iec16022-0.2.1/*.c
>+	@${REINPLACE_CMD} 's/_LDADD =/& -lm/' ${WRKSRC}/src/Makefile.in
> 
> .include <bsd.port.post.mk>
>Index: deskutils/gnome-main-menu/files/patch-configure
>===================================================================
>--- deskutils/gnome-main-menu/files/patch-configure	(revision 365596)
>+++ deskutils/gnome-main-menu/files/patch-configure	(working copy)
>@@ -6,13 +6,13 @@
>      if test -n "$PKG_CONFIG" && \
> -    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo \"") >&5
> -  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ") 2>&5
>-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo \"") >&5
>-+  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ") 2>&5
>++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 \"") >&5
>++  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 ") 2>&5
>    ac_status=$?
>    $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
>    (exit $ac_status); }; then
> -  pkg_cv_MAIN_MENU_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo " 2>/dev/null`
>-+  pkg_cv_MAIN_MENU_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo " 2>/dev/null`
>++  pkg_cv_MAIN_MENU_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 " 2>/dev/null`
>  else
>    pkg_failed=yes
>  fi
>@@ -22,13 +22,13 @@
>      if test -n "$PKG_CONFIG" && \
> -    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo \"") >&5
> -  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ") 2>&5
>-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo \"") >&5
>-+  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ") 2>&5
>++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 \"") >&5
>++  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 ") 2>&5
>    ac_status=$?
>    $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
>    (exit $ac_status); }; then
> -  pkg_cv_MAIN_MENU_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo " 2>/dev/null`
>-+  pkg_cv_MAIN_MENU_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo " 2>/dev/null`
>++  pkg_cv_MAIN_MENU_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 " 2>/dev/null`
>  else
>    pkg_failed=yes
>  fi
>@@ -37,16 +37,16 @@
>  fi
>          if test $_pkg_short_errors_supported = yes; then
> -	        MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo " 2>&1`
>-+	        MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo " 2>&1`
>++	        MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 " 2>&1`
>          else
> -	        MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo " 2>&1`
>-+	        MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo " 2>&1`
>++	        MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 " 2>&1`
>          fi
>  	# Put the nasty error message in config.log where it belongs
>  	echo "$MAIN_MENU_PKG_ERRORS" >&5
>  
> -	{ { $as_echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ) were not met:
>-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ) were not met:
>++	{ { $as_echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 ) were not met:
>  
>  $MAIN_MENU_PKG_ERRORS
>  
>@@ -55,7 +55,7 @@
>  See the pkg-config man page for more details.
>  " >&5
> -$as_echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ) were not met:
>-+$as_echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ) were not met:
>++$as_echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 ) were not met:
>  
>  $MAIN_MENU_PKG_ERRORS
>  
>Index: deskutils/gtimer/Makefile
>===================================================================
>--- deskutils/gtimer/Makefile	(revision 365596)
>+++ deskutils/gtimer/Makefile	(working copy)
>@@ -14,13 +14,13 @@ LICENSE=	GPLv2
> 
> RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
> 
>-USE_XORG=	xscrnsaver
>+USE_XORG=	x11 xscrnsaver
> USE_GNOME=	gtk20
> USES=		gettext perl5 gmake pkgconfig
> GNU_CONFIGURE=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include -Wno-return-type
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|1.1.7|${PORTVERSION}|g' ${WRKSRC}/configure
>Index: deskutils/mdh/Makefile
>===================================================================
>--- deskutils/mdh/Makefile	(revision 365596)
>+++ deskutils/mdh/Makefile	(working copy)
>@@ -14,10 +14,11 @@ LICENSE=	GPLv2 # (or later)
> 
> USE_GNOME=	gtk20
> USES=		gmake pkgconfig tar:bzip2
>+USE_XORG=	x11
> GNU_CONFIGURE=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> 
> OPTIONS_DEFINE=	CURL DOCS GTOP
> OPTIONS_DEFAULT=	CURL GTOP
>Index: deskutils/multisync/Makefile
>===================================================================
>--- deskutils/multisync/Makefile	(revision 365596)
>+++ deskutils/multisync/Makefile	(working copy)
>@@ -11,24 +11,13 @@ DISTNAME=	multisync-${PORTVERSION}
> MAINTAINER?=	ports@FreeBSD.org
> COMMENT?=	Synchronize calendars, addressbooks, and other PIM data
> 
>-WRKSRC?=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
>-WRKSRCMASTER=	${WRKDIR}/multisync-${PORTVERSION}
> USE_GNOME=	gnomeprefix libgnomeui
> USES=		gmake libtool pathfix pkgconfig tar:bzip2
>-USE_AUTOTOOLS=	libtoolize aclocal autoconf automake
>-AUTOMAKE_ARGS=	--add-missing
>+USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
>+AUTOMAKE_ARGS=	-a -c -f
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
> MAKE_JOBS_UNSAFE=	yes
> 
>-pre-configure:
>-	@${FIND} ${WRKDIR} -type l -delete
>-.for FILE in missing install-sh mkinstalldirs config.guess config.sub depcomp
>-	@${CP} -f ${AUTOMAKE_DIR}/${FILE} ${WRKSRC}
>-	@${CP} -f ${AUTOMAKE_DIR}/${FILE} ${WRKSRCMASTER}
>-.endfor
>-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|-lpthread||'
>-
> .include <bsd.port.mk>
>Index: deskutils/multisync/files/patch-src-Makefile.am
>===================================================================
>--- deskutils/multisync/files/patch-src-Makefile.am	(revision 0)
>+++ deskutils/multisync/files/patch-src-Makefile.am	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/Makefile.am.orig
>++++ src/Makefile.am
>+@@ -23,7 +23,7 @@
>+ 
>+ multisync_LDFLAGS = -rdynamic
>+ 
>+-multisync_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -lpthread -L./libversit -lversit
>++multisync_LDADD = @PACKAGE_LIBS@ -lX11 $(INTLLIBS) -lpthread -L./libversit -lversit
>+ 
>+ SUBDIRS = libversit
>+ 
>
>Property changes on: deskutils/multisync/files/patch-src-Makefile.am
>___________________________________________________________________
>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: deskutils/notecase/Makefile
>===================================================================
>--- deskutils/notecase/Makefile	(revision 365596)
>+++ deskutils/notecase/Makefile	(working copy)
>@@ -13,8 +13,9 @@ COMMENT=	Hierarchical text notes manager
> 
> LICENSE=	BSD3CLAUSE
> 
>-USE_GNOME=	gtk20 gtksourceview2 gnomevfs2
> USES=		dos2unix gmake desktop-file-utils gettext pkgconfig shared-mime-info
>+USE_GNOME=	gtk20 gtksourceview2 gnomevfs2
>+USE_XORG=	x11
> 
> DOS2UNIX_REGEX=	.*\.(c|h|cpp)
> 
>Index: deskutils/notecase/files/patch-Makefile
>===================================================================
>--- deskutils/notecase/files/patch-Makefile	(revision 365596)
>+++ deskutils/notecase/files/patch-Makefile	(working copy)
>@@ -13,7 +13,7 @@
>  else
>  $(BIN)/notecase$(EXE): updatesrc $(OBJS)
> -	$(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS) > /dev/null
>-+	$(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS) -lz > /dev/null
>++	$(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS) -lX11 -lz > /dev/null
>  endif	
>  
>  #
>Index: deskutils/notify-osd/Makefile
>===================================================================
>--- deskutils/notify-osd/Makefile	(revision 365596)
>+++ deskutils/notify-osd/Makefile	(working copy)
>@@ -13,18 +13,18 @@ COMMENT=	On-screen-display notification 
> 
> LICENSE=	GPLv3
> 
>-CONFLICTS=	xfce4-notification-daemon-[0-9]*
>-
> LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
> 		libnotify.so:${PORTSDIR}/devel/libnotify
> RUN_DEPENDS=	dbus-daemon:${PORTSDIR}/devel/dbus
> 
>+CONFLICTS=	xfce4-notification-daemon-[0-9]*
>+
> GNU_CONFIGURE=	yes
> USES=		gmake libtool pkgconfig
> USE_GNOME=	libwnck gconf2
>-USE_XORG=	pixman
>+USE_XORG=	pixman x11
> 
>-LDFLAGS+=	-L${LOCALBASE}/lib -lpixman-1
>+LIBS+=		-L${LOCALBASE}/lib -lpixman-1 -lX11
> 
> .include <bsd.port.options.mk>
> 
>Index: deskutils/xfce4-notification-daemon/Makefile
>===================================================================
>--- deskutils/xfce4-notification-daemon/Makefile	(revision 365596)
>+++ deskutils/xfce4-notification-daemon/Makefile	(working copy)
>@@ -62,7 +62,7 @@ post-patch:
> 		${WRKSRC}/src/daemon/Makefile.in \
> 		${WRKSRC}/src/themes/bubble/Makefile.in \
> 		${WRKSRC}/src/themes/standard/Makefile.in
>-	@${REINPLACE_CMD} '/GTK_LIBS =/s/$$/ -lgmodule-2.0/' \
>+	@${REINPLACE_CMD} '/GTK_LIBS =/s/$$/ -lgmodule-2.0 -lX11/' \
> 		${WRKSRC}/src/daemon/Makefile.in
> .if empty(PORT_OPTIONS:MNLS)
> 	@${REINPLACE_CMD} -e 's|$USE_NLS=$yes|\1no|' ${WRKSRC}/configure
>Index: editors/codelite/files/patch-sdk_codelite_indexer_CMakeLists.txt
>===================================================================
>--- editors/codelite/files/patch-sdk_codelite_indexer_CMakeLists.txt	(revision 0)
>+++ editors/codelite/files/patch-sdk_codelite_indexer_CMakeLists.txt	(working copy)
>@@ -0,0 +1,11 @@
>+--- sdk/codelite_indexer/CMakeLists.txt.orig
>++++ sdk/codelite_indexer/CMakeLists.txt
>+@@ -33,7 +33,7 @@
>+ 
>+ # Define the output
>+ add_executable(codelite_indexer ${SRCS})
>+-target_link_libraries(codelite_indexer ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES})
>++target_link_libraries(codelite_indexer ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} -pthread)
>+ 
>+ install(TARGETS codelite_indexer DESTINATION ${CL_PREFIX}/bin)
>+ 
>
>Property changes on: editors/codelite/files/patch-sdk_codelite_indexer_CMakeLists.txt
>___________________________________________________________________
>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: editors/ghex/Makefile
>===================================================================
>--- editors/ghex/Makefile	(revision 365596)
>+++ editors/ghex/Makefile	(working copy)
>@@ -23,4 +23,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
> 
> GCONF_SCHEMAS=	ghex2.schemas
> 
>+post-patch:
>+	@${REINPLACE_CMD} '/^ghex2_LDADD =/s/$$/ -lm/' ${WRKSRC}/src/Makefile.in
>+
> .include <bsd.port.mk>
>Index: editors/madedit/Makefile
>===================================================================
>--- editors/madedit/Makefile	(revision 365596)
>+++ editors/madedit/Makefile	(working copy)
>@@ -12,20 +12,16 @@ COMMENT=	Open-source and cross-platform 
> 
> LICENSE=	GPLv2
> 
>+LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
>+
> USES=		gettext pkgconfig dos2unix desktop-file-utils
> USE_WX=		2.8+
> WANT_UNICODE=	yes
>-
>-LIB_DEPENDS+=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
>+USE_XORG=	x11
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
>-CONFIGURE_ENV+=	PKG_CONFIG="${PKG_CONFIG}" glib_gtk2_CFLAGS="${glib_gtk2_CFLAGS}" glib_gtk2_LIBS="${glib_gtk2_LIBS}"
>-CXXFLAGS+=	${glib_gtk2_CFLAGS}
>-
>-PKG_CONFIG?=	${LOCALBASE}/bin/pkgconf
>-glib_gtk2_CFLAGS=`${PKG_CONFIG} --cflags gtk+-2.0`
>-glib_gtk2_LIBS=	`${PKG_CONFIG} --libs gtk+-2.0`
>+CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> 
> BROKEN_sparc64=	yes
> 
>Index: editors/madedit/files/patch-charset-detector__src__entry__impl.cpp
>===================================================================
>--- editors/madedit/files/patch-charset-detector__src__entry__impl.cpp	(revision 365596)
>+++ editors/madedit/files/patch-charset-detector__src__entry__impl.cpp	(working copy)
>@@ -1,21 +0,0 @@
>---- ./charset-detector/src/entry/impl.cpp.orig	2011-03-22 16:53:02.918217862 -0700
>-+++ ./charset-detector/src/entry/impl.cpp	2011-03-22 16:53:47.868220433 -0700
>-@@ -41,8 +41,10 @@
>- #include "chardetect.h"
>- #include "nscore.h"
>- #include "nsUniversalDetector.h"
>-+#pragma GCC visibility push(default)
>- #include <string.h>
>- #include <stdlib.h>
>-+#pragma GCC visibility pop
>- 
>- #ifdef _WIN32
>- #   include <windows.h>
>-@@ -53,7 +55,6 @@
>- #pragma managed(push, off)
>- #endif
>- 
>--
>- class DllDetector : public nsUniversalDetector
>- {
>- protected:
>Index: editors/madedit/files/patch-charset-detector__src__prmem.h
>===================================================================
>--- editors/madedit/files/patch-charset-detector__src__prmem.h	(revision 365596)
>+++ editors/madedit/files/patch-charset-detector__src__prmem.h	(working copy)
>@@ -1,12 +0,0 @@
>---- ./charset-detector/src/prmem.h.orig	2011-03-22 16:53:02.938216470 -0700
>-+++ ./charset-detector/src/prmem.h	2011-03-22 16:53:03.708221682 -0700
>-@@ -37,7 +37,9 @@
>- #ifndef nsDummyPrmem_h__
>- #define nsDummyPrmem_h__
>- 
>-+#pragma GCC visibility push(default)
>- #include <stdlib.h>
>-+#pragma GCC visibility pop
>- 
>- inline void* PR_Malloc(size_t len)
>- {
>Index: emulators/jzintv/Makefile
>===================================================================
>--- emulators/jzintv/Makefile	(revision 365596)
>+++ emulators/jzintv/Makefile	(working copy)
>@@ -20,7 +20,7 @@ USES=	gmake zip
> USE_XORG=	x11 xau xdmcp
> USE_SDL=	sdl
> CPPFLAGS+=	-I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
>-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`
>+LDFLAGS+=	-L${LOCALBASE}/lib `${SDL_CONFIG} --libs` -lm
> 
> OPTIONS_DEFINE=	TOOLS DOCS EXAMPLES
> OPTIONS_SUB=	yes
>Index: emulators/tilem/Makefile
>===================================================================
>--- emulators/tilem/Makefile	(revision 365596)
>+++ emulators/tilem/Makefile	(working copy)
>@@ -19,6 +19,7 @@ GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	OPT_CFLAGS=" "	# Inhibit -O3, our default CFLAGS are upheld
> USE_GNOME=	gtk20
> INSTALLS_ICONS=	yes
>+LIBS+=		-lm
> 
> # Unbreak parallel builds (-jX)
> post-patch:
>Index: finance/grisbi/Makefile
>===================================================================
>--- finance/grisbi/Makefile	(revision 365596)
>+++ finance/grisbi/Makefile	(working copy)
>@@ -19,10 +19,10 @@ GNU_CONFIGURE=	yes
> USE_GNOME=	gtk20 glib20 libxml2
> USE_OPENSSL=	yes
> INSTALLS_ICONS=	yes
>-CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"
>+CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> 
> OPTIONS_DEFINE=	DOCS NLS
> 
>Index: finance/xtrader/Makefile
>===================================================================
>--- finance/xtrader/Makefile	(revision 365596)
>+++ finance/xtrader/Makefile	(working copy)
>@@ -13,7 +13,6 @@ COMMENT=	Technical analysis program for 
> LIB_DEPENDS=	libptypes.so:${PORTSDIR}/devel/ptypes \
> 		libfltk.so.1:${PORTSDIR}/x11-toolkits/fltk
> 
>-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
> MAKEFILE=	Makefile.linux
> USE_XORG=	x11 xpm
> BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
>Index: finance/xtrader/files/patch-Makefile.linux
>===================================================================
>--- finance/xtrader/files/patch-Makefile.linux	(revision 365596)
>+++ finance/xtrader/files/patch-Makefile.linux	(working copy)
>@@ -6,11 +6,11 @@
> -CFLAGS=			-march=i586 -O3 -Wall -Wno-format-y2k
> -LFLAGS=			-L/usr/local/lib -lz -lfltk -lptypes  -lexpat -L/usr/X11R6/lib -lm -lXpm -lX11 -ldl -lpthread -lXft
> -LFLAGS2=		-L/usr/local/lib -lfltk_ -lptypes -L/usr/X11R6/lib -lXpm -lX11 -ldl -lpthread
>-+COMP=			$(CC)
>++COMP=			$(CXX)
> +IFLAGS=			-I../util -Isrc -I$(LOCALBASE)/include -I$(LOCALBASE)/include/ptypes
> +CFLAGS:=			$(CFLAGS) -Wno-format-y2k
>-+LFLAGS=			-L$(LOCALBASE)/lib -lz -lfltk -lptypes  -lexpat -lm -lXpm -lX11  $(PTHREAD_LIBS) -lXft -lcompat
>-+LFLAGS2=		-L$(LOCALBASE)/lib -lfltk -lptypes -lXpm -lX11  $(PTHREAD_LIBS)
>++LFLAGS=			-L$(LOCALBASE)/lib -lz -lfltk -lptypes -lexpat -lm -lXpm -lX11 -pthread -lXft -lcompat
>++LFLAGS2=		-L$(LOCALBASE)/lib -lfltk -lptypes -lXpm -lX11 -pthread
>  XTRADER=		xtrader
>  XTRADER2=		xtrader.static
>  
>Index: ftp/pureadmin/Makefile
>===================================================================
>--- ftp/pureadmin/Makefile	(revision 365596)
>+++ ftp/pureadmin/Makefile	(working copy)
>@@ -19,8 +19,8 @@ INSTALLS_ICONS=	yes
> 
> OPTIONS_DEFINE=	DOCS
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>-LDFLAGS+=	-L${LOCALBASE}/lib -lm ${PTHREAD_LIBS}
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib -lX11 -lm
> 
> PORTDOCS=	index.txt introduction.txt main_window.txt \
> 		preferences.txt user_manager.txt
>Index: games/airstrike/Makefile
>===================================================================
>--- games/airstrike/Makefile	(revision 365596)
>+++ games/airstrike/Makefile	(working copy)
>@@ -39,6 +39,7 @@ DESKTOP_ENTRIES="Airstrike" "" "${PORTNA
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|CFLAGS += -DLINUX|#CFLAGS += -DLINUX|' \
>+		-e '/$$(CC)/s/$$/ -lm/' \
> 		${WRKSRC}/src/Makefile
> 	@${FIND} ${WRKSRC} -name '*.c' -or -name '*.h' | ${XARGS} \
> 		${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g'
>Index: games/asteroid/Makefile
>===================================================================
>--- games/asteroid/Makefile	(revision 365596)
>+++ games/asteroid/Makefile	(working copy)
>@@ -23,6 +23,7 @@ USE_SDL=	mixer sdl
> USE_GNOME=	gtk20
> USE_XORG=	xmu
> INSTALLS_ICONS=	yes
>+LDFLAGS+=	-lm
> 
> PORTDOCS=	AUTHORS NEWS README.md
> OPTIONS_DEFINE=	DOCS
>Index: games/atanks/Makefile
>===================================================================
>--- games/atanks/Makefile	(revision 365596)
>+++ games/atanks/Makefile	(working copy)
>@@ -22,6 +22,7 @@ PORTDOCS=	Changelog README README_ru.txt
> OPTIONS_DEFINE=	DOCS
> 
> post-patch:
>+	@${REINPLACE_CMD} '/^LDFLAGS =/s/$$/ -pthread/' ${WRKSRC}/src/Makefile.bsd
> 	@${REINPLACE_CMD} -e \
> 		's/int Filter_File( struct dirent/int Filter_File( const struct dirent/' \
> 		${WRKSRC}/src/files.cpp
>Index: games/belooted/Makefile
>===================================================================
>--- games/belooted/Makefile	(revision 365596)
>+++ games/belooted/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	belooted
> PORTVERSION=	0.1.4.1
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	games
> MASTER_SITES=	http://boby.joe.free.fr/dev/belooted/files/ \
> 		LOCAL/martymac
>@@ -12,18 +12,16 @@ MAINTAINER=	martymac@FreeBSD.org
> COMMENT=	Popular 32-card trick-taking game played in France
> 
> LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		gmake pkgconfig desktop-file-utils
>+USES=		gmake pkgconfig
> USE_GNOME=	gtk20
> GNU_CONFIGURE=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
>-
>-post-install:
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
>+post-patch:
>+	@${REINPLACE_CMD} '/^LIBS =/s/$$/ -lm/' ${WRKSRC}/src/Makefile.in
> 
> .include <bsd.port.mk>
>Index: games/belooted/pkg-plist
>===================================================================
>--- games/belooted/pkg-plist	(revision 365596)
>+++ games/belooted/pkg-plist	(working copy)
>@@ -42,5 +42,3 @@ share/pixmaps/belooted/icon-spade.xpm
> share/pixmaps/belooted/icon-none.xpm
> @dirrm share/pixmaps/belooted
> share/pixmaps/belooted.png
>-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
>-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
>Index: games/bitefusion/Makefile
>===================================================================
>--- games/bitefusion/Makefile	(revision 365596)
>+++ games/bitefusion/Makefile	(working copy)
>@@ -15,7 +15,7 @@ GNU_CONFIGURE=	yes
> USES=		gmake
> USE_SDL=	sdl
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
>+LIBS+=		-L${LOCALBASE}/lib -lm
> 
> PLIST_FILES=	bin/bitefusion
> 
>Index: games/blokish/Makefile
>===================================================================
>--- games/blokish/Makefile	(revision 365596)
>+++ games/blokish/Makefile	(working copy)
>@@ -29,5 +29,6 @@ PLIST_FILES=	bin/blokish
> post-patch:
> 	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|' \
> 		${WRKSRC}/makefile.in ${WRKSRC}/configure
>+	@${REINPLACE_CMD} '/^LIBS =/s/$$/ -lGL/' ${WRKSRC}/makefile.in
> 
> .include <bsd.port.mk>
>Index: games/bomberclone/Makefile
>===================================================================
>--- games/bomberclone/Makefile	(revision 365596)
>+++ games/bomberclone/Makefile	(working copy)
>@@ -16,8 +16,8 @@ USES=		gmake
> USE_SDL=	image mixer sdl
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--target="" --disable-werror
>-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
>-CXXFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib -lm
> 
> PORTDOCS=	AUTHORS ChangeLog README TODO
> 
>Index: games/caph/Makefile
>===================================================================
>--- games/caph/Makefile	(revision 365596)
>+++ games/caph/Makefile	(working copy)
>@@ -42,7 +42,7 @@ CFLAGS+=	-O3 -ffast-math
> 
> do-build:
> 	cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} -o caph -I../include *.c \
>-		`${SDL_CONFIG} --libs --cflags` -D_OPENGL -lGL -lpng ${ICONV_LIB}
>+		`${SDL_CONFIG} --libs --cflags` -D_OPENGL -lGL -lpng -lm ${ICONV_LIB}
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|../share/caph|${DATADIR}|' ${BUILD_WRKSRC}/caph.c
>Index: games/construo/Makefile
>===================================================================
>--- games/construo/Makefile	(revision 365596)
>+++ games/construo/Makefile	(working copy)
>@@ -16,7 +16,7 @@ USE_XORG=	sm ice x11 xext xxf86vm
> USE_GL=		gl glu
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib -lGLU
>+LIBS+=		-L${LOCALBASE}/lib
> CONFIGURE_ARGS=	--bindir=${PREFIX}/bin --datadir=${DATADIR}
> 
> PLIST_FILES=	bin/${PORTNAME} bin/${PORTNAME}.x11
>@@ -41,7 +41,10 @@ PLIST_FILES+=	bin/${PORTNAME}.glut
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} 's|bindir = .*|bindir = @bindir@|' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} \
>+		-e 's|bindir = .*|bindir = @bindir@|' \
>+		-e '/^construo_glut_LDADD =/s/$$/ -lGLU -lGL/' \
>+		${WRKSRC}/Makefile.in
> 	@${REINPLACE_CMD} 's|pkgdatadir = .*|pkgdatadir = @datadir@/examples|' ${WRKSRC}/examples/Makefile.in
> 	@${REINPLACE_CMD} '/stream/!s/std:://' ${WRKSRC}/vector.cxx
> 	@${REINPLACE_CMD} 's|^$#define CONSTRUO_DATADIR DATADIR$.*|\1|' ${WRKSRC}/construo.hxx
>Index: games/d2x-xl/Makefile
>===================================================================
>--- games/d2x-xl/Makefile	(revision 365596)
>+++ games/d2x-xl/Makefile	(working copy)
>@@ -56,6 +56,7 @@ do-extract:
> 		${CHMOD} +x configure
> 
> post-patch:
>+	@${ECHO_CMD} 'CCLD = $$(CXX)' >> ${WRKSRC}/Makefile.am
> 	@${REINPLACE_CMD} -e '/FLAGS/ s|-O3||; /FLAGS/ s|-g||' \
> 		${WRKSRC}/configure.ac
> 	@cd ${WRKSRC} && \
>Index: games/defendguin/Makefile
>===================================================================
>--- games/defendguin/Makefile	(revision 365596)
>+++ games/defendguin/Makefile	(working copy)
>@@ -30,7 +30,7 @@ DESKTOP_ENTRIES="Defendguin" "" "${PORTN
> do-build:
> 	cd ${WRKSRC} && ${CC} ${CFLAGS} -DDATA_PREFIX=\"${DATADIR}/\" \
> 		`${SDL_CONFIG} --cflags` defendguin.c -o defendguin \
>-		`${SDL_CONFIG} --libs` -lSDL_mixer
>+		`${SDL_CONFIG} --libs` -lSDL_mixer -lm
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
>Index: games/egoboo/files/patch-game-Makefile.unix
>===================================================================
>--- games/egoboo/files/patch-game-Makefile.unix	(revision 365596)
>+++ games/egoboo/files/patch-game-Makefile.unix	(working copy)
>@@ -23,7 +23,7 @@
> -LDFLAGS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lSDL_image -lGL -lGLU
> +INC     := -I. -I.. ${SDLCONF_I} -I${LOCALBASE}/include
> +CFLAGS  += ${INC}
>-+LDFLAGS := ${SDLCONF_L} -L${LOCALBASE}/lib -lSDL_ttf -lSDL_mixer -lSDL_image -lGL -lGLU
>++LDFLAGS := ${SDLCONF_L} -L${LOCALBASE}/lib -lSDL_ttf -lSDL_mixer -lSDL_image -lGL -lGLU -lm
>  
>  EGO_BIN := egoboo
>  
>Index: games/frogatto/Makefile
>===================================================================
>--- games/frogatto/Makefile	(revision 365596)
>+++ games/frogatto/Makefile	(working copy)
>@@ -27,9 +27,7 @@ USE_SDL=	sdl image mixer ttf
> PLIST_FILES=	bin/${PORTNAME} bin/${PORTNAME}-server
> 
> post-patch:
>-	@${REINPLACE_CMD} -e \
>-		's|-lpthread|${PTHREAD_LIBS}|g ; \
>-		s|-Werror||' ${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/Makefile
> 	@${REINPLACE_CMD} -e 's,%lu,%u,' ${WRKSRC}/src/server.cpp
> 	@${REINPLACE_CMD} -e 's,__linux__,__${OPSYS}__,' \
> 		${WRKSRC}/src/clipboard.cpp
>Index: games/frogatto/files/patch-Makefile
>===================================================================
>--- games/frogatto/files/patch-Makefile	(revision 365596)
>+++ games/frogatto/files/patch-Makefile	(working copy)
>@@ -23,7 +23,7 @@
>  # Linker library options.
>  LIBS := $(shell pkg-config --libs x11 ) -lSDLmain \
> -	$(shell pkg-config --libs sdl glu glew SDL_image libpng zlib) -lSDL_ttf -lSDL_mixer
>-+	$(shell pkg-config --libs sdl glu glew SDL_image libpng) -lSDL_ttf -lSDL_mixer
>++	$(shell pkg-config --libs sdl glu glew SDL_image libpng) -lz -lSDL_ttf -lSDL_mixer
>  
>  include Makefile.common
>  
>Index: games/gillo/Makefile
>===================================================================
>--- games/gillo/Makefile	(revision 365596)
>+++ games/gillo/Makefile	(working copy)
>@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${JAM}:${PORTSDIR}/devel/
> WRKSRC=		${WRKDIR}/${PORTNAME}
> 
> USES=		tar:bzip2
>-USE_GL=		gl
>+USE_GL=		glu
> USE_SDL=	yes
> 
> JAM?=		${LOCALBASE}/bin/jam
>Index: games/gillo/files/patch-src_Jamfile
>===================================================================
>--- games/gillo/files/patch-src_Jamfile	(revision 365596)
>+++ games/gillo/files/patch-src_Jamfile	(working copy)
>@@ -5,6 +5,6 @@
>  Main gillo3 : camera.cpp cameraball.cpp cameratrack.cpp car.cpp context.cpp cube.cpp entity.cpp event.cpp field.cpp game.cpp goal.cpp goalkeeper.cpp img.cpp main.cpp menu.cpp omnicar.cpp overlay.cpp player.cpp pwrup.cpp rect.cpp simpleball.cpp sound.cpp video.cpp viewport.cpp prefix.c iballpicker.cpp ;
>  
> -LINKLIBS on gillo3 =  -lpthread -lGL -lGLU -lSDL -lode -lplibssgaux -lplibssg -lplibsg -lplibul -lplibsl ;
>-+LINKLIBS on gillo3 =  -lGL -lGLU -lode -lplibssgaux -lplibssg -lplibsg -lplibul -lplibsl -L$(LOCALBASE)/lib %%SDL_LDFLAGS%% ;
>++LINKLIBS on gillo3 =  -lpthread -lGL -lGLU -lode -lplibssgaux -lplibssg -lplibsg -lplibul -lplibsl -L$(LOCALBASE)/lib %%SDL_LDFLAGS%% -lm ;
>  
>  InstallBin $(BINDIR) : gillo3$(SUFEXE) ;
>Index: games/gnomebreakout/Makefile
>===================================================================
>--- games/gnomebreakout/Makefile	(revision 365596)
>+++ games/gnomebreakout/Makefile	(working copy)
>@@ -14,11 +14,12 @@ COMMENT=	GNOME version of the classic br
> 
> USES=		pathfix pkgconfig
> USE_GNOME=	gnomeprefix libgnomeui
>+USE_XORG=	x11
> GNU_CONFIGURE=	yes
> USE_GCC=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib -lm
>+LIBS+=		-L${LOCALBASE}/lib -lX11 -lm
> 
> PORTDOCS=	AUTHORS ChangeLog NEWS README
> 
>Index: games/gnurobbo/Makefile
>===================================================================
>--- games/gnurobbo/Makefile	(revision 365596)
>+++ games/gnurobbo/Makefile	(working copy)
>@@ -27,6 +27,7 @@ OPTIONS_DEFINE=	DOCS
> post-patch:
> 	@${REINPLACE_CMD} -e '/define DEBUG_DUMP_VM_USAGE/ d' ${WRKSRC}/game.c
> 	@${REINPLACE_CMD} -e '/^install:/,$$ s|$$([A-Z_]*DIR)|${STAGEDIR}&| g' \
>+		-e '/^LIBS=/s/$$/ -lm/' \
> 		${WRKSRC}/Makefile
> 
> post-install:
>Index: games/goonies/Makefile
>===================================================================
>--- games/goonies/Makefile	(revision 365596)
>+++ games/goonies/Makefile	(working copy)
>@@ -18,6 +18,7 @@ USE_GL=		yes
> 
> BUILD_WRKSRC=	${WRKSRC}/src
> MAKEFILE=	../build/linux/Makefile
>+MAKE_ARGS=	CC="${CXX}"
> MAKE_ENV=	DATADIR="${DATADIR}"
> 
> PLIST_FILES=	bin/${PORTNAME}
>Index: games/goonies/files/patch-build-linux-Makefile
>===================================================================
>--- games/goonies/files/patch-build-linux-Makefile	(revision 365596)
>+++ games/goonies/files/patch-build-linux-Makefile	(working copy)
>@@ -15,7 +15,7 @@
> -LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lGL -lGLU
> +CC ?= c++
> +CFLAGS += -Wall `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
>-+LDFLAGS += `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lGL -lGLU
>++LDFLAGS += `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lGL -lGLU -lm
>  RM = rm -f
>  CP = cp -r
>  LN = ln -s
>Index: games/holotz-castle/files/patch-src__Makefile
>===================================================================
>--- games/holotz-castle/files/patch-src__Makefile	(revision 365596)
>+++ games/holotz-castle/files/patch-src__Makefile	(working copy)
>@@ -20,7 +20,7 @@
> -CFLAGS=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags` -I/usr/local/include/ -I/usr/local/include/SDL -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c
> -LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
> +CXXFLAGS+=-I. -I../JLib `$(SDL_CONFIG) --cflags` -Wall -Wshadow -c
>-+LDFLAGS=-L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
>++LDFLAGS=-L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs` -lz
>  
>  
>  JLib: 
>Index: games/lianliankan/Makefile
>===================================================================
>--- games/lianliankan/Makefile	(revision 365596)
>+++ games/lianliankan/Makefile	(working copy)
>@@ -15,14 +15,13 @@ LICENSE=	GPLv3
> 
> USES=		libtool pkgconfig
> USE_GNOME=	gtk20 esound
>-USE_AUTOTOOLS=	aclocal automake autoconf libtoolize
>+USE_AUTOTOOLS=	aclocal automake autoconf autoheader libtoolize
> GNU_CONFIGURE=	yes
> 
>-AUTOMAKE_ARGS=	--add-missing --copy
>-ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
>+AUTOMAKE_ARGS=	-a -c -f
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib
> 
> DATADIR=	${PREFIX}/share/llk_linux
> 
>Index: games/lianliankan/files/patch-src__Makefile.am
>===================================================================
>--- games/lianliankan/files/patch-src__Makefile.am	(revision 365596)
>+++ games/lianliankan/files/patch-src__Makefile.am	(working copy)
>@@ -1,22 +1,26 @@
> --- ./src/Makefile.am.orig	2006-01-01 16:53:12.000000000 +0100
> +++ ./src/Makefile.am	2013-12-27 10:51:14.000000000 +0100
>-@@ -9,8 +9,7 @@
>+@@ -8,11 +8,6 @@
>+ 	$(PACKAGE_CFLAGS)\
>  	 -I../ -I../include
>  
>- AM_CFLAGS =\
>+-AM_CFLAGS =\
> -	`pkg-config --cflags --libs gtk+-2.0`\
> -	 -Wall\
>-+	`pkg-config --cflags gtk+-2.0`\
>- 	 -g
>- 
>+-	 -g
>+-
>  bin_PROGRAMS = llk_linux
>-@@ -26,7 +25,8 @@
>+ 
>+ llk_linux_SOURCES = \
>+@@ -25,10 +20,7 @@
>+ 	eggtrayicon.c\
>  	tray.c
>  
>- llk_linux_LDFLAGS = \
>+-llk_linux_LDFLAGS = \
> -	-lesd
>-+	-lesd \
>-+	`pkg-config --libs gtk+-2.0`
>- 
>+-
>  llk_linux_LDADD =  \
>  	$(PACKAGE_LIBS)\
>+-	 -lc -lesd
>++	 -lX11 -lesd
>+ 
>Index: games/liquidwar/files/patch-src-Makefile.in
>===================================================================
>--- games/liquidwar/files/patch-src-Makefile.in	(revision 0)
>+++ games/liquidwar/files/patch-src-Makefile.in	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/Makefile.in.orig
>++++ src/Makefile.in
>+@@ -250,7 +250,7 @@
>+ 
>+ liquidwar-mapgen: $(OBJ_FILES_MAPGEN)
>+ 	@echo "Linking $@ (target=$(TARGET), debug=$(DEBUG), static=$(STATIC))"
>+-	@$(CC) $(LDFLAGS) $(LINK_OPTIONS) -o $@ $(OBJ_FILES_MAPGEN) $(PTHREAD) $(EXTERN_LIBS) 
>++	@$(CC) $(LDFLAGS) $(LINK_OPTIONS) -o $@ $(OBJ_FILES_MAPGEN) $(PTHREAD) $(EXTERN_LIBS) -lm
>+ 
>+ dep:
>+ 	@find . \
>
>Property changes on: games/liquidwar/files/patch-src-Makefile.in
>___________________________________________________________________
>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: games/lucidlife/Makefile
>===================================================================
>--- games/lucidlife/Makefile	(revision 365596)
>+++ games/lucidlife/Makefile	(working copy)
>@@ -12,8 +12,12 @@ COMMENT=	GTK2 implementation of Conway's
> 
> USES=		gmake pkgconfig
> USE_GNOME=	gtk20 gnomevfs2 intlhack
>+USE_XORG=	x11
> GNU_CONFIGURE=	yes
> 
> OPTIONS_DEFINE=	DOCS
> 
>+post-patch:
>+	@${REINPLACE_CMD} '/^GNOME_MODULES=/s/"$$/ x11"/' ${WRKSRC}/configure
>+
> .include <bsd.port.mk>
>Index: games/luola/Makefile
>===================================================================
>--- games/luola/Makefile	(revision 365596)
>+++ games/luola/Makefile	(working copy)
>@@ -18,6 +18,7 @@ GNU_CONFIGURE=	yes
> USES=		gmake
> USE_SDL=	sdl image ttf
> CONFIGURE_ARGS=	--program-prefix=''
>+LIBS+=		-lm
> 
> PLIST_FILES=	bin/${PORTNAME} \
> 		share/pixmaps/${PORTNAME}.png
>Index: games/macopix/Makefile
>===================================================================
>--- games/macopix/Makefile	(revision 365596)
>+++ games/macopix/Makefile	(working copy)
>@@ -29,12 +29,12 @@ RESTRICTED_FILES=	\
> 		macopix-mascot-marimite-euc-ja-2.20.tar.gz \
> 		macopix-mascot-HxB-euc-ja-0.30.tar.gz
> 
>-WANT_GNOME=	yes
>-USES=		gettext gmake iconv pkgconfig
>+USES=		gettext gmake iconv libtool pkgconfig
>+USE_XORG=	x11
> GNU_CONFIGURE=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
>+LIBS+=		-L${LOCALBASE}/lib -lX11 ${ICONV_LIB}
> 
> OPTIONS_DEFINE=	DOCS GNUTLS GTK1
> 
>Index: games/meritous/files/patch-Makefile
>===================================================================
>--- games/meritous/files/patch-Makefile	(revision 365596)
>+++ games/meritous/files/patch-Makefile	(working copy)
>@@ -6,7 +6,7 @@
>  #
> -LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lz
> -CCFLAGS = -O2 -Wall `sdl-config --cflags` -g
>-+LDFLAGS = `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz
>++LDFLAGS = `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lm
> +CCFLAGS = ${CFLAGS} -Wall `${SDL_CONFIG} --cflags`
>  #
>  OBJS = 	src/levelblit.o \
>Index: games/monkeybubble/Makefile
>===================================================================
>--- games/monkeybubble/Makefile	(revision 365596)
>+++ games/monkeybubble/Makefile	(working copy)
>@@ -13,13 +13,13 @@ COMMENT=	GTK2 Puzzle Bobble clone with m
> 
> LICENSE=	GPLv2
> 
>-USES=		pathfix gmake pkgconfig
>+USES=		gmake libtool pathfix pkgconfig
> USE_GNOME=	gnomedocutils gnomeprefix intlhack \
> 		librsvg2 libgnomeui
> USE_GSTREAMER=	yes
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lm
> INSTALLS_OMF=	yes
> 
> GCONF_SCHEMAS=	monkey-bubble.schemas
>Index: games/motogt/Makefile
>===================================================================
>--- games/motogt/Makefile	(revision 365596)
>+++ games/motogt/Makefile	(working copy)
>@@ -21,14 +21,14 @@ LICENSE_PERMS_CCbySA=	dist-mirror dist-s
> LICENSE_FILE_CCbySA=	${WRKSRC}/doc/cc-by-sa.txt
> 
> USES=		zip
>+USE_GL=		gl
> BUILD_WRKSRC=	${WRKSRC}/src
> MAKEFILE=	Makefile.lnx
> MAKE_JOBS_UNSAFE=	yes
> CFLAGS+=	-I${LOCALBASE}/include/libpng15
>-MAKE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
> SUB_FILES=	motogt
> CXXFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
>+LDFLAGS+=	-L${LOCALBASE}/lib
> 
> PLIST_FILES=	bin/${PORTNAME} libexec/MotoGT.bin
> PORTDATA=	*
>Index: games/motogt/files/patch-src-Makefile.lnx
>===================================================================
>--- games/motogt/files/patch-src-Makefile.lnx	(revision 365596)
>+++ games/motogt/files/patch-src-Makefile.lnx	(working copy)
>@@ -8,7 +8,7 @@
> -TEMP_DIR=../tmp-lnx
> +CXX?=		g++
> +CXXFLAGS?=	-O2 -ffast-math
>-+LIBS=		-lpng -lsfml-window -lsfml-graphics -lsfml-system -lsfml-audio
>++LIBS=		-lpng -lsfml-window -lsfml-graphics -lsfml-system -lsfml-audio -lGL
> +LDFLAGS?=	-s
> +TEMP_DIR=	../tmp-lnx
>  
>Index: games/naev/Makefile
>===================================================================
>--- games/naev/Makefile	(revision 365596)
>+++ games/naev/Makefile	(working copy)
>@@ -26,7 +26,7 @@ USE_SDL=	sdl image
> 
> CONFIGURE_ARGS=	--with-ndata-path=${DATADIR}/ndata-${PORTVERSION}
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lm
> 
> PLIST_FILES=	bin/${PORTNAME} man/man6/naev.6.gz
> SUB_FILES=	pkg-message
>Index: games/neverball/Makefile
>===================================================================
>--- games/neverball/Makefile	(revision 365596)
>+++ games/neverball/Makefile	(working copy)
>@@ -27,8 +27,6 @@ USE_XORG=	x11
> PORTDOCS=	CHANGES COPYING README
> PORTDATA=	*
> 
>-LDFLAGS+=	-lX11 # calls X functions directly, but doesn't link libX11
>-
> OPTIONS_DEFINE=	DOCS NLS
> 
> .include <bsd.port.options.mk>
>Index: games/neverball/files/patch-Makefile
>===================================================================
>--- games/neverball/files/patch-Makefile	(revision 365596)
>+++ games/neverball/files/patch-Makefile	(working copy)
>@@ -16,7 +16,7 @@
>  endif
>  
> +ifdef FREEBSD
>-+    BASE_LIBS += -L%%LOCALBASE%%/lib
>++    BASE_LIBS += -L%%LOCALBASE%%/lib -lX11 -lm
> +
> +    ifneq ($(ENABLE_NLS),0)
> +        INTL_LIBS := -lintl %%ICONV_LIB%%
>Index: games/noegnud-littlehack/files/noegnud-littlehack.patch
>===================================================================
>--- games/noegnud-littlehack/files/noegnud-littlehack.patch	(revision 365596)
>+++ games/noegnud-littlehack/files/noegnud-littlehack.patch	(working copy)
>@@ -73,7 +73,7 @@ diff -urN variants/littlehack-0.0.1.orig
> +CFLAGS += $(STD_CFLAGS)
>  
> -LFLAGS = -L/usr/X11R6/lib
>-+LFLAGS = -L${LOCALBASE}/lib -lgnuregex
>++LFLAGS = -L${LOCALBASE}/lib -lgnuregex -lm
>  
>  #   OR compile backwards compatible a.out format
>  # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
>Index: games/noegnud-nethack/files/noegnud-nethack.patch
>===================================================================
>--- games/noegnud-nethack/files/noegnud-nethack.patch	(revision 365596)
>+++ games/noegnud-nethack/files/noegnud-nethack.patch	(working copy)
>@@ -73,7 +73,7 @@ diff -urN variants/nethack-3.4.3.orig/sy
> +CFLAGS += $(STD_CFLAGS)
>  
> -LFLAGS = -L/usr/X11R6/lib
>-+LFLAGS = -L${LOCALBASE}/lib -lgnuregex
>++LFLAGS = -L${LOCALBASE}/lib -lgnuregex -lm
>  
>  #   OR compile backwards compatible a.out format
>  # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
>Index: games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch
>===================================================================
>--- games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch	(revision 365596)
>+++ games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch	(working copy)
>@@ -82,7 +82,7 @@ diff -urN variants/nethack-3.4.2-deet.or
> +CFLAGS += $(STD_CFLAGS)
>  
> -LFLAGS = -L/usr/X11R6/lib
>-+LFLAGS = -L${LOCALBASE}/lib -lgnuregex
>++LFLAGS = -L${LOCALBASE}/lib -lgnuregex -lm
>  
>  #   OR compile backwards compatible a.out format
>  # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
>Index: games/noegnud-slashem/files/noegnud-slashem.patch
>===================================================================
>--- games/noegnud-slashem/files/noegnud-slashem.patch	(revision 365596)
>+++ games/noegnud-slashem/files/noegnud-slashem.patch	(working copy)
>@@ -54,7 +54,7 @@ diff -urN variants/slashem-0.0.6E4F8.ori
>  
>  WINNOEGNUDCFLAGS = 
> -WINNOEGNUDLIB = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU
>-+WINNOEGNUDLIB = `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -lgnuregex
>++WINNOEGNUDLIB = `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -lgnuregex -lm
> +
> +.c.o:
> +	${CC} ${CFLAGS} -c $< -o $@
>Index: games/nuclearchess/Makefile
>===================================================================
>--- games/nuclearchess/Makefile	(revision 365596)
>+++ games/nuclearchess/Makefile	(working copy)
>@@ -28,6 +28,10 @@ OPTIONS_DEFINE=	DOCS
> DESKTOP_ENTRIES="NuclearChess" "" "${PORTNAME}" \
> 		"${PORTNAME}" "Game;BoardGame;" ""
> 
>+post-patch:
>+	@${REINPLACE_CMD} '/^nuclearchess_LDADD =/s/$$/ -lm/' \
>+		${WRKSRC}/src/Makefile.in
>+
> post-install:
> 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
> 		${STAGEDIR}${PREFIX}/share/pixmaps/
>Index: games/openjazz/files/patch-Makefile
>===================================================================
>--- games/openjazz/files/patch-Makefile	(revision 365596)
>+++ games/openjazz/files/patch-Makefile	(working copy)
>@@ -5,11 +5,11 @@
>  
>  OpenJazz: $(objects)
> -	cc -Wall -o OpenJazz -lSDL -lstdc++ -lz $(objects)
>-+	${CC} ${LDFLAGS} -Wall -o OpenJazz -lstdc++ -lz $(objects)
>++	${CXX} ${LDFLAGS} -Wall -o OpenJazz $(objects) -lz -lm
>  
>  %.o: %.cpp
> -	cc -Wall -DUSE_SOCKETS -DSCALE -Isrc -O2 -c $< -o $@
>-+	${CC} ${CPPFLAGS} ${CFLAGS} -Wall -DUSE_SOCKETS -DSCALE -Isrc -c $< -o $@
>++	${CXX} ${CPPFLAGS} ${CFLAGS} -Wall -DUSE_SOCKETS -DSCALE -Isrc -c $< -o $@
>  
>  clean:
>  	rm -f OpenJazz $(objects)
>Index: games/pacmanarena/Makefile
>===================================================================
>--- games/pacmanarena/Makefile	(revision 365596)
>+++ games/pacmanarena/Makefile	(working copy)
>@@ -22,6 +22,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME:S/arena//}
> 
> USE_SDL=	mixer net sdl
> GNU_CONFIGURE=	yes
>+LDFLAGS+=	-lm
> 
> PORTDOCS=	README
> OPTIONS_DEFINE=	DOCS
>Index: games/phlipple/Makefile
>===================================================================
>--- games/phlipple/Makefile	(revision 365596)
>+++ games/phlipple/Makefile	(working copy)
>@@ -19,7 +19,7 @@ USE_SDL=	sdl mixer image
> USE_GL=		gl glu
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lm
> 
> PLIST_FILES=	bin/${PORTNAME} \
> 		share/applications/${PORTNAME}.desktop \
>Index: games/powermanga/Makefile
>===================================================================
>--- games/powermanga/Makefile	(revision 365596)
>+++ games/powermanga/Makefile	(working copy)
>@@ -21,12 +21,13 @@ USE_XORG=	xext xxf86dga
> USE_SDL=	sdl mixer
> GNU_CONFIGURE=	yes
> USE_AUTOTOOLS=	aclocal automake autoconf autoheader
>+AUTOMAKE_ARGS=	-a -c -f --foreign
> 
> PORTDOCS=	*
> PORTDATA=	*
> 
> CFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lm
> 
> .include <bsd.port.options.mk>
> 
>@@ -43,9 +44,6 @@ post-patch:
> 		${WRKSRC}/src/tools.c
> 	@${REINPLACE_CMD} -e 's|Lang=fr|Lang=en|' ${WRKSRC}/texts/config.ini
> 
>-run-autotools:
>-	cd ${WRKSRC} && ${SH} ./bootstrap
>-
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/powermanga.desktop ${STAGEDIR}${PREFIX}/share/applications/
> 	${INSTALL_DATA} ${WRKSRC}/powermanga.xpm ${STAGEDIR}${PREFIX}/share/pixmaps/
>Index: games/simplevaders/Makefile
>===================================================================
>--- games/simplevaders/Makefile	(revision 365596)
>+++ games/simplevaders/Makefile	(working copy)
>@@ -27,9 +27,9 @@ post-patch:
> 	@${RM} ${WRKSRC}/data/*\~
> 
> do-build:
>-	cd ${WRKSRC} && ${CC} ${CFLAGS} main.cpp -o ${PORTNAME} \
>-		`${SDL_CONFIG} --cflags --libs` -lSDL_ttf -lSDL_mixer \
>-		-lSDL_image -lGL -lGLU
>+	(cd ${WRKSRC} && ${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} main.cpp \
>+		-o ${PORTNAME} `${SDL_CONFIG} --cflags --libs` -lSDL_ttf \
>+		-lSDL_mixer -lSDL_image -lGL -lGLU)
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
>Index: games/thevalley/Makefile
>===================================================================
>--- games/thevalley/Makefile	(revision 365596)
>+++ games/thevalley/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	thevalley
> PORTVERSION=	0.98
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	games
> MASTER_SITES=	http://www.autismuk.freeserve.co.uk/
> DISTNAME=	valley-${PORTVERSION}
>@@ -11,21 +11,14 @@ DISTNAME=	valley-${PORTVERSION}
> MAINTAINER=	edwin@mavetju.org
> COMMENT=	The Valley is a rewrite of an old RPG from the early 1980s
> 
>-USE_AUTOTOOLS=	libtoolize
> GNU_CONFIGURE=	yes
> WRKSRC=		${WRKDIR}/${DISTNAME}
> USE_SDL=	sdl
> USES=		libtool perl5
> USE_PERL5=	build
>-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
>-CXXFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
>+CXXFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib -lm
> 
> PLIST_FILES=	bin/valley
> 
>-post-configure:
>-	${REINPLACE_CMD} \
>-		-e 's,^LIBTOOL =.*,LIBTOOL= $$(SHELL) ${LIBTOOL} --silent,' \
>-		-e 's,^transform =.*,transform = s\,^\,\,,' \
>-		${WRKSRC}/valley/Makefile
>-
> .include <bsd.port.mk>
>Index: games/viruskiller/Makefile
>===================================================================
>--- games/viruskiller/Makefile	(revision 365596)
>+++ games/viruskiller/Makefile	(working copy)
>@@ -31,6 +31,7 @@ post-patch:
> 		 /^DOCDIR/s|=.*|= $$(DESTDIR)$$(PREFIX)/${DOCSDIR_REL}/| ; \
> 		 /^ICONDIR/s|=.*|= $$(DESTDIR)$$(PREFIX)/share/icons/hicolor/| ; \
> 		 /^DESKTOPDIR/s|=.*|= $$(DESTDIR)$$(PREFIX)/share/applications/| ; \
>+		 /^LIBS =/s|$$| -lz| ; \
> 		 s|install .* 755|$${BSD_INSTALL_PROGRAM}| ; \
> 		 s|install .* 644|$${BSD_INSTALL_DATA}| ; \
> 		 /ICONS/s|cp|$${BSD_INSTALL_DATA}|' ${WRKSRC}/makefile
>Index: games/volleyball/Makefile
>===================================================================
>--- games/volleyball/Makefile	(revision 365596)
>+++ games/volleyball/Makefile	(working copy)
>@@ -13,11 +13,12 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
> MAINTAINER=	amdmi3@FreeBSD.org
> COMMENT=	Game similar to GNU Arcade Volleyball
> 
>+USES=		gmake
> USE_SDL=	sdl image mixer
> GNU_CONFIGURE=	yes
>-USES=		gettext gmake
>-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
> CONFIGURE_ARGS=	--mandir="${MANPREFIX}/man" --disable-nls # strangeness in nls support
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib -lm
> 
> PLIST_FILES=	bin/${PORTNAME} \
> 		man/man6/volleyball.6.gz
>@@ -33,6 +34,11 @@ DESKTOP_ENTRIES="Pocket Volleyball" \
> 		"Game;SportsGame;ArcadeGame;" \
> 		false
> 
>+post-patch:
>+	@${REINPLACE_CMD} '/libintl\.h/d' ${WRKSRC}/src/common.h
>+	@${REINPLACE_CMD} -e '/setlocale/d' -e '/textdomain/d' \
>+		${WRKSRC}/src/volleyball.c
>+
> post-configure:
> 	cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION} && \
> 		${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
>Index: games/vor/Makefile
>===================================================================
>--- games/vor/Makefile	(revision 365596)
>+++ games/vor/Makefile	(working copy)
>@@ -14,6 +14,7 @@ COMMENT=	Dodge the rocks until you die
> USES=		tar:bzip2 gmake
> USE_SDL=	mixer image sdl
> GNU_CONFIGURE=	yes
>+LDFLAGS+=	-lm
> 
> PLIST_FILES=	bin/${PORTNAME}
> PORTDOCS=	*
>Index: games/wargus/Makefile
>===================================================================
>--- games/wargus/Makefile	(revision 365596)
>+++ games/wargus/Makefile	(working copy)
>@@ -23,8 +23,16 @@ USE_GNOME=	gtk20
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> SUB_FILES=	${PORTNAME} pkg-message
> 
>-MAKE_ARGS+=	CFLAGS+="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15" LDFLAGS+=-L${LOCALBASE}/lib
>+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
>+LDFLAGS+=	-L${LOCALBASE}/lib
> 
>+post-patch:
>+	@${REINPLACE_CMD} \
>+		-e '/^CFLAGS/s|-O2|${CPPFLAGS} ${CFLAGS}|' \
>+		-e '/^CXXFLAGS/s|$$| ${CXXFLAGS}|' \
>+		-e '/^LDFLAGS/s|$$| ${LDFLAGS}|' \
>+		-e '/^GTKFLAGS/s/gtk+-2.0/& x11/' \
>+		${WRKSRC}/Makefile
> do-install:
> 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
> 	cd ${WRKSRC} && ${COPYTREE_SHARE} "campaigns contrib maps scripts" ${STAGEDIR}${DATADIR}
>Index: graphics/cfdg/files/patch-Makefile
>===================================================================
>--- graphics/cfdg/files/patch-Makefile	(revision 365596)
>+++ graphics/cfdg/files/patch-Makefile	(working copy)
>@@ -5,7 +5,7 @@
>  
>  cfdg: $(OBJS)
> -	$(LINK.o) $^ -L/usr/local/lib -lstdc++ -lpng -lz -fexceptions -o $@
>-+	$(LINK.o) $^ $(shell libpng-config --ldflags) -lstdc++ -fexceptions -o $@
>++	$(CXX) $^ $(shell libpng-config --ldflags) -lm -fexceptions -o $@
>  	strip $@
>  
>  
>Index: graphics/cinepaint/Makefile
>===================================================================
>--- graphics/cinepaint/Makefile	(revision 365596)
>+++ graphics/cinepaint/Makefile	(working copy)
>@@ -31,7 +31,6 @@ USE_GNOME=	gtk20
> USE_GHOSTSCRIPT_RUN=yes
> USE_PYTHON=	yes
> USE_AUTOTOOLS=	libtoolize aclocal automake autoconf
>-LIBTOOLIZE_ARGS=--force
> ACLOCAL_ARGS=	-I aclocal
> AUTOMAKE_ARGS=	--copy --force-missing --foreign --add-missing
> USE_LDCONFIG=	yes
>Index: graphics/cinepaint/files/patch-app__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-app__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-app__Makefile.am	(working copy)
>@@ -1,12 +1,18 @@
> --- app/Makefile.am.orig
> +++ app/Makefile.am
>-@@ -420,7 +420,8 @@
>+@@ -420,11 +420,14 @@
>  	$(GTK_LIBS) \
>  	$(X_LIBS) \
>  	$(OYRANOS_LIBS) \
> -	$(LCMS_LIB)
> +	$(LCMS_LIB) \
>++	-lX11 \
> +	-lm
>  
>  cinepaint_remote_LDADD = \
>  	$(GTK_LIBS) \
>+ 	$(X_LIBS) \
>++	-lX11 \
>+ 	$(XMU_LIB)
>+ 
>+ ## DEPS = $(top_builddir)/lib/libcinepainti.a
>Index: graphics/cinepaint/files/patch-app__menus.c
>===================================================================
>--- graphics/cinepaint/files/patch-app__menus.c	(revision 365596)
>+++ graphics/cinepaint/files/patch-app__menus.c	(working copy)
>@@ -1,25 +0,0 @@
>---- app/menus.c.orig
>-+++ app/menus.c
>-@@ -1597,7 +1597,7 @@
>- char*
>- menu_entry_translate (const char* entry)
>- {
>--  char *text = (char*) calloc (1024, sizeof(char)),
>-+  char *text = (char*) calloc (sizeof(char), 1024),
>-        *word = 0;
>-   const char *tmp = 0;
>- 
>-@@ -1647,11 +1647,11 @@
>-   // resize memory
>-   if(strlen(text))
>-   {
>--    word = (char*) calloc( strlen(text) + 1, sizeof(char) );
>-+    word = (char*) calloc( sizeof(char), strlen(text) + 4 );
>-     memcpy( word, text, strlen( text ) + 1 );
>-     free (text);
>-     return word;
>-   }
>-   else
>--    return (char*) calloc(1,sizeof(char));
>-+    return (char*) calloc(sizeof(char),1);
>- }
>Index: graphics/cinepaint/files/patch-lib__fl_i18n__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-lib__fl_i18n__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-lib__fl_i18n__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- lib/fl_i18n/Makefile.am.orig
>-+++ lib/fl_i18n/Makefile.am
>-@@ -26,8 +26,7 @@
>- 	-I$(top_srcdir) -I$(includedir)
>- 
>- libcinepaint_fl_i18n_la_LIBADD = \
>--	$(FLTK_LIBS_PURE) \
>--	-lc
>-+	$(FLTK_LIBS_PURE)
>- 
>- .PHONY: files
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__blur__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__blur__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__blur__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/blur/Makefile.am.orig
>-+++ plug-ins/blur/Makefile.am
>-@@ -18,8 +18,7 @@
>- 	$(top_builddir)/lib/libcinepaint.la	\
>- 	$(X_LIBS)				\
>- 	$(top_builddir)/libhalf/cinepaint_half.lo	\
>--	$(OPENEXR_LIBS) \
>--	-lc
>-+	$(OPENEXR_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/bracketing_to_hdr/Makefile.am.orig
>-+++ plug-ins/bracketing_to_hdr/Makefile.am
>-@@ -51,8 +51,7 @@
>- 	./FL_adds/libfl_adds.la \
>- 	./gui/libgui.la \
>- 	$(FLTK_LIBS) \
>--	$(GTK_LIBS) \
>--	-lc
>-+	$(GTK_LIBS)
>- 
>- DEPS = \
>- 	./br_core/libbr_core.la \
>Index: graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__jhead__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__jhead__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__jhead__Makefile.am	(working copy)
>@@ -1,11 +0,0 @@
>---- plug-ins/bracketing_to_hdr/jhead/Makefile.am.orig
>-+++ plug-ins/bracketing_to_hdr/jhead/Makefile.am
>-@@ -31,7 +31,7 @@
>- 	-I$(includedir)
>- 
>- LDADD = \
>--	-lc -lm
>-+	-lm
>- 
>- .PHONY: files
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__compose__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__compose__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__compose__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/compose/Makefile.am.orig
>-+++ plug-ins/compose/Makefile.am
>-@@ -14,8 +14,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__dbbrowser__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__dbbrowser__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__dbbrowser__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/dbbrowser/Makefile.am.orig
>-+++ plug-ins/dbbrowser/Makefile.am
>-@@ -19,8 +19,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__decompose__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__decompose__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__decompose__Makefile.am	(working copy)
>@@ -1,13 +0,0 @@
>---- plug-ins/decompose/Makefile.am.orig
>-+++ plug-ins/decompose/Makefile.am
>-@@ -14,9 +14,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--					\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__dicom__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__dicom__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__dicom__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/dicom/Makefile.am.orig
>-+++ plug-ins/dicom/Makefile.am
>-@@ -14,8 +14,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__fits__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__fits__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__fits__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/fits/Makefile.am.orig
>-+++ plug-ins/fits/Makefile.am
>-@@ -16,8 +16,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__gbr__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__gbr__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__gbr__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/gbr/Makefile.am.orig
>-+++ plug-ins/gbr/Makefile.am
>-@@ -16,8 +16,7 @@
>- 	$(top_builddir)/lib/libcinepaint.la	\
>- 	$(X_LIBS)				\
>- 	$(top_builddir)/libhalf/cinepaint_half.lo       \
>--        $(OPENEXR_LIBS) \
>--	-lc
>-+        $(OPENEXR_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__hdr__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__hdr__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__hdr__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/hdr/Makefile.am.orig
>-+++ plug-ins/hdr/Makefile.am
>-@@ -20,8 +20,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__iff__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__iff__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__iff__Makefile.am	(working copy)
>@@ -1,13 +0,0 @@
>---- plug-ins/iff/Makefile.am.orig
>-+++ plug-ins/iff/Makefile.am
>-@@ -14,9 +14,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--					\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__jpeg__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__jpeg__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__jpeg__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/jpeg/Makefile.am.orig
>-+++ plug-ins/jpeg/Makefile.am
>-@@ -22,8 +22,7 @@
>- 	@LCMS_LIB@				\
>- 	@LIBJPEG_LIB@				\
>-         $(top_builddir)/libhalf/cinepaint_half.lo       \
>--        $(OPENEXR_LIBS) \
>--	-lc
>-+        $(OPENEXR_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__median__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__median__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__median__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/median/Makefile.am.orig
>-+++ plug-ins/median/Makefile.am
>-@@ -16,8 +16,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__minimum__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__minimum__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__minimum__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/minimum/Makefile.am.orig
>-+++ plug-ins/minimum/Makefile.am
>-@@ -16,8 +16,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__noisify__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__noisify__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__noisify__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/noisify/Makefile.am.orig
>-+++ plug-ins/noisify/Makefile.am
>-@@ -16,8 +16,7 @@
>- 	$(top_builddir)/lib/libcinepaint.la	\
>- 	$(X_LIBS)				\
>-         $(top_builddir)/libhalf/cinepaint_half.lo       \
>--        $(OPENEXR_LIBS) \
>--	-lc
>-+        $(OPENEXR_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__openexr__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__openexr__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__openexr__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/openexr/Makefile.am.orig
>-+++ plug-ins/openexr/Makefile.am
>-@@ -27,8 +27,7 @@
>- 	$(top_builddir)/lib/libcinepaint.la \
>- 	$(X_LIBS) \
>- 	$(OPENEXR_LIBS) \
>--	@LCMS_LIB@ \
>--	-lc
>-+	@LCMS_LIB@
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__pdf__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__pdf__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__pdf__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/pdf/Makefile.am.orig
>-+++ plug-ins/pdf/Makefile.am
>-@@ -31,8 +31,7 @@
>- 	$(top_builddir)/lib/libcinepaint.la \
>- 	$(X_LIBS) \
>- 	$(FLTK_LIBS) \
>--	$(OYRANOS_LIBS) \
>--	-lc
>-+	$(OYRANOS_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__pic__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__pic__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__pic__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/pic/Makefile.am.orig
>-+++ plug-ins/pic/Makefile.am
>-@@ -21,8 +21,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__png__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__png__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__png__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/png/Makefile.am.orig
>-+++ plug-ins/png/Makefile.am
>-@@ -17,8 +17,7 @@
>- 	$(top_builddir)/lib/libcinepaint.la	\
>- 	$(LIBPNG)				\
>- 	$(GTK_LIBS)				\
>--	$(X_LIBS)				\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__pnm__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__pnm__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__pnm__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/pnm/Makefile.am.orig
>-+++ plug-ins/pnm/Makefile.am
>-@@ -14,8 +14,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__psd_save__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__psd_save__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__psd_save__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/psd_save/Makefile.am.orig
>-+++ plug-ins/psd_save/Makefile.am
>-@@ -14,8 +14,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = \
>- 	$(top_builddir)/lib/libcinepaint.la
>Index: graphics/cinepaint/files/patch-plug-ins__screenshot__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__screenshot__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__screenshot__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/screenshot/Makefile.am.orig
>-+++ plug-ins/screenshot/Makefile.am
>-@@ -22,8 +22,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__sgi__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__sgi__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__sgi__Makefile.am	(working copy)
>@@ -1,13 +0,0 @@
>---- plug-ins/sgi/Makefile.am.orig
>-+++ plug-ins/sgi/Makefile.am
>-@@ -14,9 +14,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--					\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__tga__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__tga__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__tga__Makefile.am	(working copy)
>@@ -1,13 +0,0 @@
>---- plug-ins/tga/Makefile.am.orig
>-+++ plug-ins/tga/Makefile.am
>-@@ -14,9 +14,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--					\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/cinepaint/files/patch-plug-ins__xwd__Makefile.am
>===================================================================
>--- graphics/cinepaint/files/patch-plug-ins__xwd__Makefile.am	(revision 365596)
>+++ graphics/cinepaint/files/patch-plug-ins__xwd__Makefile.am	(working copy)
>@@ -1,12 +0,0 @@
>---- plug-ins/xwd/Makefile.am.orig
>-+++ plug-ins/xwd/Makefile.am
>-@@ -18,8 +18,7 @@
>- 
>- LDADD = \
>- 	$(top_builddir)/lib/libcinepaint.la	\
>--	$(X_LIBS)				\
>--	-lc
>-+	$(X_LIBS)
>- 
>- DEPS = $(top_builddir)/lib/libcinepaint.la
>- 
>Index: graphics/exiftran/files/Makefile.exiftran
>===================================================================
>--- graphics/exiftran/files/Makefile.exiftran	(revision 365596)
>+++ graphics/exiftran/files/Makefile.exiftran	(working copy)
>@@ -10,7 +10,7 @@ SRCS+=	transupp.c
> .PATH: ${.CURDIR}/../../rd
> SRCS+=	read-jpeg.c
> 
>-LDADD=	-L${PREFIX}/lib -ljpeg -lexif
>+LDADD=	-L${PREFIX}/lib -ljpeg -lexif -lm
> 
> CFLAGS+= -I${PREFIX}/include -I${.CURDIR}/../../jpeg/80 \
> 	-I${.CURDIR}/../.. -DHAVE_NEW_EXIF
>Index: graphics/gimageview/Makefile
>===================================================================
>--- graphics/gimageview/Makefile	(revision 365596)
>+++ graphics/gimageview/Makefile	(working copy)
>@@ -59,6 +59,7 @@ LIBXINE_LIB_DEPENDS=	libxine.so:${PORTSD
> post-patch:
> 	@${REINPLACE_CMD} '/^desktopdir =/s|=.*|= ${DESKTOPDIR}|' \
> 		${WRKSRC}/etc/Makefile.in
>+	@${REINPLACE_CMD} '/^gimv_LDADD =/s/=/= -lm/' ${WRKSRC}/src/Makefile.in
> 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
> 		-e 's|= $$(DESTDIR)|= |' -e '/^CPPFLAGS =/s/\\/@CPPFLAGS@ \\/'
> 
>Index: graphics/gimp-wavelet-denoise-plugin/Makefile
>===================================================================
>--- graphics/gimp-wavelet-denoise-plugin/Makefile	(revision 365596)
>+++ graphics/gimp-wavelet-denoise-plugin/Makefile	(working copy)
>@@ -39,6 +39,7 @@ CFLAGS+=	-O3
> post-patch:
> 	@${REINPLACE_CMD} \
> 		-e 's|gimptool-2.0|${LOCALBASE}/bin/gimptool-2.0|' \
>+		-e '/^LIBS =/s/$$/ -lm/' \
> 		${WRKSRC}/src/Makefile
> #
> ## l10n
>Index: graphics/gimp-wavelet-sharpen-plugin/Makefile
>===================================================================
>--- graphics/gimp-wavelet-sharpen-plugin/Makefile	(revision 365596)
>+++ graphics/gimp-wavelet-sharpen-plugin/Makefile	(working copy)
>@@ -39,6 +39,7 @@ CFLAGS+=	-O3
> post-patch:
> 	@${REINPLACE_CMD} \
> 		-e 's|gimptool-2.0|${LOCALBASE}/bin/gimptool-2.0|' \
>+		-e '/^LIBS =/s/$$/ -lm/' \
> 		${WRKSRC}/src/Makefile
> #
> ## l10n
>Index: graphics/giram/Makefile
>===================================================================
>--- graphics/giram/Makefile	(revision 365596)
>+++ graphics/giram/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	giram
> PORTVERSION=	0.3.5
>-PORTREVISION=	17
>+PORTREVISION=	18
> CATEGORIES=	graphics
> MASTER_SITES=	http://freebsd.nsu.ru/distfiles/
> 
>@@ -14,16 +14,17 @@ LIB_DEPENDS=	lib3ds-1.so:${PORTSDIR}/gra
> BUILD_DEPENDS=	povray:${PORTSDIR}/graphics/povray-meta
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
>-USES=		gettext perl5 pkgconfig gmake
>+USES=		gettext gmake libtool perl5 pkgconfig
> USE_PERL5=	build
> USE_GNOME=	gtk20
>-USE_AUTOTOOLS=	libtool
>+GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	INTLTOOL_PERL="${PERL}"
>-LDFLAGS+=	-L${LOCALBASE}/lib
> CONFIGURE_ARGS=	--datadir="${PREFIX}/lib" \
>+		--disable-static \
> 		--with-tutorial-path="${DOCSDIR}" \
> 		--with-lib3ds-prefix="${LOCALBASE}"
> CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib -lm
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>Index: graphics/giram/pkg-plist
>===================================================================
>--- graphics/giram/pkg-plist	(revision 365596)
>+++ graphics/giram/pkg-plist	(working copy)
>@@ -9,23 +9,11 @@ lib/giram/0.3/color/color1.gcf
> lib/giram/0.3/finish/finish1
> lib/giram/0.3/giram_logo.ppm
> lib/giram/0.3/giram_splash.ppm
>-lib/giram/0.3/modules/librender_flat.a
>-lib/giram/0.3/modules/librender_flat.la
> lib/giram/0.3/modules/librender_flat.so
>-lib/giram/0.3/modules/librender_gouraud.a
>-lib/giram/0.3/modules/librender_gouraud.la
> lib/giram/0.3/modules/librender_gouraud.so
>-lib/giram/0.3/modules/librender_hiddenfaces.a
>-lib/giram/0.3/modules/librender_hiddenfaces.la
> lib/giram/0.3/modules/librender_hiddenfaces.so
>-lib/giram/0.3/modules/librender_povray.a
>-lib/giram/0.3/modules/librender_povray.la
> lib/giram/0.3/modules/librender_povray.so
>-lib/giram/0.3/modules/librender_raytracing.a
>-lib/giram/0.3/modules/librender_raytracing.la
> lib/giram/0.3/modules/librender_raytracing.so
>-lib/giram/0.3/modules/librender_wireframe.a
>-lib/giram/0.3/modules/librender_wireframe.la
> lib/giram/0.3/modules/librender_wireframe.so
> lib/giram/0.3/normal/normal1
> lib/giram/0.3/pigment/pigment1
>Index: graphics/gpaint/Makefile
>===================================================================
>--- graphics/gpaint/Makefile	(revision 365596)
>+++ graphics/gpaint/Makefile	(working copy)
>@@ -12,9 +12,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Small-scale painting program for GNOME
> 
>-USES=		pkgconfig
>+USES=		libtool pkgconfig
> USE_GNOME=	libgnomeprint libgnomeprintui
> GNU_CONFIGURE=	yes
>+LIBS+=		-lm
> 
> PLIST_FILES=	bin/gpaint-2 %%DATADIR%%/glade/gpaint.glade
> PLIST_DIRS=	%%DATADIR%%/glade %%DATADIR%%
>Index: graphics/gqview/Makefile
>===================================================================
>--- graphics/gqview/Makefile	(revision 365596)
>+++ graphics/gqview/Makefile	(working copy)
>@@ -16,7 +16,7 @@ USES=		pkgconfig
> USE_GNOME=	gnomehier gtk20
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
>+LIBS+=		-L${LOCALBASE}/lib -lm
> 
> # Restrict to stable (even) versions, indicated by the second component.
> PORTSCOUT=	limitw:1,even
>Index: graphics/inventor/files/patch-apps-samples-widgets-GNUmakefile.componentTest
>===================================================================
>--- graphics/inventor/files/patch-apps-samples-widgets-GNUmakefile.componentTest	(revision 0)
>+++ graphics/inventor/files/patch-apps-samples-widgets-GNUmakefile.componentTest	(working copy)
>@@ -0,0 +1,11 @@
>+--- apps/samples/widgets/GNUmakefile.componentTest.orig
>++++ apps/samples/widgets/GNUmakefile.componentTest
>+@@ -5,7 +5,7 @@
>+ 
>+ CXXFILES = componentTest.c++
>+ 
>+-LLDLIBS = libInventorWidget.a -lInventor -lInventorXt -lGLw
>++LLDLIBS = libInventorWidget.a -lInventor -lInventorXt -lGLw -lGL -lX11
>+ 
>+ all install: all_ivbin
>+ 
>
>Property changes on: graphics/inventor/files/patch-apps-samples-widgets-GNUmakefile.componentTest
>___________________________________________________________________
>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: graphics/klatexformula/Makefile
>===================================================================
>--- graphics/klatexformula/Makefile	(revision 365596)
>+++ graphics/klatexformula/Makefile	(working copy)
>@@ -19,8 +19,13 @@ CMAKE_ARGS=	-DQT_QMAKE_EXECUTABLE_FINDQT
> 		-DKLF_BUILD_KTEXTEDITORPLUGIN=off \
> 		-DKLF_INSTALL_POST_UPDATEMIMEDATABASE=off \
> 		-DKLF_INSTALL_SHARE_MAN1_DIR=man/man1
>-CXXFLAGS=	-I${LOCALBASE}/include
>+CXXFLAGS+=	-I${LOCALBASE}/include
>+LDFLAGS+=	-L${LOCALBASE}/lib
> 
> PLIST_SUB=	VERSION=${PORTVERSION}
> 
>+post-patch:
>+	@${REINPLACE_CMD} '/link_libraries(klatexformula /s/)/ -lX11)/' \
>+		${WRKSRC}/src/CMakeLists.txt
>+
> .include <bsd.port.mk>
>Index: graphics/kudu/Makefile
>===================================================================
>--- graphics/kudu/Makefile	(revision 365596)
>+++ graphics/kudu/Makefile	(working copy)
>@@ -20,7 +20,7 @@ USE_GL=		gl
> USE_PYTHON=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LIBS+=		-L${LOCALBASE}/lib -lcompat
>+LIBS+=		-L${LOCALBASE}/lib -lcompat -lm
> 
> PLIST_FILES=	bin/${PORTNAME}
> PORTDATA=	*
>Index: graphics/lprof-devel/files/patch-src-CMakeLists.txt
>===================================================================
>--- graphics/lprof-devel/files/patch-src-CMakeLists.txt	(revision 365596)
>+++ graphics/lprof-devel/files/patch-src-CMakeLists.txt	(working copy)
>@@ -9,7 +9,7 @@
>  
>  
>  IF(NOT LIBVIGRAIMPEX_FOUND)
>-@@ -143,9 +143,18 @@ ELSE(NOT LIBVIGRAIMPEX_FOUND)
>+@@ -143,12 +143,21 @@ ELSE(NOT LIBVIGRAIMPEX_FOUND)
>      # Static/nonstatic flag should've been added by find script
>  ENDIF(NOT LIBVIGRAIMPEX_FOUND)
>  
>@@ -30,3 +30,8 @@
> +    ${CMAKE_CURRENT_BINARY_DIR}
>  )
>  
>+-TARGET_LINK_LIBRARIES(lprof liblprof lcmslocal argyll ${X11_VIDMODE_LIBRARIES} ${X11_LIBRARIES} ${impex_lib} ${LIBUSB_LIBRARIES} ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${COMMON_PLATFORM_LIBS} ${WINDDK_LIBRARIES})
>++TARGET_LINK_LIBRARIES(lprof liblprof lcmslocal argyll ${X11_VIDMODE_LIBRARIES} ${X11_LIBRARIES} ${impex_lib} ${LIBUSB_LIBRARIES} ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${COMMON_PLATFORM_LIBS} ${WINDDK_LIBRARIES} -pthread)
>+ 
>+ SET_TARGET_PROPERTIES(lprof
>+     PROPERTIES
>Index: graphics/nomacs/files/patch-CMakeLists.txt
>===================================================================
>--- graphics/nomacs/files/patch-CMakeLists.txt	(revision 365596)
>+++ graphics/nomacs/files/patch-CMakeLists.txt	(working copy)
>@@ -36,7 +36,7 @@
>  		link_directories(${LIBRAW_LIBRARY_DIRS} ${OpenCV_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS})
>  		add_executable(${EXE_NAME} WIN32 MACOSX_BUNDLE ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_MOC_SRC} ${NOMACS_RCC} ${NOMACS_HEADERS} ${NOMACS_RC} ${NOMACS_QM} ${NOMACS_TRANSLATIONS} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${LIBQPSD_MOC_SRC} ${WEBP_SOURCE})
> -		target_link_libraries(${EXE_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES})
>-+		target_link_libraries(${EXE_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES} ${SYSINFO_LIBRARY})
>++		target_link_libraries(${EXE_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES} ${SYSINFO_LIBRARY} -pthread)
>  
>  		IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
>  			SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -fopenmp)
>Index: graphics/panoglview/Makefile
>===================================================================
>--- graphics/panoglview/Makefile	(revision 365596)
>+++ graphics/panoglview/Makefile	(working copy)
>@@ -11,13 +11,14 @@ MAINTAINER=	ii@any.com.ru
> COMMENT=	Panorama viewer using OpenGL
> 
> USES=		gmake
>+USE_GL=		glu
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--with-unicode
> CONFIGURE_ENV=	WX_CONFIG_NAME=${WX_CONFIG} \
> 		PATH="$${PATH}:${LOCALBASE}/bin"
>-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
>-CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
>-CXXFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include -ftemplate-depth-64
>-CONFIGURE_ARGS=	--with-unicode
>+CFLAGS+=	-I${LOCALBASE}/include
>+CXXFLAGS+=	-I${LOCALBASE}/include -ftemplate-depth-64
>+LIBS+=		-L${LOCALBASE}/lib -lGLU -lGL
> 
> USE_WX=		2.8
> WX_UNICODE=	yes
>Index: graphics/pornview/Makefile
>===================================================================
>--- graphics/pornview/Makefile	(revision 365596)
>+++ graphics/pornview/Makefile	(working copy)
>@@ -15,13 +15,13 @@ LIB_DEPENDS=	libexif.so:${PORTSDIR}/grap
> 		libpng15.so:${PORTSDIR}/graphics/png \
> 		libxcb-render-util.so:${PORTSDIR}/x11/xcb-util-renderutil
> 
>+USES=		libtool pkgconfig
> USE_XORG=	x11 xi xext xinerama
>-USES=		pkgconfig
> USE_GNOME=	gtk20
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-gtk2
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib -lm
>+LIBS+=		-L${LOCALBASE}/lib -lXext -lX11 -lm
> 
> OPTIONS_DEFINE=	LIBXINE MPLAYER NLS
> OPTIONS_DEFAULT=	LIBXINE
>Index: graphics/reallyslick/Makefile
>===================================================================
>--- graphics/reallyslick/Makefile	(revision 365596)
>+++ graphics/reallyslick/Makefile	(working copy)
>@@ -19,7 +19,7 @@ USES=		gmake pathfix pkgconfig tar:bzip2
> GNU_CONFIGURE=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib -lXext
>+LIBS+=		-L${LOCALBASE}/lib -lXext
> 
> OPTIONS_DEFINE=	FREEALUT GLEW
> 
>@@ -29,11 +29,9 @@ FREEALUT_USES=	openal:alut
> 
> GLEW_DESC=	Enable GLEW support
> GLEW_USE=	GL=glew
>+GLEW_CONFIGURE_ENV_OFF=	ac_cv_header_GL_glew_h=no
> 
>-.include <bsd.port.options.mk>
>-
>-.if ! ${PORT_OPTIONS:MGLEW}
>-CONFIGURE_ENV+=	ac_cv_header_GL_glew_h=no
>-.endif
>+post-patch:
>+	@${REINPLACE_CMD} '/LINK.*pixelcity/s/LINK/CXXLINK/' ${WRKSRC}/src/Makefile.in
> 
> .include <bsd.port.mk>
>Index: graphics/rgbpaint/Makefile
>===================================================================
>--- graphics/rgbpaint/Makefile	(revision 365596)
>+++ graphics/rgbpaint/Makefile	(working copy)
>@@ -30,7 +30,7 @@ post-patch:
> 	@${REINPLACE_CMD} 's|$$(MT_LANG_DEST)|$$(DESTDIR)&|g' \
> 		${WRKSRC}/po/Makefile
> 	@${REINPLACE_CMD} 's|$$(BIN_INSTALL)|$$(DESTDIR)&|g ; \
>-		 /^LDFLAGS/s|)$$|) -lm -lintl|' \
>+		 /^LDFLAGS/s|$$| -lX11 -lm -lintl|' \
> 		${WRKSRC}/src/Makefile
> 
> post-install:
>Index: graphics/separate/Makefile
>===================================================================
>--- graphics/separate/Makefile	(revision 365596)
>+++ graphics/separate/Makefile	(working copy)
>@@ -42,8 +42,9 @@ MAKE_ENV+=	TARGETS="${BIN_TARGETS}" \
> .include <bsd.port.options.mk>
> 
> post-patch:
>-	@${REINPLACE_CMD} -e '/^CC/s|=|?=|; s| make| ${MAKE_CMD}|;' \
>-	    ${WRKSRC}/Makefile ${WRKSRC}/po/Makefile
>+	@${REINPLACE_CMD} \
>+		'/^CC/s|=|?=|; s| make| ${MAKE_CMD}|; /^LIBS/s/$$/ -lm/;' \
>+		${WRKSRC}/Makefile ${WRKSRC}/po/Makefile
> 
> do-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gimp/2.2/plug-ins
>Index: graphics/vp/Makefile
>===================================================================
>--- graphics/vp/Makefile	(revision 365596)
>+++ graphics/vp/Makefile	(working copy)
>@@ -9,9 +9,10 @@ MASTER_SITES=	http://elfga.com/~erik/fil
> MAINTAINER=	erik@elfga.com
> COMMENT=	Image viewer for X
> 
>-USE_SDL=	image
> GNU_CONFIGURE=	yes
>+LIBS+=		-lm
> USES=		tar:xz
>+USE_SDL=	image
> 
> PLIST_FILES=	bin/vp man/man1/vp.1.gz
> 
>Index: graphics/xzgv/Makefile
>===================================================================
>--- graphics/xzgv/Makefile	(revision 365596)
>+++ graphics/xzgv/Makefile	(working copy)
>@@ -14,6 +14,8 @@ BUILD_DEPENDS=  gawk:${PORTSDIR}/lang/ga
> 
> USES=		gmake pkgconfig
> USE_GNOME=	imlib gdkpixbuf gtk20
>+USE_XORG=	x11
>+LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -lm
> 
> PLIST_FILES=	bin/xzgv man/man1/xzgv.1.gz
> 
>Index: japanese/im-ja/Makefile
>===================================================================
>--- japanese/im-ja/Makefile	(revision 365596)
>+++ japanese/im-ja/Makefile	(working copy)
>@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--disable-gnome
> GCONF_SCHEMAS=	im-ja.schemas
> 
> CPPFLAGS+=	-I${LOCALBASE}/include -DNO_MALLOC_H
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib
> 
> .include <bsd.port.options.mk>
> 
>@@ -57,5 +57,13 @@ post-patch:
> 	${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${TOUCH}
> 	@${REINPLACE_CMD} -e 's|$$(datadir)/gconf|$$(sysconfdir)/gconf|g' \
> 		${WRKSRC}/data/Makefile.in
>+	@${REINPLACE_CMD} '/^im_ja_la_LIBADD =/s/$$/ -lm/' \
>+		${WRKSRC}/src/gtk/Makefile.in
>+	@${REINPLACE_CMD} '/^im_ja_helper_LDADD =/s/$$/ -lX11/' \
>+		${WRKSRC}/src/helper/Makefile.in
>+	@${REINPLACE_CMD} '/^im_ja_le_la_LIBADD =/s/$$/ -lm/' \
>+		${WRKSRC}/src/iiimf/Makefile.in
>+	@${REINPLACE_CMD} '/^im_ja_xim_server_LDADD =/s/$$/ -lm/' \
>+		${WRKSRC}/src/gtk/Makefile.in
> 
> .include <bsd.port.mk>
>Index: korean/gtkcomm/Makefile
>===================================================================
>--- korean/gtkcomm/Makefile	(revision 365596)
>+++ korean/gtkcomm/Makefile	(working copy)
>@@ -17,10 +17,9 @@ RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/
> USES=		perl5 pkgconfig
> USE_PERL5=	build
> USE_GNOME=	glib20 gtk20
>+USE_XORG=	x11
> GNU_CONFIGURE=	yes
>-
>-pre-patch:
>-	${REINPLACE_CMD} -e 's|-lc_r||; s|DATADIRNAME=lib|DATADIRNAME=share|g' \
>-	    ${WRKSRC}/configure
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> 
> .include <bsd.port.mk>
>Index: lang/cduce/Makefile
>===================================================================
>--- lang/cduce/Makefile	(revision 365596)
>+++ lang/cduce/Makefile	(working copy)
>@@ -48,7 +48,7 @@ MAKE_JOBS_UNSAFE=yes
> 
> post-patch:
> 	${REINPLACE_CMD} 's/-linkpkg/& -thread/' \
>-		${WRKSRC}/Makefile ${WRKSRC}/configure.ml
>+		${WRKSRC}/Makefile.distrib ${WRKSRC}/configure.ml
> 
> post-install:
> 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MANPREFIX}/man/man1/
>Index: mail/deforaos-mailer/Makefile
>===================================================================
>--- mail/deforaos-mailer/Makefile	(revision 365596)
>+++ mail/deforaos-mailer/Makefile	(working copy)
>@@ -33,7 +33,8 @@ MAKE_JOBS_UNSAFE=	yes
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \
> 		${WRKSRC}/data/pkgconfig.sh
>-	@${REINPLACE_CMD} 's|`pkg-config --libs openssl` -lssl|-lssl -lcrypto|' \
>-		${WRKSRC}/src/Makefile
>+	@${REINPLACE_CMD} 's/-lssl/& -lcrypto/' \
>+		${WRKSRC}/src/Makefile ${WRKSRC}/src/account/Makefile \
>+		${WRKSRC}/src/plugins/Makefile ${WRKSRC}/tests/Makefile
> 
> .include <bsd.port.mk>
>Index: mail/gnubiff/Makefile
>===================================================================
>--- mail/gnubiff/Makefile	(revision 365596)
>+++ mail/gnubiff/Makefile	(working copy)
>@@ -18,7 +18,7 @@ USE_GNOME=	intlhack libglade2 esound
> USES=		fam gmake pathfix pkgconfig
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> 
> # CXXFLAGS needed to work round issue with gcc and openssl 0.9.8a
> # /usr/local/include/openssl/sha.h:173: error: ISO C++ does not support `long long'
>Index: mail/mail-notification/files/patch-jbsrc-jb.c
>===================================================================
>--- mail/mail-notification/files/patch-jbsrc-jb.c	(revision 0)
>+++ mail/mail-notification/files/patch-jbsrc-jb.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- jbsrc/jb.c.orig
>++++ jbsrc/jb.c
>+@@ -444,6 +444,7 @@
>+   jb_compile_options_add_ldflags(object->compile_options, "-Wl,--export-dynamic");
>+ 
>+   jb_compile_options_add_libs(object->compile_options, "-lm");
>++  jb_compile_options_add_libs(object->compile_options, "-lX11");
>+ 
>+   jb_compile_options_add_package(object->compile_options, "gettext");
>+   jb_compile_options_add_package(object->compile_options, "gnome");
>
>Property changes on: mail/mail-notification/files/patch-jbsrc-jb.c
>___________________________________________________________________
>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: math/calcoo/Makefile
>===================================================================
>--- math/calcoo/Makefile	(revision 365596)
>+++ math/calcoo/Makefile	(working copy)
>@@ -12,6 +12,7 @@ COMMENT=	RPN and algebraic scientific ca
> USES=		pkgconfig
> USE_GNOME=	gtk20
> GNU_CONFIGURE=	yes
>+LIBS+=		-lm
> 
> PLIST_FILES=	bin/calcoo \
> 		man/man1/calcoo.1.gz
>Index: math/goblin/Makefile
>===================================================================
>--- math/goblin/Makefile	(revision 365596)
>+++ math/goblin/Makefile	(working copy)
>@@ -27,15 +27,12 @@ PORTDOCS=	*
> PORTEXAMPLES=	*
> 
> CFLAGS+=	-I${LOCALBASE}/include/tcl${TCL_VER} -I${LOCALBASE}/include/ \
>-		-I${LOCALBASE}/include/tk${TK_VER}
>-LIBS+=		-L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER} -ltk${TK_SHLIB_VER} -lm
>+		-I${LOCALBASE}/include/tk${TK_VER} -fPIC
>+CXXFLAGS+=	-fPIC
>+LIBS+=		-L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER} -ltk${TK_SHLIB_VER} -lm -pthread
> 
> .include <bsd.port.options.mk>
> 
>-.if ${ARCH} == "amd64"
>-CFLAGS+=	-fPIC
>-.endif
>-
> post-patch:
> 	${REINPLACE_CMD} -e 's|/usr/bin/wish|${WISH}|g' ${WRKSRC}/display
> 	${REINPLACE_CMD} -e \
>Index: math/qtiplot/files/build.conf
>===================================================================
>--- math/qtiplot/files/build.conf	(revision 365596)
>+++ math/qtiplot/files/build.conf	(working copy)
>@@ -3,7 +3,7 @@ isEmpty( QTI_ROOT ) {
> }
> 
> SYS_INCLUDEPATH = $$LOCALBASE/include
>-SYS_LIBS = -L$$LOCALBASE/lib -lGLU
>+SYS_LIBS = -L$$LOCALBASE/lib
> 
> MUPARSER_INCLUDEPATH =
> MUPARSER_LIBS = -lmuparser
>@@ -15,7 +15,7 @@ QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qw
> QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
> 
> QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include
>-QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
>+QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a -lGLU
> 
> LIBPNG_INCLUDEPATH =
> LIBPNG_LIBS = -lpng
>Index: math/qtiplot/files/patch-qtiplot__qtiplot.pro
>===================================================================
>--- math/qtiplot/files/patch-qtiplot__qtiplot.pro	(revision 365596)
>+++ math/qtiplot/files/patch-qtiplot__qtiplot.pro	(working copy)
>@@ -49,7 +49,15 @@
>  
>  unix: man.files += ../qtiplot.1
>  
>-@@ -159,18 +145,19 @@
>+@@ -133,6 +119,7 @@
>+ ###############################################################
>+ 
>+ SOURCES += ../3rdparty/zlib/minigzip.c
>++LIBS += -lz
>+ 
>+ ###############################################################
>+ ################# Default Modules #############################
>+@@ -159,18 +146,19 @@
>    				    qtiUtil.py \
>    				    qti_wordlist.txt \
>  
>Index: misc/wmcalendar/Makefile
>===================================================================
>--- misc/wmcalendar/Makefile	(revision 365596)
>+++ misc/wmcalendar/Makefile	(working copy)
>@@ -22,9 +22,7 @@ MAKE_ARGS=	CC="${CC}" \
> 		CFLAGS="${CFLAGS}" \
> 		INCDIR="`pkg-config --cflags gtk+-2.0` -I${LOCALBASE}/include" \
> 		LIBDIR="" \
>-		LIBS="-lical -lXpm"
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+		LIBS="-lical -lX11 -lXext -lXpm -lm"
> 
> PLIST_FILES=	bin/wmCalendar man/man1/wmCalendar.1.gz
> 
>Index: multimedia/aegisub/Makefile
>===================================================================
>--- multimedia/aegisub/Makefile	(revision 365596)
>+++ multimedia/aegisub/Makefile	(working copy)
>@@ -49,7 +49,7 @@ INSTALLS_ICONS=	yes
> PLIST_SUB=	VERSION="${PORTVERSION:R}"
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
>+LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB} -pthread
> 
> OPTIONS_DEFINE=		ALSA DOCS FFMPEG FFTW HUNSPELL OPENAL PORTAUDIO \
> 			PULSEAUDIO
>Index: multimedia/ffmpeg2theora/Makefile
>===================================================================
>--- multimedia/ffmpeg2theora/Makefile	(revision 365596)
>+++ multimedia/ffmpeg2theora/Makefile	(working copy)
>@@ -16,10 +16,10 @@ LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/m
> 		libtheora.so:${PORTSDIR}/multimedia/libtheora
> 
> USES=		iconv pkgconfig scons tar:bzip2
>-MAKE_ENV=	APPEND_CCFLAGS="${CPPFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}" CCFLAGS="${CPPFLAGS}"
>+MAKE_ENV=	APPEND_CCFLAGS="${CPPFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}"
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
>+LDFLAGS+=	-L${LOCALBASE}/lib
> 
> PLIST_FILES=	bin/ffmpeg2theora man/man1/ffmpeg2theora.1.gz
> 
>Index: multimedia/ffmpeg2theora/files/patch-SConstruct
>===================================================================
>--- multimedia/ffmpeg2theora/files/patch-SConstruct	(revision 365596)
>+++ multimedia/ffmpeg2theora/files/patch-SConstruct	(working copy)
>@@ -5,7 +5,7 @@
>    BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
>  )
> -env = Environment(options = opts)
>-+env = Environment(options = opts, CC = Split(os.environ['CC']), CCFLAGS = Split(os.environ['CCFLAGS']))
>++env = Environment(options = opts, CC = Split(os.environ['CC']))
>  Help(opts.GenerateHelpText(env))
>  
>  pkg_flags="--cflags --libs"
>@@ -17,3 +17,11 @@
>        "libavutil",
>    ]
>    if os.path.exists("./ffmpeg"):
>+@@ -203,6 +202,7 @@
>+       if conf.CheckLib('iconv'):
>+           env.Append(LIBS=['iconv'])
>+ 
>++  env.Append(LIBS=['m'])
>+   if env['crossmingw']:
>+       env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
>+       env.Append(LIBS=['m'])
>Index: multimedia/gmerlin/Makefile
>===================================================================
>--- multimedia/gmerlin/Makefile	(revision 365596)
>+++ multimedia/gmerlin/Makefile	(working copy)
>@@ -29,7 +29,7 @@ USE_LDCONFIG=	yes
> INSTALL_ICONS=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib `pkg-config --libs gtk+-x11-2.0`
>+LIBS+=		-L${LOCALBASE}/lib
> 
> INFO=		gmerlin
> 
>@@ -74,16 +74,15 @@ post-patch:
> 		'/LIBS/s|-ldl || ; \
> 		 s|^LDFLAGS="|&$${LDFLAGS} | ; \
> 		 s|-DGTK_DISABLE_DEPRECATED|| ; \
>-		 s|-lpthread|-pthread| ; \
> 		 s|-O3.*-ffast-math||' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} '/^gmerlin_kbd_config_LDADD =/s/$$/ @X_LIBS@/' \
>+		${WRKSRC}/apps/kbd/Makefile.in
> 	@${REINPLACE_CMD} -e \
> 		's|^texinfo_|#texinfo_|g' ${WRKSRC}/doc/Makefile.in
> 	@${REINPLACE_CMD} -e \
> 		's|ln -sf $$(DESTDIR)|ln -sf |' ${WRKSRC}/icons/Makefile.in
> 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|-ldl||g ; \
>-		 s|-lpthread|-pthread|g ; \
>-		 /^LIBS = /s|$$| @LIBINTL@ -pthread|g'
>+		's|-ldl||g'
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>Index: multimedia/gmerlin/files/patch-configure
>===================================================================
>--- multimedia/gmerlin/files/patch-configure	(revision 365596)
>+++ multimedia/gmerlin/files/patch-configure	(working copy)
>@@ -8,42 +8,6 @@
>  enable_libvisual
>  enable_libcdio
>  enable_musicbrainz
>-@@ -6324,7 +6325,7 @@
>-   rm -rf conftest*
>-   ;;
>- 
>--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
>-+amd64-*freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
>- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
>-   # Find out which ABI we are using.
>-   echo 'int i;' > conftest.$ac_ext
>-@@ -6336,7 +6337,7 @@
>-     case `/usr/bin/file conftest.o` in
>-       *32-bit*)
>- 	case $host in
>--	  x86_64-*kfreebsd*-gnu)
>-+	  amd64-*freebsd*|x86_64-*kfreebsd*-gnu)
>- 	    LD="${LD-ld} -m elf_i386_fbsd"
>- 	    ;;
>- 	  x86_64-*linux*)
>-@@ -6355,7 +6356,7 @@
>- 	;;
>-       *64-bit*)
>- 	case $host in
>--	  x86_64-*kfreebsd*-gnu)
>-+	  amd64-*freebsd*|x86_64-*kfreebsd*-gnu)
>- 	    LD="${LD-ld} -m elf_x86_64_fbsd"
>- 	    ;;
>- 	  x86_64-*linux*)
>-@@ -11240,7 +11241,7 @@
>- 	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
>- 	 if test -n "$ac_prev"; then
>- 	   case $ac_word in
>--	     i?86 | x86_64 | ppc | ppc64)
>-+	     amd64 | i?86 | x86_64 | ppc | ppc64)
>- 	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
>- 		 ac_arch=$ac_word
>- 	       else
> @@ -15396,9 +15397,9 @@
>  V4LCONVERT_REQUIRED="0.5.7"
>  have_v4lconvert=false
>Index: multimedia/imagination/Makefile
>===================================================================
>--- multimedia/imagination/Makefile	(revision 365596)
>+++ multimedia/imagination/Makefile	(working copy)
>@@ -19,8 +19,6 @@ USE_GNOME=	gtk20 intltool intlhack libxs
> INSTALLS_ICONS=	yes
> INSTALL_TARGET=	install-strip
> 
>-LIBS+=		`pkg-config --libs gmodule-2.0`
>-
> OPTIONS_DEFINE=	NLS
> OPTIONS_SUB=	yes
> NLS_CONFIGURE_ENABLE=	nls
>@@ -28,5 +26,7 @@ NLS_USES=	gettext
> 
> post-patch:
> 	@${REINPLACE_CMD} '/^SUBDIRS =/s/doc//' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} '/^imagination_LDADD =/s/$$/ -lm/' \
>+		${WRKSRC}/src/Makefile.in
> 
> .include <bsd.port.mk>
>Index: multimedia/imagination/files/patch-configure
>===================================================================
>--- multimedia/imagination/files/patch-configure	(revision 365596)
>+++ multimedia/imagination/files/patch-configure	(working copy)
>@@ -1,5 +1,14 @@
> --- ./configure.orig	2011-03-06 20:06:44.000000000 +0000
> +++ ./configure	2014-03-14 15:08:46.000000000 +0000
>+@@ -12499,7 +12499,7 @@
>+ 
>+ LIBTOOL="$LIBTOOL --silent"
>+ 
>+-pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0"
>++pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0 gmodule-2.0"
>+ 
>+ 
>+ 
> @@ -13029,7 +13029,7 @@
>  
>      fi
>Index: multimedia/mpeg4ip/Makefile
>===================================================================
>--- multimedia/mpeg4ip/Makefile	(revision 365596)
>+++ multimedia/mpeg4ip/Makefile	(working copy)
>@@ -132,9 +132,7 @@ pre-configure:
> 		-e 's|api.mpt||' \
> 		-e 's|^(install-man.*)install-manm|\1|' \
> 		${WRKSRC}/doc/mp4v2/Makefile.in
>-# objformat
>-	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} -e 's|echo aout|echo elf|'
>-	@${REINPLACE_CMD} -e 's|$${enable_ffmpeg}/lib/libavcodec.a|-lavcodec0 -lswscale0|g' \
>+	@${REINPLACE_CMD} -e 's|$${enable_ffmpeg}/lib/libavcodec.a|-lavcodec0 -lavutil0 -lswscale0|g' \
> 		${WRKSRC}/configure
> 
> # replace bundled mp4v2 with placeholder
>Index: multimedia/sabbu/Makefile
>===================================================================
>--- multimedia/sabbu/Makefile	(revision 365596)
>+++ multimedia/sabbu/Makefile	(working copy)
>@@ -44,7 +44,7 @@ post-patch:
> 		-e 's,ffmpeg/avformat,libavformat/avformat,g' \
> 		-e 's,lavcodec,lavcodec0,g' \
> 		-e 's,lavformat,lavformat0,g' \
>-		-e 's,lavswscale,lavswscale0,g' \
>+		-e '/FFMPEG_LIBS=/s/"$$/ -lavutil0"/' \
> 		${WRKSRC}/configure
> 
> .include <bsd.port.mk>
>Index: multimedia/tvheadend/Makefile
>===================================================================
>--- multimedia/tvheadend/Makefile	(revision 365596)
>+++ multimedia/tvheadend/Makefile	(working copy)
>@@ -13,10 +13,8 @@ LICENSE=	GPLv3
> BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
> 		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
> 
>-LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
>-		libcurl.so:${PORTSDIR}/ftp/curl \
>+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
> 		liburiparser.so:${PORTSDIR}/net/uriparser
>-
> RUN_DEPENDS=	dtv-scan-tables>=0:${PORTSDIR}/multimedia/dtv-scan-tables
> 
> USE_GITHUB=	yes
>@@ -24,7 +22,7 @@ GH_ACCOUNT=	${PORTNAME}
> GH_TAGNAME=	${GH_COMMIT}
> GH_COMMIT=	6d19440
> 
>-USES=		pkgconfig gmake shebangfix python
>+USES=		execinfo gmake pkgconfig python shebangfix
> GNU_CONFIGURE=	yes
> MAKE_JOBS_UNSAFE=	yes
> USE_RC_SUBR=	${PORTNAME}
>@@ -47,7 +45,7 @@ SUB_LIST+=	TVHUSER="${TVHUSER}" \
> CONFIGURE_ENV+=	PLATFORM=freebsd
> CONFIGURE_ARGS+=--disable-dvbscan --disable-zlib
> CFLAGS+=	-I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast
>-LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo -lssl -lz
>+LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo -lcrypto -lz
> 
> OPTIONS_DEFINE=	AVAHI DVBCSA TRANSCODING XMLTV
> OPTIONS_DEFAULT=DVBCSA
>Index: net/gnome-netstatus/Makefile
>===================================================================
>--- net/gnome-netstatus/Makefile	(revision 365596)
>+++ net/gnome-netstatus/Makefile	(working copy)
>@@ -17,8 +17,8 @@ INSTALLS_ICONS=	yes
> USE_GNOME=	intlhack gnomeprefix libgnome gnomepanel gnomedocutils
> USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
>-		LDFLAGS="-L${LOCALBASE}/lib"
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib -lm
> INSTALL_TARGET=	install-strip
> 
> GCONF_SCHEMAS=	netstatus.schemas
>Index: net/omnitty/Makefile
>===================================================================
>--- net/omnitty/Makefile	(revision 365596)
>+++ net/omnitty/Makefile	(working copy)
>@@ -14,6 +14,7 @@ LIB_DEPENDS=	librote.so:${PORTSDIR}/deve
> 
> USES=		gmake
> GNU_CONFIGURE=	yes
>+LIBS+=		-lncurses
> 
> ALL_TARGET=	${PORTNAME}
> 
>Index: net/openvswitch/Makefile
>===================================================================
>--- net/openvswitch/Makefile	(revision 365596)
>+++ net/openvswitch/Makefile	(working copy)
>@@ -12,10 +12,12 @@ COMMENT=	Production quality, multilayer 
> LICENSE=	APACHE20
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	PERL=${PREFIX}/bin/perl
>-CONFIGURE_ARGS+=SSL_LIBS=-lssl SSL_CFLAGS=-I/usr/include/openssl
>-USE_AUTOTOOLS=	autoconf automake
>+CONFIGURE_ARGS=	PERL=${PREFIX}/bin/perl \
>+		SSL_CFLAGS="-I${OPENSSLINC}" \
>+		SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
> USES=		gmake pkgconfig
>+USE_AUTOTOOLS=	autoconf automake
>+USE_OPENSSL=	yes
> USE_PYTHON=	yes
> USE_RC_SUBR=	ovs-vswitchd ovsdb-server
> 
>Index: net/packter-agent/Makefile
>===================================================================
>--- net/packter-agent/Makefile	(revision 365596)
>+++ net/packter-agent/Makefile	(working copy)
>@@ -41,18 +41,14 @@ PLIST_SUB+=	PACKTERTC=""
> PLIST_SUB+=	PACKTERTC="@comment "
> .endif
> 
>+post-patch:
>+	@${REINPLACE_CMD} 's/-lssl/-lcrypto/' ${WRKSRC}/configure
>+
> post-install:
> .if ${PORT_OPTIONS:MPACKTERTC}
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
> 	${CP} -pr ${WRKSRC}/packter_tc ${STAGEDIR}${DATADIR}/
> .endif
>-
>-.for f in packter.conf
>-	@if [ ! -f ${PREFIX}/etc/${f} ]; then \
>-		${CP} -p ${STAGEDIR}${PREFIX}/etc/${f}.sample ${STAGEDIR}/${PREFIX}/etc/${f} ; \
>-	fi
>-.endfor
>-
> .if ${PORT_OPTIONS:MDOCS}
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> .for f in ${PORTDOCS}
>Index: net/packter-agent/pkg-plist
>===================================================================
>--- net/packter-agent/pkg-plist	(revision 365596)
>+++ net/packter-agent/pkg-plist	(working copy)
>@@ -2,9 +2,7 @@ bin/pt_agent
> bin/pt_sflow
> bin/pt_netflow
> bin/pt_thmon
>-@unexec if cmp -s %D/etc/packter.conf.sample %D/etc/packter.conf; then rm -f %D/etc/packter.conf; fi
>-etc/packter.conf.sample
>-@exec [ -f %D/etc/packter.conf ] || cp -p %D/etc/packter.conf.sample %D/etc/packter.conf
>+@sample etc/packter.conf.sample
> %%PACKTERTC%%%%DATADIR%%/packter_tc/IPTB.pm
> %%PACKTERTC%%%%DATADIR%%/packter_tc/InterTrackMessage.xsd
> %%PACKTERTC%%%%DATADIR%%/packter_tc/btm.conf
>Index: net/udt/Makefile
>===================================================================
>--- net/udt/Makefile	(revision 365596)
>+++ net/udt/Makefile	(working copy)
>@@ -26,7 +26,7 @@ post-build:
> 	# Building sample applications:
> .for a in ${UDT_APPS}
> 	${CXX} ${CXXFLAGS} ${WRKSRC:H}/app/$a.cpp -o ${WRKSRC:H}/app/udt-$a \
>-	    -I${WRKSRC} -L${WRKSRC} -ludt
>+	    -I${WRKSRC} -L${WRKSRC} -ludt -pthread
> .endfor
> 
> .include <bsd.port.options.mk>
>Index: net/udt/files/BSDmakefile
>===================================================================
>--- net/udt/files/BSDmakefile	(revision 365596)
>+++ net/udt/files/BSDmakefile	(working copy)
>@@ -6,7 +6,7 @@ LIBDIR=	${PREFIX}/lib
> INCLUDEDIR=	${PREFIX}/include
> INCS=	udt.h
> 
>-LDADD=	-lmd -lpthread
>+LDADD=	-lmd -pthread
> 
> SRCS=	common.cpp window.cpp list.cpp buffer.cpp packet.cpp channel.cpp \
> 	queue.cpp ccc.cpp cache.cpp core.cpp epoll.cpp api.cpp
>Index: net/vortex/Makefile
>===================================================================
>--- net/vortex/Makefile	(revision 365596)
>+++ net/vortex/Makefile	(working copy)
>@@ -22,8 +22,8 @@ USE_GNOME=	glib20
> 
> do-build:
> 	cd ${WRKSRC} && ${CC} -c vortex.c -I${LOCALBASE}/include
>-	cd ${WRKSRC} && ${CC} -v -o vortex vortex.o -L${LOCALBASE}/lib ${LOCALBASE}/lib/libnids.a `${LIBNET_CONFIG} --libs` -lglib-2.0 -lgthread-2.0 -lpcap
>-	cd ${WRKSRC} && ${CC} -o xpipes xpipes.c ${PTHREAD_LIBS}
>+	cd ${WRKSRC} && ${CC} -v -o vortex vortex.o -L${LOCALBASE}/lib ${LOCALBASE}/lib/libnids.a `${LIBNET_CONFIG} --libs` -lglib-2.0 -lgthread-2.0 -lpcap -pthread
>+	cd ${WRKSRC} && ${CC} -o xpipes xpipes.c -pthread
> 
> do-install:
> 	${INSTALL_DATA}	${WRKSRC}/vortex.conf ${STAGEDIR}${PREFIX}/etc/vortex.conf.sample
>Index: net/wireshark/files/patch-Makefile.in
>===================================================================
>--- net/wireshark/files/patch-Makefile.in	(revision 365596)
>+++ net/wireshark/files/patch-Makefile.in	(working copy)
>@@ -1,10 +0,0 @@
>---- Makefile.in.orig	2010-08-29 18:20:27.000000000 -0400
>-+++ Makefile.in	2010-09-04 17:17:43.000000000 -0400
>-@@ -444,6 +444,7 @@ LIPO = @LIPO@
>- LN_S = @LN_S@
>- LTLIBOBJS = @LTLIBOBJS@
>- LUA_INCLUDES = @LUA_INCLUDES@
>-+LIBS = @LUA_LIBS@
>- LUA_LIBS = @LUA_LIBS@
>- LYNX = @LYNX@
>- MAKEINFO = @MAKEINFO@
>Index: net/wireshark/files/patch-epan_Makefile.in
>===================================================================
>--- net/wireshark/files/patch-epan_Makefile.in	(revision 365596)
>+++ net/wireshark/files/patch-epan_Makefile.in	(working copy)
>@@ -1,10 +0,0 @@
>---- epan/Makefile.in.orig	2014-07-31 15:23:19.000000000 -0400
>-+++ epan/Makefile.in	2014-08-09 22:55:55.000000000 -0400
>-@@ -150,6 +150,7 @@ DIST_COMMON = $(srcdir)/../Makefile.am.i
>- 	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
>- 	$(srcdir)/doxygen.cfg.in $(top_srcdir)/depcomp
>- @HAVE_WARNINGS_AS_ERRORS_TRUE@am__append_1 = -Werror
>-+LIBS = @LUA_LIBS@
>- EXTRA_PROGRAMS = reassemble_test$(EXEEXT) tvbtest$(EXEEXT) \
>- 	oids_test$(EXEEXT)
>- subdir = epan
>Index: net-im/hotot/Makefile
>===================================================================
>--- net-im/hotot/Makefile	(revision 365596)
>+++ net-im/hotot/Makefile	(working copy)
>@@ -22,6 +22,7 @@ USE_GNOME=	intltool
> INSTALLS_ICONS=	yes
> 
> CFLAGS+=	-I${LOCALBASE}/include		# does not uphold CPPFLAGS
>+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
> 
> OPTIONS_DEFINE=	GTK2 QT4 KDE4
> OPTIONS_DEFAULT=	GTK2 QT4
>Index: net-im/imspector/files/patch-Makefile
>===================================================================
>--- net-im/imspector/files/patch-Makefile	(revision 365596)
>+++ net-im/imspector/files/patch-Makefile	(working copy)
>@@ -8,7 +8,7 @@
>  
>  ##########
>  # Comment this out if you dont want SSL
>-@@ -7,11 +7,11 @@
>+@@ -7,27 +7,27 @@
>  
>  ##########
>  # Location of openssl installation
>@@ -22,7 +22,12 @@
>  
>  # For any distro
>  #ADD_PLUGINS = mysqlloggingplugin.so sqliteloggingplugin.so postgresqlloggingplugin.so dbfilterplugin.so dbresponderplugin.so
>-@@ -23,11 +23,11 @@
>+ ##########
>+ 
>+ ifdef SSL
>+-SSL_LIBS = -L$(SSL_DIR)/lib -lssl
>++SSL_LIBS = -L$(SSL_DIR)/lib -lssl -lcrypto
>+ SSL_FLAGS = -I$(SSL_DIR)/include -DHAVE_SSL
>  SSL_OBJS = sslstate.o
>  endif
>  
>Index: net-im/imspector/pkg-plist
>===================================================================
>--- net-im/imspector/pkg-plist	(revision 365596)
>+++ net-im/imspector/pkg-plist	(working copy)
>@@ -1,12 +1,6 @@
>-@unexec if cmp -s %D/%%ETCDIR%%/acl.txt.sample %D/%%ETCDIR%%/acl.txt; then rm -f %D/%%ETCDIR%%/acl.txt; fi
>-%%ETCDIR%%/acl.txt.sample
>-@exec if [ ! -f %D/%%ETCDIR%%/acl.txt ] ; then cp -p %D/%F %B/acl.txt; fi
>-@unexec if cmp -s %D/%%ETCDIR%%/badwords.txt.sample %D/%%ETCDIR%%/badwords.txt; then rm -f %D/%%ETCDIR%%/badwords.txt; fi
>-%%ETCDIR%%/badwords.txt.sample
>-@exec if [ ! -f %D/%%ETCDIR%%/badwords.txt ] ; then cp -p %D/%F %B/badwords.txt; fi
>-@unexec if cmp -s %D/%%ETCDIR%%/imspector.conf.sample %D/%%ETCDIR%%/imspector.conf; then rm -f %D/%%ETCDIR%%/imspector.conf; fi
>-%%ETCDIR%%/imspector.conf.sample
>-@exec if [ ! -f %D/%%ETCDIR%%/imspector.conf ] ; then cp -p %D/%F %B/imspector.conf; fi
>+@sample %%ETCDIR%%/acl.txt.sample
>+@sample %%ETCDIR%%/badwords.txt.sample
>+@sample %%ETCDIR%%/imspector.conf.sample
> @exec /bin/mkdir -p /var/lib/imspector
> @exec /bin/mkdir -p /var/log/imspector
> lib/imspector/aclfilterplugin.so
>Index: net-im/vqcc-gtk/Makefile
>===================================================================
>--- net-im/vqcc-gtk/Makefile	(revision 365596)
>+++ net-im/vqcc-gtk/Makefile	(working copy)
>@@ -14,9 +14,10 @@ LIB_DEPENDS=	libstartup-notification-1.s
> 
> USES=		pathfix gmake gettext pkgconfig
> USE_GNOME=	gnomeprefix gtk20
>+USE_XORG=	x11 xext xscrnsaver
> GNU_CONFIGURE=	yes
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> 
> .include <bsd.port.mk>
>Index: net-im/zephyr/files/patch-zhm__Makefile.in
>===================================================================
>--- net-im/zephyr/files/patch-zhm__Makefile.in	(revision 0)
>+++ net-im/zephyr/files/patch-zhm__Makefile.in	(working copy)
>@@ -0,0 +1,18 @@
>+--- zhm/Makefile.in.orig	2014-08-21 09:11:35 UTC
>++++ zhm/Makefile.in
>+@@ -27,13 +27,14 @@ CFLAGS=@CFLAGS@
>+ ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
>+ LDFLAGS=@LDFLAGS@
>+ HESIOD_LIBS=@HESIOD_LIBS@
>++LIBS=${LIBZEPHYR} -lcom_err ${HESIOD_LIBS} @LIBS@
>+ 
>+ OBJS=	timer.o queue.o zhm.o zhm_client.o zhm_server.o
>+ 
>+ all: zhm
>+ 
>+ zhm: ${OBJS} ${LIBZEPHYR}
>+-	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBZEPHYR} ${HESIOD_LIBS}
>++	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
>+ 
>+ .c.o:
>+ 	${CC} -c ${ALL_CFLAGS} $<
>
>Property changes on: net-im/zephyr/files/patch-zhm__Makefile.in
>___________________________________________________________________
>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: net-p2p/createtorrent/Makefile
>===================================================================
>--- net-p2p/createtorrent/Makefile	(revision 365596)
>+++ net-p2p/createtorrent/Makefile	(working copy)
>@@ -16,6 +16,9 @@ USE_OPENSSL=	yes
> 
> PLIST_FILES=	bin/createtorrent
> 
>+post-patch:
>+	@${REINPLACE_CMD} 's/-lssl/-lcrypto/' ${WRKSRC}/configure
>+
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
> 
>Index: net-p2p/gtorrentviewer/Makefile
>===================================================================
>--- net-p2p/gtorrentviewer/Makefile	(revision 365596)
>+++ net-p2p/gtorrentviewer/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> 
> PORTNAME=	gtorrentviewer
> PORTVERSION=	0.2b
>-PORTREVISION=	17
>+PORTREVISION=	18
> CATEGORIES=	net-p2p
> MASTER_SITES=	SF/${PORTNAME}/GTorrentViewer/${PORTVERSION}
> DISTNAME=	GTorrentViewer-${PORTVERSION}
>@@ -13,33 +13,21 @@ MAINTAINER=	5u623l20@gmail.com
> COMMENT=	GTK+2 viewer and editor for BitTorrent meta files
> 
> LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
> 
>-USE_GNOME=	gtk20 gnomehier intlhack
> USES=		gmake pkgconfig
>+USE_GNOME=	gtk20 gnomehier intlhack
> GNU_CONFIGURE=	yes
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
> CONFIGURE_ARGS=	--with-pixmapsdir=${PREFIX}/share/pixmaps \
> 		--with-desktopdir=${PREFIX}/share/applications
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib -lm
> 
> PORTSCOUT=	skipv:0.2	# older than current version
> 
>-OPTIONS_DEFINE=	DOCS
>-
>-DOCS=		AUTHORS COPYING ChangeLog README
>-
>-.include <bsd.port.options.mk>
> post-patch:
> 	@${REINPLACE_CMD} -e '/<curl\/types.h>/d' ${WRKSRC}/src/main.c
> 
>-post-install:
>-.if ${PORT_OPTIONS:MDOCS}
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-.for i in ${DOCS}
>-	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
>-.endfor
>-.endif
>-
> .include <bsd.port.mk>
>Index: net-p2p/gtorrentviewer/pkg-plist
>===================================================================
>--- net-p2p/gtorrentviewer/pkg-plist	(revision 365596)
>+++ net-p2p/gtorrentviewer/pkg-plist	(working copy)
>@@ -13,13 +13,8 @@ share/GTorrentViewer/pixmaps/ok.png
> share/GTorrentViewer/pixmaps/string.png
> share/GTorrentViewer/pixmaps/unknown.png
> share/GTorrentViewer/pixmaps/warning.png
>-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>-%%PORTDOCS%%%%DOCSDIR%%/COPYING
>-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>-%%PORTDOCS%%%%DOCSDIR%%/README
> share/applications/gtorrentviewer.desktop
> share/pixmaps/gtorrentviewer.png
> share/pixmaps/gtorrentviewer.xpm
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrm share/GTorrentViewer/pixmaps
> @dirrm share/GTorrentViewer
>Index: net-p2p/libbt/Makefile
>===================================================================
>--- net-p2p/libbt/Makefile	(revision 365596)
>+++ net-p2p/libbt/Makefile	(working copy)
>@@ -23,6 +23,7 @@ PORTDOCS=	protocol-ext.txt protocol.txt
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|depend||' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e 's|-lssl|-lcrypto|' ${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e 's|$CFLAGS:=$|\1\@CFLAGS\@ \@CPPFLAGS\@ |' ${WRKSRC}/src/Makefile.in
> 
> do-install:
>Index: net-p2p/retroshare/Makefile
>===================================================================
>--- net-p2p/retroshare/Makefile	(revision 365596)
>+++ net-p2p/retroshare/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	retroshare
> PORTVERSION=	0.5.5c
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net-p2p
> MASTER_SITES=	SF
> MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
>@@ -14,31 +14,18 @@ COMMENT=	Private and secure decentralise
> 
> LICENSE=	GPLv2
> 
>-BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf \
>-		pkg-config:${PORTSDIR}/devel/pkgconf
>-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
>-		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
>-		libpcre.so:${PORTSDIR}/devel/pcre \
>-		libupnp.so:${PORTSDIR}/devel/upnp \
>-		libpng15.so:${PORTSDIR}/graphics/png \
>-		libfreetype.so:${PORTSDIR}/print/freetype2 \
>-		libassuan.so:${PORTSDIR}/security/libassuan \
>-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
>+BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf
>+LIB_DEPENDS=	libupnp.so:${PORTSDIR}/devel/upnp \
> 		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
>-		libgpg-error.so:${PORTSDIR}/security/libgpg-error \
>-		libgpgme.so:${PORTSDIR}/security/gpgme \
>-		libexpat.so:${PORTSDIR}/textproc/expat2 \
>-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
> 		libspeex.so:${PORTSDIR}/audio/speex \
> 		libxslt.so:${PORTSDIR}/textproc/libxslt \
> 		libssh_threads.so:${PORTSDIR}/security/libssh
>-RUN_DEPENDS=	pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
> 
>-USES=		compiler:features dos2unix qmake
>+USES=		compiler:features dos2unix pkgconfig qmake
> USE_GNOME=	glib20
>-USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
>+USE_XORG=	x11 xscrnsaver
> USE_QT4=	corelib gui network xml script designer_build uic_build \
>-		qmake_build moc_build rcc_build multimedia
>+		qmake_build moc_build rcc_build
> HAS_CONFIGURE=	yes
> 
> BINARY=		RetroShare
>Index: net-p2p/retroshare/files/patch-retroshare-gui__src__retroshare-gui.pro
>===================================================================
>--- net-p2p/retroshare/files/patch-retroshare-gui__src__retroshare-gui.pro	(revision 365596)
>+++ net-p2p/retroshare/files/patch-retroshare-gui__src__retroshare-gui.pro	(working copy)
>@@ -1,24 +1,29 @@
> --- retroshare-gui/src/retroshare-gui.pro.orig	2014-04-10 13:28:51.661832058 +0200
> +++ retroshare-gui/src/retroshare-gui.pro	2014-04-10 13:29:31.092831413 +0200
>-@@ -215,17 +215,19 @@
>+@@ -215,17 +215,22 @@ macx {
>  freebsd-* {
>  	INCLUDEPATH *= /usr/local/include/gpgme
>  	LIBS *= ../../libretroshare/src/lib/libretroshare.a
> +	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
>  	LIBS *= -lssl
>- 	LIBS *= -lgpgme
>+-	LIBS *= -lgpgme
> -	LIBS *= -lupnp
>++	LIBS *= -lcrypto
>++	LIBS *= -lz
> +	LIBS *= -lupnp -lixml
>++	LIBS *= -lXss -lX11
>  	LIBS *= -lgnome-keyring
>  	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
> +	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
>  
>          gxs {
>                  LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
>-                 LIBS += -lsqlite3
>+-                LIBS += -lsqlite3
>++                LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
>          }
> -
> +	LIBS *= -rdynamic
>++	DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
>  }
>  
>  ##################################### OpenBSD ######################################
>Index: net-p2p/retroshare/files/patch-retroshare-nogui__src__retroshare-nogui.pro
>===================================================================
>--- net-p2p/retroshare/files/patch-retroshare-nogui__src__retroshare-nogui.pro	(revision 365596)
>+++ net-p2p/retroshare/files/patch-retroshare-nogui__src__retroshare-nogui.pro	(working copy)
>@@ -1,21 +1,26 @@
> --- retroshare-nogui/src/retroshare-nogui.pro.orig	2014-04-10 14:14:22.622840778 +0200
> +++ retroshare-nogui/src/retroshare-nogui.pro	2014-04-10 14:14:55.384836372 +0200
>-@@ -114,12 +114,16 @@
>+@@ -114,12 +114,20 @@ macx {
>  
>  freebsd-* {
>  	INCLUDEPATH *= /usr/local/include/gpgme
> +	QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
>  	LIBS *= ../../libretroshare/src/lib/libretroshare.a
> -	LIBS *= -lssl
>+-	LIBS *= -lgpgme
>+-	LIBS *= -lupnp
> +	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
> +	LIBS *= -lssl -lcrypto
>- 	LIBS *= -lgpgme
>--	LIBS *= -lupnp
>++	LIBS *= -lz
> +	LIBS *= -lupnp -lixml
>  	LIBS *= -lgnome-keyring
>  	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
> +	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
> +	LIBS *= -rdynamic
>++	gxs {
>++		# We need a explicit path here, to force using the home version
>++		LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
>++	}
>  }
>  
>  ##################################### OpenBSD  ######################################
>Index: polish/tleenx2/Makefile
>===================================================================
>--- polish/tleenx2/Makefile	(revision 365596)
>+++ polish/tleenx2/Makefile	(working copy)
>@@ -24,7 +24,8 @@ WRKSRC=		${WRKDIR}/TleenX2-${PORTVERSION
> PORTDOCS=	README gg.txt sms.txt
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/src/Makefile.in
>+	@${REINPLACE_CMD} 's,/usr/X11R6/lib/libXss.a,-lXss,' \
>+		${WRKSRC}/src/Makefile.in
> 	@${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},g; s,gcc,${CC},' \
> 		${WRKSRC}/iksemel/Makefile
> 	@${REINPLACE_CMD} 's,gcc,${CC},' ${WRKSRC}/jabby/Makefile
>Index: ports-mgmt/fbsdmon/Makefile
>===================================================================
>--- ports-mgmt/fbsdmon/Makefile	(revision 365596)
>+++ ports-mgmt/fbsdmon/Makefile	(working copy)
>@@ -16,6 +16,9 @@ LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/
> SUB_FILES=	600.fbsdmon pkg-message
> USE_RC_SUBR=	fbsdmon
> 
>+post-patch:
>+	@${REINPLACE_CMD} '/^LIBS =/s/$$/ -lz/' ${WRKSRC}/Makefile
>+
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/fbsdmon ${STAGEDIR}${PREFIX}/sbin
> 	${MKDIR} ${STAGEDIR}/var/db/fbsdmon
>Index: print/ggv/Makefile
>===================================================================
>--- print/ggv/Makefile	(revision 365596)
>+++ print/ggv/Makefile	(working copy)
>@@ -14,7 +14,8 @@ COMMENT=	GNOME 2 ghostscript viewer
> 
> INSTALLS_OMF=	yes
> USE_GNOME=	gnomeprefix intlhack libgnomeui
>-USES=		desktop-file-utils gettext gmake pathfix pkgconfig tar:bzip2
>+USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
>+		tar:bzip2
> USE_GHOSTSCRIPT=yes
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>@@ -23,4 +24,7 @@ INSTALL_TARGET=	install-strip
> 
> GCONF_SCHEMAS=	ggv.schemas
> 
>+post-patch:
>+	@${REINPLACE_CMD} '/^ggv_LDADD =/s/$$/ -lm/' ${WRKSRC}/src/Makefile.in
>+
> .include <bsd.port.mk>
>Index: print/ggv/files/patch-src_Makefile.in
>===================================================================
>--- print/ggv/files/patch-src_Makefile.in	(revision 365596)
>+++ print/ggv/files/patch-src_Makefile.in	(working copy)
>@@ -1,11 +0,0 @@
>---- src/Makefile.in.orig	Sun Dec  5 18:19:25 2004
>-+++ src/Makefile.in	Sun Dec  5 18:20:13 2004
>-@@ -142,7 +142,7 @@
>- 
>- SUBDIRS = recent-files stock cursors
>- 
>--INCLUDES =  	-I$(top_srcdir)/recent-files				-DG_LOG_DOMAIN=\"GGV\"					-DGNOMELOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\"		-DGNOMEICONDIR=\""${prefix}/${DATADIRNAME}/pixmaps"\"			-DDATADIR=\""$(datadir)"\"				$(GGV_CFLAGS)						$(GGV_DEPRECATED_CFLAGS)
>-+INCLUDES =  	-I$(top_srcdir)/recent-files				-DG_LOG_DOMAIN=\"GGV\"					-DGNOMELOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\"		-DGNOMEICONDIR=\""${datadir}/pixmaps"\"			-DDATADIR=\""$(datadir)"\"				$(GGV_CFLAGS)						$(GGV_DEPRECATED_CFLAGS)
>- 
>- 
>- bin_PROGRAMS = ggv
>Index: print/ggv/pkg-plist
>===================================================================
>--- print/ggv/pkg-plist	(revision 365596)
>+++ print/ggv/pkg-plist	(working copy)
>@@ -148,7 +148,6 @@ share/locale/zh_TW/LC_MESSAGES/ggv.mo
> @dirrm share/gnome/help/ggv/C/figures
> @dirrm share/gnome/help/ggv/C
> @dirrm share/gnome/help/ggv
>-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
> @dirrmtry share/locale/xh/LC_MESSAGES
> @dirrmtry share/locale/xh
> @dirrmtry share/locale/rw/LC_MESSAGES
>Index: print/gnome-cups-manager/Makefile
>===================================================================
>--- print/gnome-cups-manager/Makefile	(revision 365596)
>+++ print/gnome-cups-manager/Makefile	(working copy)
>@@ -19,11 +19,12 @@ RUN_DEPENDS=	gnomesu:${PORTSDIR}/securit
> USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
> USE_GNOME=	gnomeprefix intlhack libgnomeprintui libgnomeui
> USE_LDCONFIG=	yes
>+USE_XORG=	x11
> INSTALLS_ICONS=	yes
> INSTALL_TARGET=	install-strip
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include -D_IPP_PRIVATE_STRUCTURES
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib
> 
> post-patch:
> 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \
>@@ -31,6 +32,8 @@ post-patch:
> 		> ${WRKSRC}/gnome-cups-manager.desktop
> 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
> 		's|-D.*_DISABLE_DEPRECATED||g'
>+	@${REINPLACE_CMD} '/^gnome_cups_icon_LDADD =/s/$$/ -lX11/' \
>+		${WRKSRC}/gnome-cups-manager/Makefile.in
> 	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \
> 		${WRKSRC}/libgnomecups/gnome-cups-ui-driver.c
> 	@${REINPLACE_CMD} -e 's|glib/gmacros.h>|glib.h>|g' \
>Index: print/photoprint/Makefile
>===================================================================
>--- print/photoprint/Makefile	(revision 365596)
>+++ print/photoprint/Makefile	(working copy)
>@@ -12,24 +12,21 @@ COMMENT=	Utility to print multiple image
> LICENSE=	GPLv2
> 
> LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client \
>-		libexpat.so:${PORTSDIR}/textproc/expat2 \
>-		libgdk_pixbuf-2.0.so:${PORTSDIR}/graphics/gdk-pixbuf2 \
> 		libgutenprint.so:${PORTSDIR}/print/gutenprint \
>+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
> 		liblcms.so:${PORTSDIR}/graphics/lcms \
> 		libnetpbm.so:${PORTSDIR}/graphics/netpbm \
>-		libpcre.so:${PORTSDIR}/devel/pcre \
>-		libpng15.so:${PORTSDIR}/graphics/png \
>-		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
>+		libpng.so:${PORTSDIR}/graphics/png \
> 		libtiff.so:${PORTSDIR}/graphics/tiff
> 
> GNU_CONFIGURE=	yes
>-USES=		desktop-file-utils gettext pkgconfig
>-USE_GNOME=	pango
>-USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
>-		xfixes xi xinerama xrandr xrender
>+USES=		desktop-file-utils gettext libtool pkgconfig
>+USE_GNOME=	gdkpixbuf2 gtk20
>+USE_XORG=	x11
> INSTALLS_ICONS=	yes
> 
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|glib/gstrfuncs.h|glib.h|g' \
>Index: print/xfce4-print/Makefile
>===================================================================
>--- print/xfce4-print/Makefile	(revision 365596)
>+++ print/xfce4-print/Makefile	(working copy)
>@@ -32,7 +32,7 @@ OPTIONS_SINGLE_PRINTMETHOD=	LPR CUPS
> LETTER_DESC=	Use letter paper format instead of A4
> LPR_DESC=	LPR printing system support
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MCUPS}
> CONFIGURE_ARGS+=--enable-cups
>@@ -58,7 +58,8 @@ CONFIGURE_ARGS+=--disable-letter
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's/@LDFLAGS@/& -Wl,-E/' ${WRKSRC}/xfprint/Makefile.in \
>-		 ${WRKSRC}/xfprint-manager/Makefile.in
>+	@${REINPLACE_CMD} '/_LDADD =/s/=/= -lX11/' \
>+		${WRKSRC}/xfprint/Makefile.in \
>+		${WRKSRC}/xfprint-manager/Makefile.in
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: science/chemtool/Makefile
>===================================================================
>--- science/chemtool/Makefile	(revision 365596)
>+++ science/chemtool/Makefile	(working copy)
>@@ -10,22 +10,21 @@ MASTER_SITES=	http://ruby.chemie.uni-fre
> MAINTAINER=	maho@FreeBSD.org
> COMMENT=	Draw organic molecules easily and store them
> 
>+LIB_DEPENDS=	libEMF.so:${PORTSDIR}/graphics/libemf
> RUN_DEPENDS=	transfig:${PORTSDIR}/print/transfig
> 
>-USE_GNOME=	gtk20
> USES=		gmake pkgconfig
>+USE_GNOME=	gtk20
>+USE_XORG=	x11
> GNU_CONFIGURE=	yes
>-CFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libEMF
>+LIBS+=		-L${LOCALBASE}/lib
> CONFIGURE_ARGS=	--enable-emf=yes --with-localedir=${PREFIX}
> 
> OPTIONS_DEFINE=	EXAMPLES
> 
>-.include <bsd.port.pre.mk>
>-
>-#isolate libEMF stuff
>-LIB_DEPENDS+=	libEMF.so:${PORTSDIR}/graphics/libemf
>-CFLAGS+=	-I${LOCALBASE}/include/libEMF
>+post-patch:
>+	@${REINPLACE_CMD} 's/-lstdc++//' ${WRKSRC}/configure
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/chemtool ${STAGEDIR}${PREFIX}/bin
>@@ -36,4 +35,4 @@ do-install:
> 	cd ${WRKSRC}/examples && ${FIND} . | \
> 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: science/chemtool/files/patch-Makefile.in
>===================================================================
>--- science/chemtool/files/patch-Makefile.in	(revision 365596)
>+++ science/chemtool/files/patch-Makefile.in	(working copy)
>@@ -5,7 +5,7 @@
>  
>  # Link time dependencies.
> -LDADD = @LIBINTL@ @GTK_LIBS@
>-+LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@
>++LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@ -lX11
>  
>  # Additional files to be distributed.
>  EXTRA_DIST = autogen.sh autoclean.sh
>Index: science/chemtool-devel/Makefile
>===================================================================
>--- science/chemtool-devel/Makefile	(revision 365596)
>+++ science/chemtool-devel/Makefile	(working copy)
>@@ -17,26 +17,22 @@ RUN_DEPENDS=	transfig:${PORTSDIR}/print/
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-1.7alpha15/
> USE_GNOME=	gtk20
>-#USE_AUTOTOOLS=	autoconf213
>+USE_XORG=	x11
> GNU_CONFIGURE=	yes
> USES=		gettext gmake pkgconfig tar:tgz
> CONFIGURE_ARGS=	--enable-emf=yes
> PKGNAMESUFFIX=	-devel
> MAKE_ARGS+=	MAKE=${MAKE_CMD}
> MAKE_JOBS_UNSAFE=	yes
>-#to include emf
>-CFLAGS+=	-I${LOCALBASE}/include/libEMF
>-CXXFLAGS+=	-I${LOCALBASE}/include/libEMF
>+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libEMF
>+LIBS+=		-L${LOCALBASE}/lib
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+g;' ${WRKSRC}/configure.in
>-	@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+g;' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} 's/-lstdc++//' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} '/^SYS_LIBRARIES =/s/$$/ -lX11/' ${WRKSRC}/Makefile.in
> 
> post-install:
>-	@(cd ${WRKSRC}; \
>-		${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/chemtool/; \
>-		cd ${WRKSRC}/examples/; \
>-		${INSTALL_DATA} * ${STAGEDIR}${PREFIX}/share/examples/chemtool; \
>-	)
>+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
> 
> .include <bsd.port.mk>
>Index: science/gsmc/Makefile
>===================================================================
>--- science/gsmc/Makefile	(revision 365596)
>+++ science/gsmc/Makefile	(working copy)
>@@ -12,10 +12,11 @@ COMMENT=	Smith chart program for impedan
> 
> USE_GNOME=	gtk20
> GNU_CONFIGURE=	yes
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
> USES=		gmake pkgconfig
> USE_AUTOTOOLS=	aclocal automake autoconf
>-AUTOMAKE_ARGS=	-i --add-missing --foreign --copy
>+AUTOMAKE_ARGS=	-i --add-missing --foreign --copy --force
>+
>+post-patch:
>+	@${REINPLACE_CMD} '/^LIBS=/s/$$/ -lm/' ${WRKSRC}/Makefile.am
> 
> .include <bsd.port.mk>
>Index: science/medit/files/patch-makefile
>===================================================================
>--- science/medit/files/patch-makefile	(revision 365596)
>+++ science/medit/files/patch-makefile	(working copy)
>@@ -16,7 +16,7 @@
> +	$(MAKE) $(MFLAGS) -f Makefile.arch \
> +        "prog   = medit" \
> +        "INCDIR = -I. -I$(WRKSRC)/sources -I$(LOCALBASE)/include" \
>-+	"XLIBS  = -L$(LOCALBASE)/lib -lXmu -lXext -lX11 -lpmc" \
>++	"XLIBS  = -L$(LOCALBASE)/lib -lXmu -lXext -lX11 -lpmc -pthread" \
> +        "GL_LIB   = -lGL" \
> +	"GLU_LIB  = -lGLU" \
> +	"GLUT_LIB = -lglut" \
>Index: security/gnome-gpg/Makefile
>===================================================================
>--- security/gnome-gpg/Makefile	(revision 365596)
>+++ security/gnome-gpg/Makefile	(working copy)
>@@ -19,6 +19,7 @@ USES=		pkgconfig tar:bzip2
> GNU_CONFIGURE=	yes
> USE_GNOME=	libgnomeui
> CONFIGURE_ENV=	set_more_warnings="no"
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> 
> PLIST_FILES=	bin/gnome-gpg \
> 		man/man1/gnome-gpg.1.gz
>Index: security/opensc/Makefile
>===================================================================
>--- security/opensc/Makefile	(revision 365596)
>+++ security/opensc/Makefile	(working copy)
>@@ -32,7 +32,7 @@ INSTALL_TARGET=	install-strip
> 
> CONFIGURE_ENV=	\
> 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
>-		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl" \
>+		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \
> 		XSLTPROC="${LOCALBASE}/bin/xsltproc"
> 
> CONFIGURE_ARGS=	--with-xsl-stylesheetsdir=${LOCALBASE}/share/xsl/docbook
>Index: security/pkcs11-dump/Makefile
>===================================================================
>--- security/pkcs11-dump/Makefile	(revision 365596)
>+++ security/pkcs11-dump/Makefile	(working copy)
>@@ -16,7 +16,7 @@ USE_OPENSSL=	yes
> GNU_CONFIGURE=	yes
> 
> CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
>-		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"
>+		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
> 
> PLIST_FILES=	bin/pkcs11-dump \
> 		man/man1/pkcs11-dump.1.gz
>Index: security/rainbowcrack/Makefile
>===================================================================
>--- security/rainbowcrack/Makefile	(revision 365596)
>+++ security/rainbowcrack/Makefile	(working copy)
>@@ -18,7 +18,9 @@ BROKEN=		does not compile on ia64, power
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|g++|$$(CXX) $$(CXXFLAGS)|; s|\-O3||' \
>+	@${REINPLACE_CMD} \
>+		-e 's|g++|$$(CXX) $$(CXXFLAGS)|' -e 's|-O3||' \
>+		-e 's/-lssl/-lcrypto/' \
> 		${WRKSRC}/${MAKEFILE}
> 
> do-install:
>Index: security/tpm-tools/Makefile
>===================================================================
>--- security/tpm-tools/Makefile	(revision 365596)
>+++ security/tpm-tools/Makefile	(working copy)
>@@ -22,8 +22,11 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/tcsd:${PO
> 
> USES=		gettext gmake iconv libtool
> USE_LDCONFIG=	YES
>-USE_AUTOTOOLS=	autoconf
> GNU_CONFIGURE=	YES
>-LDFLAGS+=	-L${LOCALBASE}/lib -lintl ${ICONV_LIB}
>+LIBS+=		-L${LOCALBASE}/lib -lintl
>+
>+post-patch:
>+	@${REINPLACE_CMD} '/^libtpm_unseal_la_LIBADD =/s/$$/ -lcrypto/' \
>+		${WRKSRC}/lib/Makefile.in
> 
> .include <bsd.port.mk>
>Index: sysutils/battfink/Makefile
>===================================================================
>--- sysutils/battfink/Makefile	(revision 365596)
>+++ sysutils/battfink/Makefile	(working copy)
>@@ -17,7 +17,7 @@ USE_GNOME=	gnomeprefix libgnomeui
> USES=		gettext gmake pathfix pkgconfig tar:bzip2
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> INSTALL_TARGET=	install-strip
> 
> GCONF_SCHEMAS=	battfink.schemas
>Index: sysutils/battfink/files/patch-configure
>===================================================================
>--- sysutils/battfink/files/patch-configure	(revision 365596)
>+++ sysutils/battfink/files/patch-configure	(working copy)
>@@ -1,11 +0,0 @@
>---- configure.orig	Sat Apr 12 01:31:11 2003
>-+++ configure	Sat Apr 12 01:31:27 2003
>-@@ -7481,7 +7481,7 @@
>- 
>- 
>- cat >>confdefs.h <<_ACEOF
>--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
>-+#define GNOME_ICONDIR "${datadir}/pixmaps"
>- _ACEOF
>- 
>- 
>Index: sysutils/fusefs-encfs/Makefile
>===================================================================
>--- sysutils/fusefs-encfs/Makefile	(revision 365596)
>+++ sysutils/fusefs-encfs/Makefile	(working copy)
>@@ -33,6 +33,8 @@ NLS_USES=	gettext
> NLS_CONFIGURE_ENABLE=	nls
> 
> post-patch:
>+	@${REINPLACE_CMD} '/OPENSSL_LIBS=/s/-lssl/& -lcrypto/' \
>+		${WRKSRC}/configure
> 	@${FIND} ${WRKSRC}/encfs -type f | ${XARGS} ${REINPLACE_CMD} -E \
> 		's/(^|[[:space:]])(shared_ptr)/\1boost::\2/g'
> 
>Index: sysutils/fusefs-rar2fs/Makefile
>===================================================================
>--- sysutils/fusefs-rar2fs/Makefile	(revision 365596)
>+++ sysutils/fusefs-rar2fs/Makefile	(working copy)
>@@ -14,8 +14,7 @@ COMMENT=	Mount rar archives as filesyste
> 
> LICENSE=	GPLv3
> 
>-LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
>-		libunrar.so:${PORTSDIR}/archivers/libunrar4
>+LIB_DEPENDS=	libunrar.so:${PORTSDIR}/archivers/libunrar4
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-fuse-lib=${LOCALBASE}/lib \
>@@ -24,10 +23,11 @@ CONFIGURE_ARGS=	--with-fuse-lib=${LOCALB
> 	--with-unrar-lib=${LOCALBASE}/lib
> 
> PLIST_FILES=	bin/${PORTNAME} man/man1/rar2fs.1.gz
>-USES=		fuse gmake
>+USES=		execinfo fuse gmake
> 
> post-patch:
>-	@${REINPLACE_CMD} 's/-lstdc++/-lexecinfo/' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e 's/-lstdc++/-lexecinfo/' -e '/_LINK =/s/CC/CXX/' \
>+		${WRKSRC}/Makefile.in
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
>Index: sysutils/gapcmon/Makefile
>===================================================================
>--- sysutils/gapcmon/Makefile	(revision 365596)
>+++ sysutils/gapcmon/Makefile	(working copy)
>@@ -14,7 +14,9 @@ LICENSE=	GPLv2
> SUB_FILES=	pkg-message
> USE_GNOME=	gconf2
> USES=		pkgconfig gmake tar:bzip2
>+USE_XORG=	x11
> GNU_CONFIGURE=	yes
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> 
> OPTIONS_DEFINE=	DOCS
> 
>Index: sysutils/gnome-system-tools/Makefile
>===================================================================
>--- sysutils/gnome-system-tools/Makefile	(revision 365596)
>+++ sysutils/gnome-system-tools/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> 
> PORTNAME=	gnome-system-tools
> PORTVERSION=	2.32.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	sysutils gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome2
>@@ -16,19 +16,20 @@ LIB_DEPENDS=	liboobs-1.so:${PORTSDIR}/de
> 		libpolkit-gtk-1.so:${PORTSDIR}/sysutils/polkit-gnome
> 
> INSTALLS_ICONS=	yes
>-USES=		gettext gmake pathfix pkgconfig tar:bzip2
>+USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
> USE_LDCONFIG=	yes
> USE_GNOME=	gnomeprefix intlhack nautilus2
>-USE_AUTOTOOLS=	libtool
> INSTALLS_OMF=	yes
>-CONFIGURE_ARGS=	--enable-services
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--disable-static --enable-services
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib
> 
> GLIB_SCHEMAS=	org.gnome.system-tools.gschema.xml
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|gmodule-export-2.0|gmodule-export-2.0 gthread-2.0|g' \
> 		${WRKSRC}/configure
>+	@${REINPLACE_CMD} '/^time_admin_LDADD =/s/$$/ -lm/' ${WRKSRC}/src/time/Makefile.in
> 
> .include <bsd.port.mk>
>Index: sysutils/gnome-system-tools/pkg-plist
>===================================================================
>--- sysutils/gnome-system-tools/pkg-plist	(revision 365596)
>+++ sysutils/gnome-system-tools/pkg-plist	(working copy)
>@@ -4,8 +4,6 @@ bin/shares-admin
> bin/time-admin
> bin/users-admin
> etc/gnome-system-tools/user-profiles.conf
>-lib/nautilus/extensions-2.0/libnautilus-gst-shares.a
>-lib/nautilus/extensions-2.0/libnautilus-gst-shares.la
> lib/nautilus/extensions-2.0/libnautilus-gst-shares.so
> libdata/pkgconfig/gnome-system-tools.pc
> share/applications/network.desktop
>Index: sysutils/gtk-imonc/Makefile
>===================================================================
>--- sysutils/gtk-imonc/Makefile	(revision 365596)
>+++ sysutils/gtk-imonc/Makefile	(working copy)
>@@ -12,22 +12,12 @@ COMMENT=	GTK2-based imond-client to cont
> 
> LICENSE=	GPLv2 # (or later)
> 
>-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
>-		libpcre.so:${PORTSDIR}/devel/pcre \
>-		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
>-
> GNU_CONFIGURE=	yes
> USES=		pkgconfig gettext iconv
>-USE_GNOME=	gdkpixbuf2 gtk20
>-USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
>-		xfixes xi xinerama xrandr xrender
>-
>+USE_GNOME=	gtk20
>+USE_XORG=	x11
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> 
> post-patch:
> 	@${REINPLACE_CMD} -e \
>Index: sysutils/ldapvi/Makefile
>===================================================================
>--- sysutils/ldapvi/Makefile	(revision 365596)
>+++ sysutils/ldapvi/Makefile	(working copy)
>@@ -22,7 +22,7 @@ GNU_CONFIGURE=	yes
> MAKEFILE=	GNUmakefile
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib
> 
> PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz \
> 		${DOCSDIR_REL}/manual.css ${DOCSDIR_REL}/manual.xml \
>@@ -34,4 +34,7 @@ PLIST_DIRS=	${DOCSDIR_REL}
> CONFIGURE_ARGS=	--without-sasl
> .endif
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e 's/-lssl/-lcrypto/' ${WRKSRC}/configure
>+
> .include <bsd.port.mk>
>Index: sysutils/libgksu/Makefile
>===================================================================
>--- sysutils/libgksu/Makefile	(revision 365596)
>+++ sysutils/libgksu/Makefile	(working copy)
>@@ -17,12 +17,17 @@ LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/
> RUN_DEPENDS=	xauth:${PORTSDIR}/x11/xauth \
> 		sudo:${PORTSDIR}/security/sudo
> 
>-USES=		desktop-file-utils gmake libtool pkgconfig
>+USES=		gmake libtool pathfix pkgconfig
> USE_GNOME=	glib20 gconf2
> USE_LDCONFIG=	yes
>+USE_XORG=	x11
> CONFIGURE_ARGS=	--enable-gtk-doc=no
> GNU_CONFIGURE=	yes
> GCONF_SCHEMAS=	gksu.schemas
>-LIBS+=		`pkg-config --libs gtk+-x11-2.0`
>+INSTALL_TARGET=	install-strip
>+
>+post-patch:
>+	@${REINPLACE_CMD} '/^libgksuui1_0_la_LIBADD =/s/$$/ -lX11/' \
>+		${WRKSRC}/libgksuui/Makefile.in
> 
> .include <bsd.port.mk>
>Index: sysutils/libgksu/files/patch-libgksu_Makefile.in
>===================================================================
>--- sysutils/libgksu/files/patch-libgksu_Makefile.in	(revision 365596)
>+++ sysutils/libgksu/files/patch-libgksu_Makefile.in	(working copy)
>@@ -5,16 +5,7 @@
>  top_builddir = @top_builddir@
>  top_srcdir = @top_srcdir@
> -AM_CFLAGS = -g -O2 -Wall
>-+AM_CFLAGS = $(CFLAGS)
>++AM_CFLAGS =
>  INCLUDES = ${LIBGKSU_CFLAGS}
>  AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
>  lib_LTLIBRARIES = libgksu2.la
>-@@ -280,7 +280,7 @@
>- 	${LIBGKSU_LIBS} $(am__append_1)
>- noinst_HEADERS = defines.h
>- include_HEADERS = gksu.h libgksu.h
>--pkgconfigdir = ${libdir}/pkgconfig
>-+pkgconfigdir = ${prefix}/libdata/pkgconfig
>- pkgconfig_DATA = libgksu2.pc
>- gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
>- gksu_run_helper_SOURCES = gksu-run-helper.c
>Index: sysutils/nitrogen/Makefile
>===================================================================
>--- sysutils/nitrogen/Makefile	(revision 365596)
>+++ sysutils/nitrogen/Makefile	(working copy)
>@@ -13,19 +13,6 @@ COMMENT=	Background browser and setter f
> LICENSE=	GPLv2 # (or later)
> 
> BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
>-LIB_DEPENDS=	libatkmm-1.6.so:${PORTSDIR}/accessibility/atkmm \
>-		libglibmm-2.4.so:${PORTSDIR}/devel/glibmm \
>-		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
>-		libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
>-		libpcre.so:${PORTSDIR}/devel/pcre \
>-		libcairo.so:${PORTSDIR}/graphics/cairo \
>-		libcairomm-1.0.so:${PORTSDIR}/graphics/cairomm \
>-		libpng15.so:${PORTSDIR}/graphics/png \
>-		libfreetype.so:${PORTSDIR}/print/freetype2 \
>-		libexpat.so:${PORTSDIR}/textproc/expat2 \
>-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
>-		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
>-		libpangomm-1.4.so:${PORTSDIR}/x11-toolkits/pangomm
> RUN_DEPENDS=	gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
> 		hicolor-icon-theme>0:${PORTSDIR}/misc/hicolor-icon-theme
> 
>@@ -33,15 +20,14 @@ OPTIONS_DEFINE=	XINERAMA
> OPTIONS_DEFAULT=XINERAMA
> 
> USES=		gettext iconv pkgconfig
>-USE_GNOME=	gtk20
>-USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \
>-		xrandr xrender
>+USE_GNOME=	gtkmm24
>+USE_XORG=	x11
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-inotify
> INSTALLS_ICONS=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> 
> DESKTOP_ENTRIES="Nitrogen" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \
> 		"Graphics;Viewer;" true
>@@ -58,5 +44,6 @@ CONFIGURE_ARGS+=--disable-xinerama
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
> 		${WRKSRC}/data/icon-theme-installer
>+	@${REINPLACE_CMD} '/^LIBS =/s/$$/ @LIBS@/' ${WRKSRC}/src/Makefile.in
> 
> .include <bsd.port.mk>
>Index: sysutils/nvclock/Makefile
>===================================================================
>--- sysutils/nvclock/Makefile	(revision 365596)
>+++ sysutils/nvclock/Makefile	(working copy)
>@@ -50,5 +50,7 @@ post-patch:
> 	@${REINPLACE_CMD} -E '/exec_prefix|bindir/s|\$$$DESTDIR$||' \
> 		${WRKSRC}/src/gtk/Makefile.in \
> 		${WRKSRC}/src/qt/Makefile.in
>+	@${REINPLACE_CMD} 's/-lnvcontrol/& @X11_LIBS@/' \
>+		${WRKSRC}/src/gtk/Makefile.in
> 
> .include <bsd.port.mk>
>Index: sysutils/pcbsd-utils-qt4/Makefile
>===================================================================
>--- sysutils/pcbsd-utils-qt4/Makefile	(revision 365596)
>+++ sysutils/pcbsd-utils-qt4/Makefile	(working copy)
>@@ -15,7 +15,7 @@ LIB_DEPENDS=	libQtSolutions_SingleApplic
> 		curl:${PORTSDIR}/ftp/curl
> 
> MAKE_JOBS_UNSAFE=yes
>-ONLY_FOR_ARCHS=	amd64
>+#ONLY_FOR_ARCHS=	amd64
> USE_CDRTOOLS=	yes
> USE_LDCONFIG=	yes
> USE_QT4=	corelib gui network svg linguist \
>@@ -26,10 +26,14 @@ WRKSRC=		${WRKDIR}/src-qt4
> 
> QMAKE_ARGS=	CONFIG+="configure"
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
> .if ${OSVERSION} < 1000000
> IGNORE=		requires FreeBSD 10 or later
> .endif
> 
>-.include <bsd.port.post.mk>
>+post-patch:
>+	@${REINPLACE_CMD} '/^LIBS/s/$$/ -lQtSolutions_SingleApplication-head/' \
>+		${WRKSRC}/pc-netmanager/src/NetworkManager/NetworkManager.pro
>+
>+.include <bsd.port.mk>
>Index: sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in
>===================================================================
>--- sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in	(revision 365596)
>+++ sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in	(working copy)
>@@ -9,14 +9,15 @@
>  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
>  	$(am__DEPENDENCIES_1)
>  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
>-@@ -345,8 +343,8 @@
>+@@ -345,8 +343,9 @@
>  	$(GCOV_CFLAGS)
>  
>  tracker_applet_LDADD = \
> -	$(top_builddir)/src/libtracker/libtrackerclient.la 		\
> -	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
>-+	-ltrackerclient 		\
>-+	-ltracker-common 	\
>++	-ltrackerclient \
>++	-ltracker-common \
>++	-lX11 \
>  	$(TRACKER_APPLET_LIBS)						\
>  	$(LIBGLADE_LIBS)						\
>  	$(GCOV_LIBS)
>Index: sysutils/xvidcap/Makefile
>===================================================================
>--- sysutils/xvidcap/Makefile	(revision 365596)
>+++ sysutils/xvidcap/Makefile	(working copy)
>@@ -43,12 +43,14 @@ OPTIONS_DEFINE=	DOCS
> 
> .include <bsd.port.options.mk>
> 
>-pre-configure:
>+post-patch:
> .if empty(PORT_OPTIONS:MDOCS)
> 	${REINPLACE_CMD} -e 's|pkgdataDATA install-xvidcapdocDATA|pkgdataDATA|'	\
> 		${WRKSRC}/Makefile.in
> .endif
> 	${REINPLACE_CMD} -e 's|/bin/bash | /bin/sh|' ${WRKSRC}/ppm2mpeg.sh
>+	@${REINPLACE_CMD} '/^xvidcap_LDADD =/s/$$/ -lXext -lX11/' \
>+		${WRKSRC}/src/Makefile.in
> 
> post-install:
> .if ${PORT_OPTIONS:MDOCS}
>Index: textproc/fldiff/Makefile
>===================================================================
>--- textproc/fldiff/Makefile	(revision 365596)
>+++ textproc/fldiff/Makefile	(working copy)
>@@ -25,6 +25,7 @@ OPTIONS_DEFINE=	DOCS
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|@OPTIM@||' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e '/CXX="$$CC"/d' ${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e 's|=Development|=Application;Development;|' \
> 		${WRKSRC}/fldiff.desktop
> 
>Index: textproc/goldendict/Makefile
>===================================================================
>--- textproc/goldendict/Makefile	(revision 365596)
>+++ textproc/goldendict/Makefile	(working copy)
>@@ -14,12 +14,11 @@ COMMENT=	Feature-rich Qt4 based dictiona
> LICENSE=	GPLv3
> 
> LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
>-		libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
> 		libvorbis.so:${PORTSDIR}/audio/libvorbis
> 
> NO_WRKSUBDIR=	yes
> HAS_CONFIGURE=	yes
>-USES=		dos2unix pkgconfig qmake tar:bzip2
>+USES=		dos2unix execinfo iconv pkgconfig qmake tar:bzip2
> DOS2UNIX_FILES=	processwrapper.cc
> USE_XORG=	xtst
> USE_QT4=	corelib gui webkit phonon \
>Index: www/blastbeat/Makefile
>===================================================================
>--- www/blastbeat/Makefile	(revision 365596)
>+++ www/blastbeat/Makefile	(working copy)
>@@ -26,8 +26,8 @@ GH_COMMIT=	cdac9a9
> GH_TAGNAME=	${GH_COMMIT}
> PORTEXAMPLES=	*
> 
>-CFLAGS+=	-I${LOCALBASE}/include \
>-		-L${LOCALBASE}/lib
>+CFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib -lm
> 
> PLIST_FILES=	bin/blastbeat \
> 		%%ETCDIR%%/blastbeat.ini.sample
>Index: www/gurlchecker/Makefile
>===================================================================
>--- www/gurlchecker/Makefile	(revision 365596)
>+++ www/gurlchecker/Makefile	(working copy)
>@@ -14,18 +14,17 @@ COMMENT=	Gnome program to check a page/w
> LIB_DEPENDS=	libgnet-2.0.so:${PORTSDIR}/net/gnet2
> 
> OPTIONS_DEFINE=	CROCO TIDY CLAMAV GNUTLS
>-CROCO_DESC=Library for CSS2 validation
>-TIDY_DESC=Library for HTML w3c validation
>-CLAMAV_DESC=Library for virii scan
>-GNUTLS_DESC=Library for HTTPS check
>-
>-OPTIONS_DEFAULT=	CLAMAV GNUTLS
>+OPTIONS_DEFAULT=CLAMAV GNUTLS
>+CROCO_DESC=	Library for CSS2 validation
>+TIDY_DESC=	Library for HTML w3c validation
>+CLAMAV_DESC=	Library for virii scan
>+GNUTLS_DESC=	Library for HTTPS check
> 
>+USES=		gmake libtool pathfix pkgconfig
> USE_GNOME=	gnomeprefix intlhack libgnomeui
>-USES=	pathfix gmake pkgconfig
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lm
> 
> .include <bsd.port.options.mk>
> 
>Index: www/surf/Makefile
>===================================================================
>--- www/surf/Makefile	(revision 365596)
>+++ www/surf/Makefile	(working copy)
>@@ -16,8 +16,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
> RUN_DEPENDS=	dmenu:${PORTSDIR}/x11/dmenu
> 
>-USE_CSTD=	c99
> USE_GNOME=	gtk20
>+USE_XORG=	x11
> USES=		pkgconfig
> 
> PORTDOCS=	README
>@@ -28,9 +28,6 @@ DESKTOP_ENTRIES="Surf" "" "${PREFIX}/sha
> 
> CONFLICTS=	surf-1* # math/surf
> 
>-# Name conflicts with the math/surf port
>-NO_LATEST_LINK=	yes
>-
> .include <bsd.port.options.mk>
> 
> pre-everything::
>@@ -45,11 +42,14 @@ post-extract:
> 
> post-patch:
> 	@${REINPLACE_CMD} -e \
>-		's|^$PREFIX$|#\1| ; \
>+		'/^PREFIX/d ; \
> 		 s|/share/man|/man| ; \
>-		 s|^$CFLAGS$ =.*|\1 += -I. $${GTKINC} $${CPPFLAGS}| ; \
>-		 s|^$LDFLAGS$ =.*|\1 += $${GTKLIB}| ; \
>-		 s|^$CC$|#\1|' ${WRKSRC}/config.mk
>+		 /^X11INC =/s/=.*/= `pkg-config --cflags x11`/ ; \
>+		 /^X11LIB =/s/=.*/= `pkg-config --libs x11`/ ; \
>+		 /^CPPFLAGS =/s|$$| ${CPPFLAGS}| ; \
>+		 /^CFLAGS =/s|-Os| ${CFLAGS}| ; \
>+		 /^LDFLAGS =/s|$$| ${LDFLAGS}| ; \
>+		 /^CC =/d' ${WRKSRC}/config.mk
> 
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/surf
>Index: x11/alltray/Makefile
>===================================================================
>--- x11/alltray/Makefile	(revision 365596)
>+++ x11/alltray/Makefile	(working copy)
>@@ -15,7 +15,7 @@ USE_GNOME=	gtk20
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib
> 
> OPTIONS_DEFINE=	KDE
> KDE_DESC=	Support only KDE desktop
>@@ -29,8 +29,12 @@ USE_GNOME+=	gconf2
> 
> post-patch:
> 	@${CHMOD} +x ${WRKSRC}/install-sh
>-	@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/lib/Makefile.in
>-	@${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib||' ${WRKSRC}/src/Makefile.in
>+	@${REINPLACE_CMD} \
>+		-e 's|-ldl||' -e '/^liballtray_la_LIBADD =/s/$$/ -lX11/' \
>+		${WRKSRC}/lib/Makefile.in
>+	@${REINPLACE_CMD} \
>+		-e 's|-L/usr/X11R6/lib||' -e '/^alltray_LDADD =/s/$$/ -lX11/' \
>+		${WRKSRC}/src/Makefile.in
> 	@${REINPLACE_CMD} -e 's|/etc/gconf|${LOCALBASE}/etc/gconf|; \
> 		/THEME_DIR1/ s|/usr/share/|${LOCALBASE}/share/themes/|' \
> 		${WRKSRC}/src/gnome_theme.c
>Index: x11/bbrun/Makefile
>===================================================================
>--- x11/bbrun/Makefile	(revision 365596)
>+++ x11/bbrun/Makefile	(working copy)
>@@ -14,7 +14,7 @@ OPTIONS_DEFINE=	DOCS
> 
> WRKSRC=		${WRKDIR}/${DISTNAME}/bbrun
> 
>-USE_XORG=	xpm
>+USE_XORG=	xpm x11
> USE_GNOME=	gtk20
> USES=		gmake pkgconfig
> USE_CSTD=	gnu89
>Index: x11/bbrun/files/patch-Makefile
>===================================================================
>--- x11/bbrun/files/patch-Makefile	(revision 365596)
>+++ x11/bbrun/files/patch-Makefile	(working copy)
>@@ -5,9 +5,9 @@
> -LIBDIR = -L/usr/lib -L/usr/X11R6/lib
> -LIBS   = -lXpm `pkg-config --libs gtk+-2.0`
> -CFLAGS = `pkg-config --cflags gtk+-2.0`
>-+LIBDIR = -L${LOCALBASE}/lib
>-+LIBS   = -lXpm `pkg-config --libs gtk+-2.0` ${LDFLAGS}
>-+CFLAGS += `pkg-config --cflags gtk+-2.0`
>++LIBDIR =
>++LIBS   = ${LDFLAGS} `pkg-config --libs gtk+-2.0 xpm x11`
>++CFLAGS += `pkg-config --cflags gtk+-2.0 xpm x11`
>  
>  OBJS   = bbrun.o \
>           ../wmgeneral/wmgeneral.o \
>Index: x11/brightside/Makefile
>===================================================================
>--- x11/brightside/Makefile	(revision 365596)
>+++ x11/brightside/Makefile	(working copy)
>@@ -11,12 +11,12 @@ MAINTAINER=	marcus@FreeBSD.org
> COMMENT=	Tool to add reactivity to the edges and corners of the GNOME desktop
> 
> USES=		gmake pathfix pkgconfig tar:bzip2
>-USE_XORG=	x11 xt
>+USE_XORG=	x11
> GNU_CONFIGURE=	yes
> USE_GNOME=	gnomeprefix libwnck libgnomeui
> CONFIGURE_ARGS=	--enable-tray-icon
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> 
> GCONF_SCHEMAS=	brightside.schemas
> 
>Index: x11/fbpanel/Makefile
>===================================================================
>--- x11/fbpanel/Makefile	(revision 365596)
>+++ x11/fbpanel/Makefile	(working copy)
>@@ -15,6 +15,7 @@ LICENSE=	MIT
> 
> USES=		gmake pkgconfig tar:bzip2
> USE_GNOME=	gtk20
>+USE_XORG=	x11
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--prefix=${PREFIX}
> 
>@@ -26,6 +27,8 @@ DESKTOP_ENTRIES="${PORTNAME}" "${PORTNAM
> 		"${PORTNAME}" "${PORTNAME}" "System;" false
> 
> post-patch:
>+	@${REINPLACE_CMD} -e '/LDFLAGS/s/$$/ -lX11 -lm/' \
>+		${WRKSRC}/panel/Makefile.in
> 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/scripts/install.sh
> 	@${REINPLACE_CMD} -e 's|@DATADIR@|${DATADIR}|' \
> 		${WRKSRC}/data/man/${PORTNAME}.1.in
>Index: x11/gnome-applets/Makefile
>===================================================================
>--- x11/gnome-applets/Makefile	(revision 365596)
>+++ x11/gnome-applets/Makefile	(working copy)
>@@ -33,8 +33,8 @@ GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-mixer-applet \
> 		--disable-networkmanager
> CONFIGURE_ENV=	OS_SYS="/usr/include"
>-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> 
> GCONF_SCHEMAS=	charpick.schemas drivemount.schemas geyes.schemas \
> 		mixer.schemas multiload.schemas stickynotes.schemas
>@@ -78,7 +78,6 @@ IGNORE=		Python bindings for gnomedeskto
> .endif
> 
> .if ${ARCH} != "i386" && ${ARCH} != "amd64"
>-CFLAGS+=	-fPIC
> PLIST_SUB+=	BATTERY="@comment "
> .else
> GCONF_SCHEMAS+=	battstat.schemas
>@@ -95,6 +94,8 @@ GCONF_SCHEMAS+= cpufreq-applet.schemas
> post-patch:
> 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
> 	    	's|" == "|" = "|g'
>+	@${REINPLACE_CMD} '/^geyes_applet2_LDADD =/s/=/= -lm/' \
>+		${WRKSRC}/geyes/Makefile.in
> .if !defined(USE_PYTHON)
> 	@${REINPLACE_CMD} -e 's|HAVE_PYGTK="yes"|HAVE_PYGTK="no"|' \
> 		${WRKSRC}/configure
>Index: x11/gnome-clipboard-daemon/Makefile
>===================================================================
>--- x11/gnome-clipboard-daemon/Makefile	(revision 365596)
>+++ x11/gnome-clipboard-daemon/Makefile	(working copy)
>@@ -14,14 +14,16 @@ LICENSE=	GPLv2
> 
> USES=		pkgconfig tar:bzip2
> USE_GNOME=	gtk20
>+USE_XORG=	x11
>+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} ${CPPFLAGS}"
> 
> PLIST_FILES=	bin/${PORTNAME}
> 
> post-patch:
>-	@${REINPLACE_CMD} -e \
>-		's|^CC=|CC?=| ; \
>-		 s|^CFLAGS=|CFLAGS?=| ; \
>-		 s|-o clipboard-daemon |-o ${PORTNAME} |' ${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} \
>+		-e 's|-o clipboard-daemon |-o ${PORTNAME} |' \
>+		-e 's/gtk+-2\.0/& x11/' \
>+		${WRKSRC}/Makefile
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
>Index: x11/gnome-swallow/Makefile
>===================================================================
>--- x11/gnome-swallow/Makefile	(revision 365596)
>+++ x11/gnome-swallow/Makefile	(working copy)
>@@ -10,17 +10,17 @@ MASTER_SITES=	http://interreality.org/~t
> MAINTAINER=	marcus@FreeBSD.org
> COMMENT=	Applet that swallows any X11 application into the GNOME 2 panel
> 
>-USE_XORG=	x11
> USES=		gmake pathfix pkgconfig
> USE_GNOME=	gnomeprefix gnomepanel libgnomeui
>+USE_XORG=	x11
> GNU_CONFIGURE=	yes
>-CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
>-LIBS+=		-L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0`
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
>-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
> 		${WRKSRC}/GNOME_Swallow.server
>+	@${REINPLACE_CMD} 's/libpanelapplet-2.0/& libgnomeui-2.0 x11/' \
>+		${WRKSRC}/Makefile.in
> 
> .include <bsd.port.mk>
>Index: x11/gromit/Makefile
>===================================================================
>--- x11/gromit/Makefile	(revision 365596)
>+++ x11/gromit/Makefile	(working copy)
>@@ -10,9 +10,9 @@ MASTER_SITES=	http://www.home.unix-ag.or
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	GRaphics Over Miscellaneous Objects (Gromit)
> 
>-USE_GNOME=	gtk20
> USES=		pkgconfig
>-CFLAGS+=	-lm
>+USE_GNOME=	gtk20
>+USE_XORG=	x11
> 
> DOCS=		AUTHORS ChangeLog README
> 
>Index: x11/gromit/files/patch-Makefile
>===================================================================
>--- x11/gromit/files/patch-Makefile	(revision 365596)
>+++ x11/gromit/files/patch-Makefile	(working copy)
>@@ -1,6 +1,3 @@
>-
>-$FreeBSD$
>-
> --- Makefile.orig
> +++ Makefile
> @@ -7,4 +7,4 @@
>@@ -8,4 +5,4 @@ $FreeBSD$
>  
>  gromit: gromit.c Makefile
> -	gcc -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c -Wall `pkg-config --libs --cflags gtk+-2.0`
>-+	${CC} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c ${CFLAGS} `pkg-config --libs --cflags gtk+-2.0`
>++	${CC} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c ${CFLAGS} `pkg-config --libs --cflags gtk+-2.0 x11` -lm
>
>Property changes on: x11/gromit/files/patch-Makefile
>___________________________________________________________________
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ No newline at end of property
>Added: fbsd:nokeyword
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: x11/sbxkb/Makefile
>===================================================================
>--- x11/sbxkb/Makefile	(revision 365596)
>+++ x11/sbxkb/Makefile	(working copy)
>@@ -13,8 +13,10 @@ LICENSE=	GPLv3
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-silent-rules
>-USE_GNOME=	gtk20
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> USES=		pkgconfig
>+USE_GNOME=	gtk20
>+USE_XORG=	x11
> 
> post-patch:
> # Remove debug flag (-g) from CFLAGS
>Index: x11/simdock/Makefile
>===================================================================
>--- x11/simdock/Makefile	(revision 365596)
>+++ x11/simdock/Makefile	(working copy)
>@@ -19,6 +19,7 @@ GNU_CONFIGURE=	yes
> USES=		desktop-file-utils pathfix pkgconfig
> USE_GNOME=	gnomeprefix gconf2 libwnck
> USE_WX=		2.8
>+USE_XORG=	x11
> WX_UNICODE=	yes
> WX_CONF_ARGS=	absolute
> 
>@@ -30,6 +31,8 @@ post-patch:
> 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
> 		${WRKSRC}/Makefile.in \
> 		${WRKSRC}/src/main.h
>+	@${REINPLACE_CMD} '/^simdock_LDADD =/s/$$/ -lX11/' \
>+		${WRKSRC}/Makefile.in ${WRKSRC}/src/Makefile.in
> 	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|g' \
> 		-e 's|/usr/share/firefox|${PREFIX}/lib/firefox|g' \
> 		${WRKSRC}/src/main.cc
>Index: x11/sisctrl/Makefile
>===================================================================
>--- x11/sisctrl/Makefile	(revision 365596)
>+++ x11/sisctrl/Makefile	(working copy)
>@@ -16,7 +16,7 @@ USE_GNOME=	gtk20
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	 --with-xv-path=${LOCALBASE}/lib
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lm
> 
> PLIST_FILES=	bin/sisctrl man/man1/sisctrl.1x.gz
> 
>Index: x11/stjerm/Makefile
>===================================================================
>--- x11/stjerm/Makefile	(revision 365596)
>+++ x11/stjerm/Makefile	(working copy)
>@@ -9,15 +9,17 @@ MASTER_SITES=	http://stjerm-terminal.goo
> MAINTAINER=	lichray@gmail.com
> COMMENT=	GTK+-based quake-like terminal emulator
> 
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+GNU_CONFIGURE=	yes
>+LIBS+=		-L${LOCALBASE}/lib -lXinerama
>+USES=		gmake pkgconfig
> USE_AUTOTOOLS=	aclocal autoheader automake
> AUTOMAKE_ARGS=	--add-missing
>-ACLOCAL_ARGS=	--automake-acdir=${ACLOCAL_DIR} \
>-		-I${LOCALBASE}/share/aclocal
> USE_GNOME=	vte gtk20
>-GNU_CONFIGURE=	yes
>-USES=		gmake pkgconfig
>+USE_XORG=	xinerama
> 
>-LICENSE_FILE=	${WRKSRC}/COPYING
> PLIST_FILES=	bin/stjerm man/man8/${PORTNAME}.8.gz
> 
> .include <bsd.port.mk>
>Index: x11/wmcliphist/Makefile
>===================================================================
>--- x11/wmcliphist/Makefile	(revision 365596)
>+++ x11/wmcliphist/Makefile	(working copy)
>@@ -15,8 +15,8 @@ COMMENT=	Clipboard history management do
> SUB_FILES=	pkg-message
> WRKSRC=		${WRKDIR}/${PORTNAME}
> USES=		pkgconfig
>-USE_XORG=	xpm
> USE_GNOME=	gtk20
>+USE_XORG=	x11
> 
> OPTIONS_DEFINE=	DOCS
> 
>Index: x11/wmcliphist/files/patch-Makefile
>===================================================================
>--- x11/wmcliphist/files/patch-Makefile	(revision 365596)
>+++ x11/wmcliphist/files/patch-Makefile	(working copy)
>@@ -1,7 +1,10 @@
> --- Makefile.orig
> +++ Makefile
>-@@ -3,7 +3,7 @@
>- INCLUDES = `pkg-config --cflags gtk+-2.0` -I. -Ifoodock
>+@@ -1,9 +1,9 @@
>+ CC ?= gcc
>+ PREFIX = /usr/local
>+-INCLUDES = `pkg-config --cflags gtk+-2.0` -I. -Ifoodock
>++INCLUDES = `pkg-config --cflags gtk+-2.0 x11` -I. -Ifoodock
>  
>  # for normal use
> -CFLAGS += -Wall -ansi -pedantic $(INCLUDES)
>@@ -9,8 +12,16 @@
>  DEBUG = 
>  
>  # for debuggind purposes
>-@@ -22,8 +22,8 @@
>- lclint:
>+@@ -12,7 +12,7 @@ DEBUG = 
>+ #CFLAGS += -Wall -g -ansi $(INCLUDES) -DFNCALL_DEBUG
>+ #DEBUG = debug.o
>+ 
>+-LIBS = `pkg-config --libs gtk+-2.0`
>++LIBS = `pkg-config --libs gtk+-2.0 x11`
>+ 
>+ OBJECTS = wmcliphist.o clipboard.o gui.o rcconfig.o history.o hotkeys.o utils.o $(DEBUG)
>+ TARGET = wmcliphist
>+@@ -23,7 +23,7 @@ lclint:
>  	lclint $(INCLUDES) +posixlib *.c >lclint.log
>  
>  wmcliphist: $(OBJECTS) foodock/foodock.o
>Index: x11-toolkits/gal2/Makefile
>===================================================================
>--- x11-toolkits/gal2/Makefile	(revision 365596)
>+++ x11-toolkits/gal2/Makefile	(working copy)
>@@ -25,7 +25,7 @@ USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-static --with-libiconv
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
> 
> PLIST_SUB=	VERSION="2.6" PORTVERSION=${PORTVERSION} \
>@@ -36,6 +36,8 @@ post-extract:
> 
> post-patch:
> 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|docs||' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} '/^libgal_2_4_la_LIBADD =/s/=/= -lm/' \
>+		${WRKSRC}/gal/Makefile.in
> 	@${REINPLACE_CMD} -e 's|glib/gmacros.h|glib.h|g' \
> 		${WRKSRC}/gal/util/e-text-event-processor-types.h
> 
>Index: x11-toolkits/gtk20/Makefile
>===================================================================
>--- x11-toolkits/gtk20/Makefile	(revision 365596)
>+++ x11-toolkits/gtk20/Makefile	(working copy)
>@@ -35,7 +35,7 @@ USE_LDCONFIG=	yes
> USE_PERL5=	build
> USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
> 		xcomposite
>-CONFIGURE_ARGS=	--with-xinput=yes --enable-explicit-deps
>+CONFIGURE_ARGS=	--with-xinput=yes
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
>Index: x11-toolkits/pango/Makefile
>===================================================================
>--- x11-toolkits/pango/Makefile	(revision 365596)
>+++ x11-toolkits/pango/Makefile	(working copy)
>@@ -30,7 +30,6 @@ USE_GNOME=	cairo glib20 gnomehier intros
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
>-CONFIGURE_ARGS=	--enable-explicit-deps=yes
> 
> PLIST_SUB=	VERSION="1.8.0"
> 
>Index: x11-wm/devilspie/Makefile
>===================================================================
>--- x11-wm/devilspie/Makefile	(revision 365596)
>+++ x11-wm/devilspie/Makefile	(working copy)
>@@ -16,7 +16,7 @@ USE_GNOME=	libwnck
> GNU_CONFIGURE=	yes
> USES=		pkgconfig gettext gmake
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> 
> PORTDOCS=	AUTHORS NEWS README TODO
> PLIST_FILES=	bin/devilspie \
>Index: x11-wm/gcompmgr/Makefile
>===================================================================
>--- x11-wm/gcompmgr/Makefile	(revision 365596)
>+++ x11-wm/gcompmgr/Makefile	(working copy)
>@@ -11,11 +11,13 @@ MAINTAINER=	ports@FreeBSD.org
> COMMENT=	GNOME interface to xcompmgr
> 
> RUN_DEPENDS=	xcompmgr:${PORTSDIR}/x11-wm/xcompmgr
>-LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
> 
> GNU_CONFIGURE=	yes
>+LIBS+=		-L${LOCALBASE}/lib -lX11
> USES=		libtool pkgconfig
> USE_AUTOTOOLS=	automake:env
>+USE_GNOME=	gtkmm24
>+USE_XORG=	x11
> 
> DESKTOP_ENTRIES="gcompmgr" \
> 		"Configure window effects" \

Actions: View | Diff

Attachments on bug 192062: 144908 | 144909 | 145791 | 146130 | 146255 | 146341