- Fix missing library problems when the linker enforces explicit linking

PR:		192062
Exp-run by:	antoine
Approved by:	portmgr (antoine)

227 files changed, 635 insertions, 905 deletions

diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index f033770987bb..7aed13056a54 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -16,10 +16,12 @@ LIB_DEPENDS=	libgnome-mag.so:${PORTSDIR}/accessibility/gnome-mag
 
 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}"
diff --git a/audio/gqradio/Makefile b/audio/gqradio/Makefile
index 527f4967e66e..d4e8f4d7c733 100644
--- a/audio/gqradio/Makefile
+++ b/audio/gqradio/Makefile
@@ -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
 
diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile
index d8a45612e372..295d4e60aa5b 100644
--- a/audio/jack-rack/Makefile
+++ b/audio/jack-rack/Makefile
@@ -20,7 +20,7 @@ USES=		gettext shebangfix pkgconfig tar:bzip2
 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
 
diff --git a/audio/padevchooser/Makefile b/audio/padevchooser/Makefile
index 1fa9f6f83c26..ff004edb7eaf 100644
--- a/audio/padevchooser/Makefile
+++ b/audio/padevchooser/Makefile
@@ -16,7 +16,9 @@ LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
 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
 
diff --git a/comms/kb/files/Makefile b/comms/kb/files/Makefile
index b08957d056c4..23a8d933c23a 100644
--- a/comms/kb/files/Makefile
+++ b/comms/kb/files/Makefile
@@ -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
diff --git a/deskutils/fusenshi/Makefile b/deskutils/fusenshi/Makefile
index 83a35b41e5b0..af15a3aad567 100644
--- a/deskutils/fusenshi/Makefile
+++ b/deskutils/fusenshi/Makefile
@@ -10,11 +10,9 @@ MASTER_SITES=	http://www.ongs.co.jp/projects/fusenshi/
 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
diff --git a/deskutils/fusenshi/files/patch-src-Makefile b/deskutils/fusenshi/files/patch-src-Makefile
index 982850d61d5e..8621cfaf4c58 100644
--- a/deskutils/fusenshi/files/patch-src-Makefile
+++ b/deskutils/fusenshi/files/patch-src-Makefile
@@ -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:
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index f1ace9cbe650..ddb8719322ca 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -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>
diff --git a/deskutils/gnome-main-menu/files/patch-configure b/deskutils/gnome-main-menu/files/patch-configure
index 9f32bd6394d0..3f51291b9e29 100644
--- a/deskutils/gnome-main-menu/files/patch-configure
+++ b/deskutils/gnome-main-menu/files/patch-configure
@@ -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
  
diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile
index e96957f9cd81..57dfbe0d17e5 100644
--- a/deskutils/gtimer/Makefile
+++ b/deskutils/gtimer/Makefile
@@ -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
diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile
index 905c38a5d65c..b20dc4c3421e 100644
--- a/deskutils/mdh/Makefile
+++ b/deskutils/mdh/Makefile
@@ -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
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index 03399768ca0b..32650ea99e86 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -11,12 +11,10 @@ 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
@@ -24,11 +22,5 @@ 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>
diff --git a/deskutils/multisync/files/patch-src-Makefile.am b/deskutils/multisync/files/patch-src-Makefile.am
new file mode 100644
index 000000000000..b26f1df890a5
--- /dev/null
+++ b/deskutils/multisync/files/patch-src-Makefile.am
@@ -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
+ 
diff --git a/deskutils/notecase/Makefile b/deskutils/notecase/Makefile
index c162df5ecf3b..d9a7cc9d2d0d 100644
--- a/deskutils/notecase/Makefile
+++ b/deskutils/notecase/Makefile
@@ -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)
 
diff --git a/deskutils/notecase/files/patch-Makefile b/deskutils/notecase/files/patch-Makefile
index e80a34e57d30..166b563540bd 100644
--- a/deskutils/notecase/files/patch-Makefile
+++ b/deskutils/notecase/files/patch-Makefile
@@ -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	
  
  #
diff --git a/deskutils/notify-osd/Makefile b/deskutils/notify-osd/Makefile
index 525ad9245f75..a714ee0efc0d 100644
--- a/deskutils/notify-osd/Makefile
+++ b/deskutils/notify-osd/Makefile
@@ -13,18 +13,18 @@ COMMENT=	On-screen-display notification agent using libnotify
 
 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>
 
diff --git a/deskutils/xfce4-notification-daemon/Makefile b/deskutils/xfce4-notification-daemon/Makefile
index 1bc464a25a89..0f2bccdad1e3 100644
--- a/deskutils/xfce4-notification-daemon/Makefile
+++ b/deskutils/xfce4-notification-daemon/Makefile
@@ -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
diff --git a/editors/codelite/files/patch-sdk_codelite_indexer_CMakeLists.txt b/editors/codelite/files/patch-sdk_codelite_indexer_CMakeLists.txt
new file mode 100644
index 000000000000..aed26e91dd3d
--- /dev/null
+++ b/editors/codelite/files/patch-sdk_codelite_indexer_CMakeLists.txt
@@ -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)
+ 
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 0c5d604febe7..d60c52eb33f9 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -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>
diff --git a/editors/madedit/Makefile b/editors/madedit/Makefile
index 5177c2a1896d..c25705f655a5 100644
--- a/editors/madedit/Makefile
+++ b/editors/madedit/Makefile
@@ -12,20 +12,16 @@ COMMENT=	Open-source and cross-platform text/hex editor
 
 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
 
diff --git a/emulators/jzintv/Makefile b/emulators/jzintv/Makefile
index b97f6764def4..ab16a4629092 100644
--- a/emulators/jzintv/Makefile
+++ b/emulators/jzintv/Makefile
@@ -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
diff --git a/emulators/tilem/Makefile b/emulators/tilem/Makefile
index 88f0c61723ee..9d3d303c71be 100644
--- a/emulators/tilem/Makefile
+++ b/emulators/tilem/Makefile
@@ -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:
diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index a4ffd85c23a5..5f9f4c9894f1 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -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
 
diff --git a/finance/xtrader/Makefile b/finance/xtrader/Makefile
index ef4bbcd8cb75..01d2b2c46eeb 100644
--- a/finance/xtrader/Makefile
+++ b/finance/xtrader/Makefile
@@ -13,7 +13,6 @@ COMMENT=	Technical analysis program for financial instruments
 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}
diff --git a/finance/xtrader/files/patch-Makefile.linux b/finance/xtrader/files/patch-Makefile.linux
index 25fcad4a1e59..387ee358495e 100644
--- a/finance/xtrader/files/patch-Makefile.linux
+++ b/finance/xtrader/files/patch-Makefile.linux
@@ -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
  
diff --git a/ftp/pureadmin/Makefile b/ftp/pureadmin/Makefile
index 7eca8f4ba9a5..e6ff75ffadf6 100644
--- a/ftp/pureadmin/Makefile
+++ b/ftp/pureadmin/Makefile
@@ -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
diff --git a/games/airstrike/Makefile b/games/airstrike/Makefile
index 267b046297d1..45994e6735e8 100644
--- a/games/airstrike/Makefile
+++ b/games/airstrike/Makefile
@@ -39,6 +39,7 @@ DESKTOP_ENTRIES="Airstrike" "" "${PORTNAME}" \
 
 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'
diff --git a/games/asteroid/Makefile b/games/asteroid/Makefile
index 7dd624c8fa42..f85f8fbd218f 100644
--- a/games/asteroid/Makefile
+++ b/games/asteroid/Makefile
@@ -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
diff --git a/games/atanks/Makefile b/games/atanks/Makefile
index f02b159e8cfa..e4dbf5df46af 100644
--- a/games/atanks/Makefile
+++ b/games/atanks/Makefile
@@ -22,6 +22,7 @@ PORTDOCS=	Changelog README README_ru.txt credits.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
diff --git a/games/belooted/Makefile b/games/belooted/Makefile
index 59f5c221eff7..38ddf30119e0 100644
--- a/games/belooted/Makefile
+++ b/games/belooted/Makefile
@@ -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>
diff --git a/games/belooted/pkg-plist b/games/belooted/pkg-plist
index 9337f2e2c7c8..5597935269b9 100644
--- a/games/belooted/pkg-plist
+++ b/games/belooted/pkg-plist
@@ -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
diff --git a/games/bitefusion/Makefile b/games/bitefusion/Makefile
index 5652f1b75348..9919f4cf7c68 100644
--- a/games/bitefusion/Makefile
+++ b/games/bitefusion/Makefile
@@ -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
 
diff --git a/games/blokish/Makefile b/games/blokish/Makefile
index 4693f476c1ba..5b24414c0691 100644
--- a/games/blokish/Makefile
+++ b/games/blokish/Makefile
@@ -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>
diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index d7451426dc89..ee15120f4969 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -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
 
diff --git a/games/caph/Makefile b/games/caph/Makefile
index de1ab070a499..6fc6d1a9d0e4 100644
--- a/games/caph/Makefile
+++ b/games/caph/Makefile
@@ -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
diff --git a/games/construo/Makefile b/games/construo/Makefile
index 334a557bc42a..65fdac44de40 100644
--- a/games/construo/Makefile
+++ b/games/construo/Makefile
@@ -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
diff --git a/games/d2x-xl/Makefile b/games/d2x-xl/Makefile
index 197403c98ad2..2093003b61af 100644
--- a/games/d2x-xl/Makefile
+++ b/games/d2x-xl/Makefile
@@ -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} && \
diff --git a/games/defendguin/Makefile b/games/defendguin/Makefile
index 507267c1dc80..16903d3181d2 100644
--- a/games/defendguin/Makefile
+++ b/games/defendguin/Makefile
@@ -30,7 +30,7 @@ DESKTOP_ENTRIES="Defendguin" "" "${PORTNAME}" \
 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/
diff --git a/games/egoboo/files/patch-game-Makefile.unix b/games/egoboo/files/patch-game-Makefile.unix
index 400bf93a0f08..c88312ac977e 100644
--- a/games/egoboo/files/patch-game-Makefile.unix
+++ b/games/egoboo/files/patch-game-Makefile.unix
@@ -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
  
diff --git a/games/frogatto/Makefile b/games/frogatto/Makefile
index 74e07ef1b729..93d2a058896d 100644
--- a/games/frogatto/Makefile
+++ b/games/frogatto/Makefile
@@ -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
diff --git a/games/frogatto/files/patch-Makefile b/games/frogatto/files/patch-Makefile
index 72fc79ea8a2b..3f08bcd7243d 100644
--- a/games/frogatto/files/patch-Makefile
+++ b/games/frogatto/files/patch-Makefile
@@ -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
  
diff --git a/games/gillo/Makefile b/games/gillo/Makefile
index 1c403d5c9445..31a299a9281c 100644
--- a/games/gillo/Makefile
+++ b/games/gillo/Makefile
@@ -20,21 +20,20 @@ BUILD_DEPENDS=	${JAM}:${PORTSDIR}/devel/jam \
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		tar:bzip2
-USE_GL=		gl
+USE_GL=		glu
 USE_SDL=	yes
 
 JAM?=		${LOCALBASE}/bin/jam
 
 post-patch:
-	@${REINPLACE_CMD} -i '' -e 's|SDL/||g' ${WRKSRC}/src/*
-	@${REINPLACE_CMD} -e 's|%%SDL_CFLAGS%%|`${SDL_CONFIG} --cflags`|' \
-		${WRKSRC}/Jamrules
-	@${REINPLACE_CMD} -e 's|%%SDL_LDFLAGS%%|`${SDL_CONFIG} --libs`|' \
+	@${REINPLACE_CMD} '/^LINKLIBS on gillo3/s|;$$|-L${LOCALBASE}/lib -lm ;|' \
 		${WRKSRC}/src/Jamfile
 
 do-build:
-	cd ${WRKSRC} && ${SETENV} "C++=${CC}" "LOCALBASE=${LOCALBASE}" \
-		"CFLAGS=${CFLAGS} -DDATADIR=\\\"${PREFIX}/share\\\"" \
+	cd ${WRKSRC} && ${SETENV} C++="${CXX}" C++FLAGS="${CXXFLAGS}" \
+		CCFLAGS="${CFLAGS} -DDATADIR=\\\"${PREFIX}/share\\\"" \
+		HDRS="${LOCALBASE}/include" \
+		LINK="${CXX}" LINKFLAGS="${LDFLAGS}" \
 		${JAM} -dx -sPREFIX=${PREFIX}
 
 do-install:
diff --git a/games/gillo/files/patch-Jamrules b/games/gillo/files/patch-Jamrules
index e7e8e2c160a7..9e2b3d04fbb2 100644
--- a/games/gillo/files/patch-Jamrules
+++ b/games/gillo/files/patch-Jamrules
@@ -1,15 +1,12 @@
 --- Jamrules.orig
 +++ Jamrules
-@@ -5,8 +5,9 @@
+@@ -5,8 +5,6 @@
  DATADIR = $(PREFIX)/share/gillo ; 
  DOCDIR  = $(PREFIX)/share/doc/gillo ; 
  
 -CCFLAGS  += -DENABLE_BINRELOC ;
 -if $(DEBUG) { CCFLAGS += -g -O0 -DDEBUG ; }
 -else CCFLAGS += -O3 ;
-+CCFLAGS  += $(CFLAGS) %%SDL_CFLAGS%% ;
-+HDRS = $(LOCALBASE)/include ;
-+#if $(DEBUG) { CCFLAGS += -g -O0 -DDEBUG ; }
-+#else CCFLAGS += -O3 ;
++OPTIM = ;
  C++FLAGS += $(CCFLAGS) ;
  #LINKFLAGS += -static ;
diff --git a/games/gillo/files/patch-src_Jamfile b/games/gillo/files/patch-src_Jamfile
deleted file mode 100644
index 0b9f4e2dcd44..000000000000
--- a/games/gillo/files/patch-src_Jamfile
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Jamfile.orig
-+++ src/Jamfile
-@@ -2,6 +2,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%% ;
- 
- InstallBin $(BINDIR) : gillo3$(SUFEXE) ;
diff --git a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile
index 26bf3782bb53..fba8808abc95 100644
--- a/games/gnomebreakout/Makefile
+++ b/games/gnomebreakout/Makefile
@@ -14,11 +14,12 @@ COMMENT=	GNOME version of the classic breakout game
 
 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
 
diff --git a/games/gnurobbo/Makefile b/games/gnurobbo/Makefile
index c137caa8127e..abe9fcbea424 100644
--- a/games/gnurobbo/Makefile
+++ b/games/gnurobbo/Makefile
@@ -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:
diff --git a/games/goonies/Makefile b/games/goonies/Makefile
index b50d7abef352..0833efa315e7 100644
--- a/games/goonies/Makefile
+++ b/games/goonies/Makefile
@@ -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}
diff --git a/games/goonies/files/patch-build-linux-Makefile b/games/goonies/files/patch-build-linux-Makefile
index e4155ebbabe3..092ac03be7e8 100644
--- a/games/goonies/files/patch-build-linux-Makefile
+++ b/games/goonies/files/patch-build-linux-Makefile
@@ -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
diff --git a/games/holotz-castle/files/patch-src__Makefile b/games/holotz-castle/files/patch-src__Makefile
index 043a6523e380..01ad8c2de56b 100644
--- a/games/holotz-castle/files/patch-src__Makefile
+++ b/games/holotz-castle/files/patch-src__Makefile
@@ -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: 
diff --git a/games/lianliankan/Makefile b/games/lianliankan/Makefile
index 8da4be0cc129..255e410c855f 100644
--- a/games/lianliankan/Makefile
+++ b/games/lianliankan/Makefile
@@ -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
 
diff --git a/games/lianliankan/files/patch-src__Makefile.am b/games/lianliankan/files/patch-src__Makefile.am
index 5057b153eb3f..43c5d00a0f5d 100644
--- a/games/lianliankan/files/patch-src__Makefile.am
+++ b/games/lianliankan/files/patch-src__Makefile.am
@@ -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
+ 
diff --git a/games/liquidwar/files/patch-src-Makefile.in b/games/liquidwar/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..dc2f07e18f23
--- /dev/null
+++ b/games/liquidwar/files/patch-src-Makefile.in
@@ -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 . \
diff --git a/games/lucidlife/Makefile b/games/lucidlife/Makefile
index 786a8de04338..40d080318aad 100644
--- a/games/lucidlife/Makefile
+++ b/games/lucidlife/Makefile
@@ -12,8 +12,12 @@ COMMENT=	GTK2 implementation of Conway's Game of Life
 
 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>
diff --git a/games/luola/Makefile b/games/luola/Makefile
index 235ef53421b0..b1c67b72dbc0 100644
--- a/games/luola/Makefile
+++ b/games/luola/Makefile
@@ -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
diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index b8e4c0603b25..8d6d28fb4e93 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -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
 
diff --git a/games/meritous/files/patch-Makefile b/games/meritous/files/patch-Makefile
index 95a69cceefe3..02a67d7c20d2 100644
--- a/games/meritous/files/patch-Makefile
+++ b/games/meritous/files/patch-Makefile
@@ -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 \
diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile
index faa992a268cd..3f729e0fb8ec 100644
--- a/games/monkeybubble/Makefile
+++ b/games/monkeybubble/Makefile
@@ -13,13 +13,13 @@ COMMENT=	GTK2 Puzzle Bobble clone with monkeys
 
 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
diff --git a/games/motogt/Makefile b/games/motogt/Makefile
index 2397475b01ef..425db2d5b573 100644
--- a/games/motogt/Makefile
+++ b/games/motogt/Makefile
@@ -21,14 +21,14 @@ LICENSE_PERMS_CCbySA=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 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=	*
diff --git a/games/motogt/files/patch-src-Makefile.lnx b/games/motogt/files/patch-src-Makefile.lnx
index 9905f7ac207c..aba2597dfd59 100644
--- a/games/motogt/files/patch-src-Makefile.lnx
+++ b/games/motogt/files/patch-src-Makefile.lnx
@@ -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
  
diff --git a/games/naev/Makefile b/games/naev/Makefile
index e4e87944397c..993980dec282 100644
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@@ -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
diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index ac4fcbc1322d..8fc7895d5f55 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -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>
diff --git a/games/neverball/files/patch-Makefile b/games/neverball/files/patch-Makefile
index b5284cddd4f1..303107227d21 100644
--- a/games/neverball/files/patch-Makefile
+++ b/games/neverball/files/patch-Makefile
@@ -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%%
diff --git a/games/noegnud-littlehack/files/noegnud-littlehack.patch b/games/noegnud-littlehack/files/noegnud-littlehack.patch
index 67ba867c6ad8..bc999421c525 100644
--- a/games/noegnud-littlehack/files/noegnud-littlehack.patch
+++ b/games/noegnud-littlehack/files/noegnud-littlehack.patch
@@ -73,7 +73,7 @@ diff -urN variants/littlehack-0.0.1.orig/sys/unix/Makefile.src variants/littleha
 +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
diff --git a/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch b/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch
index e6d94e177cdd..1847cfcf94b3 100644
--- a/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch
+++ b/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch
@@ -82,7 +82,7 @@ diff -urN variants/nethack-3.4.2-deet.orig/sys/unix/Makefile.src variants/nethac
 +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
diff --git a/games/noegnud-nethack/files/noegnud-nethack.patch b/games/noegnud-nethack/files/noegnud-nethack.patch
index f9ae4b49ed26..2c6e40b737b2 100644
--- a/games/noegnud-nethack/files/noegnud-nethack.patch
+++ b/games/noegnud-nethack/files/noegnud-nethack.patch
@@ -73,7 +73,7 @@ diff -urN variants/nethack-3.4.3.orig/sys/unix/Makefile.src variants/nethack-3.4
 +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
diff --git a/games/noegnud-slashem/files/noegnud-slashem.patch b/games/noegnud-slashem/files/noegnud-slashem.patch
index 0b61d3dd3c32..786aa68fcf8b 100644
--- a/games/noegnud-slashem/files/noegnud-slashem.patch
+++ b/games/noegnud-slashem/files/noegnud-slashem.patch
@@ -54,7 +54,7 @@ diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src variants/slashem
  
  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 $@
diff --git a/games/nuclearchess/Makefile b/games/nuclearchess/Makefile
index 7f33e45b5726..6f687972851f 100644
--- a/games/nuclearchess/Makefile
+++ b/games/nuclearchess/Makefile
@@ -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/
diff --git a/games/openjazz/files/patch-Makefile b/games/openjazz/files/patch-Makefile
index c5c8f6924511..f17f84929b07 100644
--- a/games/openjazz/files/patch-Makefile
+++ b/games/openjazz/files/patch-Makefile
@@ -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)
diff --git a/games/pacmanarena/Makefile b/games/pacmanarena/Makefile
index eb80bfb7c4ce..47089cc58ec0 100644
--- a/games/pacmanarena/Makefile
+++ b/games/pacmanarena/Makefile
@@ -22,6 +22,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME:S/arena//}
 
 USE_SDL=	mixer net sdl
 GNU_CONFIGURE=	yes
+LDFLAGS+=	-lm
 
 PORTDOCS=	README
 OPTIONS_DEFINE=	DOCS
diff --git a/games/phlipple/Makefile b/games/phlipple/Makefile
index 463ca2bad229..1b73950c5536 100644
--- a/games/phlipple/Makefile
+++ b/games/phlipple/Makefile
@@ -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 \
diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile
index 3238e6674a77..e5ce733cdb56 100644
--- a/games/powermanga/Makefile
+++ b/games/powermanga/Makefile
@@ -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/
diff --git a/games/simplevaders/Makefile b/games/simplevaders/Makefile
index 53f196f734d3..8f7470d8ee1e 100644
--- a/games/simplevaders/Makefile
+++ b/games/simplevaders/Makefile
@@ -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
diff --git a/games/thevalley/Makefile b/games/thevalley/Makefile
index 4bd516f23d12..2f53dfa73fff 100644
--- a/games/thevalley/Makefile
+++ b/games/thevalley/Makefile
@@ -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>
diff --git a/games/viruskiller/Makefile b/games/viruskiller/Makefile
index ef3e0c4c4525..7b4c8c8a40dc 100644
--- a/games/viruskiller/Makefile
+++ b/games/viruskiller/Makefile
@@ -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
diff --git a/games/volleyball/Makefile b/games/volleyball/Makefile
index d1765263c5ac..d076ffed9453 100644
--- a/games/volleyball/Makefile
+++ b/games/volleyball/Makefile
@@ -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}
diff --git a/games/vor/Makefile b/games/vor/Makefile
index 39d57555066f..a85ca86f90c0 100644
--- a/games/vor/Makefile
+++ b/games/vor/Makefile
@@ -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=	*
diff --git a/games/wargus/Makefile b/games/wargus/Makefile
index ed15d06a5980..30cd4d7ab8b8 100644
--- a/games/wargus/Makefile
+++ b/games/wargus/Makefile
@@ -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}
diff --git a/graphics/cfdg/files/patch-Makefile b/graphics/cfdg/files/patch-Makefile
index b232448bbaed..c99dea41750e 100644
--- a/graphics/cfdg/files/patch-Makefile
+++ b/graphics/cfdg/files/patch-Makefile
@@ -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 $@
  
  
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 17f9ae7c2232..8bb58f53d3e0 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -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
diff --git a/graphics/cinepaint/files/patch-app__Makefile.am b/graphics/cinepaint/files/patch-app__Makefile.am
index 2e75bd0c166f..e6b9be903345 100644
--- a/graphics/cinepaint/files/patch-app__Makefile.am
+++ b/graphics/cinepaint/files/patch-app__Makefile.am
@@ -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
diff --git a/graphics/cinepaint/files/patch-app__menus.c b/graphics/cinepaint/files/patch-app__menus.c
deleted file mode 100644
index 815843f66478..000000000000
--- a/graphics/cinepaint/files/patch-app__menus.c
+++ /dev/null
@@ -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);
- }
diff --git a/graphics/cinepaint/files/patch-lib__fl_i18n__Makefile.am b/graphics/cinepaint/files/patch-lib__fl_i18n__Makefile.am
deleted file mode 100644
index 17db1bc0f1ac..000000000000
--- a/graphics/cinepaint/files/patch-lib__fl_i18n__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__blur__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__blur__Makefile.am
deleted file mode 100644
index e1f0c5654bf0..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__blur__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__Makefile.am
deleted file mode 100644
index c3ee5cadfd0a..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__Makefile.am
+++ /dev/null
@@ -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 \
diff --git a/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__jhead__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__jhead__Makefile.am
deleted file mode 100644
index 00ffbcf10fb4..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__jhead__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__compose__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__compose__Makefile.am
deleted file mode 100644
index 7f90e9c9c0d5..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__compose__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__dbbrowser__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__dbbrowser__Makefile.am
deleted file mode 100644
index 8fbd6662405a..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__dbbrowser__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__decompose__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__decompose__Makefile.am
deleted file mode 100644
index 17da554dcc04..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__decompose__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__dicom__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__dicom__Makefile.am
deleted file mode 100644
index aeeef7bd1685..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__dicom__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__fits__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__fits__Makefile.am
deleted file mode 100644
index 9849135d9047..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__fits__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__gbr__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__gbr__Makefile.am
deleted file mode 100644
index c81df9a63bf7..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__gbr__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__hdr__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__hdr__Makefile.am
deleted file mode 100644
index f2e0b79f0e45..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__hdr__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__iff__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__iff__Makefile.am
deleted file mode 100644
index 5054e7afb236..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__iff__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__jpeg__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__jpeg__Makefile.am
deleted file mode 100644
index 9458bfcbdced..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__jpeg__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__median__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__median__Makefile.am
deleted file mode 100644
index 4cfcbae324bd..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__median__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__minimum__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__minimum__Makefile.am
deleted file mode 100644
index 34b916e277ff..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__minimum__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__noisify__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__noisify__Makefile.am
deleted file mode 100644
index c9ee523df032..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__noisify__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__openexr__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__openexr__Makefile.am
deleted file mode 100644
index 6d937d1856f9..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__openexr__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__pdf__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__pdf__Makefile.am
deleted file mode 100644
index 41f14a2621bc..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__pdf__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__pic__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__pic__Makefile.am
deleted file mode 100644
index 825e165eaab5..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__pic__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__png__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__png__Makefile.am
deleted file mode 100644
index 7c0f1f53679b..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__png__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__pnm__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__pnm__Makefile.am
deleted file mode 100644
index 288fd51b026d..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__pnm__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__psd_save__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__psd_save__Makefile.am
deleted file mode 100644
index 950ccec57ea0..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__psd_save__Makefile.am
+++ /dev/null
@@ -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
diff --git a/graphics/cinepaint/files/patch-plug-ins__screenshot__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__screenshot__Makefile.am
deleted file mode 100644
index 26005e2fa709..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__screenshot__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__sgi__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__sgi__Makefile.am
deleted file mode 100644
index 27658fe76b5b..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__sgi__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__tga__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__tga__Makefile.am
deleted file mode 100644
index fbe9b12cf6ed..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__tga__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/cinepaint/files/patch-plug-ins__xwd__Makefile.am b/graphics/cinepaint/files/patch-plug-ins__xwd__Makefile.am
deleted file mode 100644
index 2780e3803054..000000000000
--- a/graphics/cinepaint/files/patch-plug-ins__xwd__Makefile.am
+++ /dev/null
@@ -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
- 
diff --git a/graphics/exiftran/files/Makefile.exiftran b/graphics/exiftran/files/Makefile.exiftran
index 23e5ab7c7968..bf74e5fb3202 100644
--- a/graphics/exiftran/files/Makefile.exiftran
+++ b/graphics/exiftran/files/Makefile.exiftran
@@ -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
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index fa8096df838c..1fdb4376a1c5 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -59,6 +59,7 @@ LIBXINE_LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine
 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@ \\/'
 
diff --git a/graphics/gimp-wavelet-denoise-plugin/Makefile b/graphics/gimp-wavelet-denoise-plugin/Makefile
index bd79a1a1205e..c680aa1138ff 100644
--- a/graphics/gimp-wavelet-denoise-plugin/Makefile
+++ b/graphics/gimp-wavelet-denoise-plugin/Makefile
@@ -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
diff --git a/graphics/gimp-wavelet-sharpen-plugin/Makefile b/graphics/gimp-wavelet-sharpen-plugin/Makefile
index 1d4b389b79a9..4f1746c821d3 100644
--- a/graphics/gimp-wavelet-sharpen-plugin/Makefile
+++ b/graphics/gimp-wavelet-sharpen-plugin/Makefile
@@ -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
diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index 34269a87b7fb..857e518f22ab 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -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%%
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index d48a0051b554..63676a5c3598 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -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
diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile
index 82cbd367f366..0a76650e6fcd 100644
--- a/graphics/inventor/Makefile
+++ b/graphics/inventor/Makefile
@@ -38,6 +38,12 @@ OPTIONS_DEFINE=	DEBUG
 
 DEBUG_MAKE_ENV=	LIBTYPE=debug
 
+.include <bsd.port.options.mk>
+
+.if !(${OPSYS} == FreeBSD && ${OSVERSION} < 900033)
+MAKE_ENV+=	VLDOPTS=-Wl,--add-needed
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ;\
 			      s|%%CXX%%|${CXX}|g ; \
diff --git a/graphics/inventor/files/patch-lib-GNUmakefile b/graphics/inventor/files/patch-lib-GNUmakefile
index 2d734737fd9d..46ef35ed0981 100644
--- a/graphics/inventor/files/patch-lib-GNUmakefile
+++ b/graphics/inventor/files/patch-lib-GNUmakefile
@@ -5,7 +5,7 @@
          -lGLU -lGL
  
 +ifeq ($(usingFreeBSD), 1)
-+LLDLIBS += -lXext %%ICONV_LIB%%
++LLDLIBS += %%ICONV_LIB%%
 +endif
 +
  OBJECTS = \
diff --git a/graphics/klatexformula/Makefile b/graphics/klatexformula/Makefile
index 41d630c6c82e..5950c452582b 100644
--- a/graphics/klatexformula/Makefile
+++ b/graphics/klatexformula/Makefile
@@ -19,8 +19,13 @@ CMAKE_ARGS=	-DQT_QMAKE_EXECUTABLE_FINDQT=${QMAKE} \
 		-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>
diff --git a/graphics/kudu/Makefile b/graphics/kudu/Makefile
index d827189a82b1..152c924d0df8 100644
--- a/graphics/kudu/Makefile
+++ b/graphics/kudu/Makefile
@@ -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=	*
diff --git a/graphics/lprof-devel/files/patch-src-CMakeLists.txt b/graphics/lprof-devel/files/patch-src-CMakeLists.txt
index 7cbccbd27908..924fff15317c 100644
--- a/graphics/lprof-devel/files/patch-src-CMakeLists.txt
+++ b/graphics/lprof-devel/files/patch-src-CMakeLists.txt
@@ -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
diff --git a/graphics/nomacs/files/patch-CMakeLists.txt b/graphics/nomacs/files/patch-CMakeLists.txt
index be003e9b802f..31bf96f8f8e6 100644
--- a/graphics/nomacs/files/patch-CMakeLists.txt
+++ b/graphics/nomacs/files/patch-CMakeLists.txt
@@ -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)
diff --git a/graphics/panoglview/Makefile b/graphics/panoglview/Makefile
index daafe28996f5..f36f1d748592 100644
--- a/graphics/panoglview/Makefile
+++ b/graphics/panoglview/Makefile
@@ -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
diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile
index eddb104d1054..77b057766737 100644
--- a/graphics/pornview/Makefile
+++ b/graphics/pornview/Makefile
@@ -15,13 +15,13 @@ LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 		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
diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile
index 5de27c7d6147..6ebe867d2042 100644
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -19,7 +19,7 @@ USES=		gmake pathfix pkgconfig tar:bzip2 libtool
 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>
diff --git a/graphics/rgbpaint/Makefile b/graphics/rgbpaint/Makefile
index 0e25441075f2..214a6f24903d 100644
--- a/graphics/rgbpaint/Makefile
+++ b/graphics/rgbpaint/Makefile
@@ -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:
diff --git a/graphics/separate/Makefile b/graphics/separate/Makefile
index fa5a77798fce..29271080b6ec 100644
--- a/graphics/separate/Makefile
+++ b/graphics/separate/Makefile
@@ -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
diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile
index ffc7ff40b788..e65a4fb2fec8 100644
--- a/graphics/vp/Makefile
+++ b/graphics/vp/Makefile
@@ -9,9 +9,10 @@ MASTER_SITES=	http://elfga.com/~erik/files/
 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
 
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index c93a40fb1d50..966415543dda 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -14,6 +14,8 @@ BUILD_DEPENDS=  gawk:${PORTSDIR}/lang/gawk
 
 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
 
diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index 970b4fec3f69..8294731b9b16 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -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/xim/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/korean/gtkcomm/Makefile b/korean/gtkcomm/Makefile
index dac30f53f9da..1a7233edd4fb 100644
--- a/korean/gtkcomm/Makefile
+++ b/korean/gtkcomm/Makefile
@@ -17,10 +17,9 @@ RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/
 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>
diff --git a/lang/cduce/Makefile b/lang/cduce/Makefile
index 5fcb8996f84c..1a348a969bb1 100644
--- a/lang/cduce/Makefile
+++ b/lang/cduce/Makefile
@@ -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/
diff --git a/mail/deforaos-mailer/Makefile b/mail/deforaos-mailer/Makefile
index 526efe519066..f5fb52d05b64 100644
--- a/mail/deforaos-mailer/Makefile
+++ b/mail/deforaos-mailer/Makefile
@@ -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>
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 73a14c6b5e87..309975632008 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -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'
diff --git a/mail/mail-notification/files/patch-jbsrc-jb.c b/mail/mail-notification/files/patch-jbsrc-jb.c
new file mode 100644
index 000000000000..1b755b97f41a
--- /dev/null
+++ b/mail/mail-notification/files/patch-jbsrc-jb.c
@@ -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");
diff --git a/math/calcoo/Makefile b/math/calcoo/Makefile
index ea2b861a0c3e..212b5d632bc6 100644
--- a/math/calcoo/Makefile
+++ b/math/calcoo/Makefile
@@ -12,6 +12,7 @@ COMMENT=	RPN and algebraic scientific calculator
 USES=		pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
+LIBS+=		-lm
 
 PLIST_FILES=	bin/calcoo \
 		man/man1/calcoo.1.gz
diff --git a/math/goblin/Makefile b/math/goblin/Makefile
index 3c7d7bdcc358..5bcffeb7a3d4 100644
--- a/math/goblin/Makefile
+++ b/math/goblin/Makefile
@@ -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 \
diff --git a/math/qtiplot/files/build.conf b/math/qtiplot/files/build.conf
index 2fec427440b3..4b544f2d8c30 100644
--- a/math/qtiplot/files/build.conf
+++ b/math/qtiplot/files/build.conf
@@ -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/qwt/src
 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
diff --git a/math/qtiplot/files/patch-qtiplot__qtiplot.pro b/math/qtiplot/files/patch-qtiplot__qtiplot.pro
index 56f38e312926..e9359778cba8 100644
--- a/math/qtiplot/files/patch-qtiplot__qtiplot.pro
+++ b/math/qtiplot/files/patch-qtiplot__qtiplot.pro
@@ -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 \
  
diff --git a/misc/wmcalendar/Makefile b/misc/wmcalendar/Makefile
index 8ae1a46272fe..5c02f54eec4c 100644
--- a/misc/wmcalendar/Makefile
+++ b/misc/wmcalendar/Makefile
@@ -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
 
diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index 40841a2c09c9..d3892063ac1b 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -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
diff --git a/multimedia/ffmpeg2theora/Makefile b/multimedia/ffmpeg2theora/Makefile
index 6ccd92ca7857..847e0afeb1c0 100644
--- a/multimedia/ffmpeg2theora/Makefile
+++ b/multimedia/ffmpeg2theora/Makefile
@@ -16,10 +16,10 @@ LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		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
 
diff --git a/multimedia/ffmpeg2theora/files/patch-SConstruct b/multimedia/ffmpeg2theora/files/patch-SConstruct
index 9d37ce376f6b..3ea68362898d 100644
--- a/multimedia/ffmpeg2theora/files/patch-SConstruct
+++ b/multimedia/ffmpeg2theora/files/patch-SConstruct
@@ -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'])
diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile
index 29938955c238..cc00202d0805 100644
--- a/multimedia/gmerlin/Makefile
+++ b/multimedia/gmerlin/Makefile
@@ -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
 
@@ -69,21 +69,21 @@ TIFF_CONFIGURE_OFF=	--disable-libtiff
 BROKEN=	Fails to build with new libcdio
 .endif
 
+.if !(${OPSYS} == FreeBSD && ${OSVERSION} < 900033)
+LDFLAGS+=	-Wl,--add-needed
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/LIBS/s|-ldl || ; \
-		 s|^LDFLAGS="|&$${LDFLAGS} | ; \
 		 s|-DGTK_DISABLE_DEPRECATED|| ; \
-		 s|-lpthread|-pthread| ; \
 		 s|-O3.*-ffast-math||' ${WRKSRC}/configure
 	@${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}
diff --git a/multimedia/gmerlin/files/patch-configure b/multimedia/gmerlin/files/patch-configure
index 68fe98404f42..e57101f87781 100644
--- a/multimedia/gmerlin/files/patch-configure
+++ b/multimedia/gmerlin/files/patch-configure
@@ -8,42 +8,15 @@
  enable_libvisual
  enable_libcdio
  enable_musicbrainz
-@@ -6324,7 +6325,7 @@
-   rm -rf conftest*
-   ;;
+@@ -13247,7 +13248,7 @@
+   GMERLIN_DEP_RPATH=""
+ fi
+ 
+-LDFLAGS="$GMERLIN_DEP_RPATH"
++LDFLAGS="$LDFLAGS $GMERLIN_DEP_RPATH"
+ 
+ 
  
--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
diff --git a/multimedia/imagination/Makefile b/multimedia/imagination/Makefile
index 03246ba83abc..b876bcfd2dfc 100644
--- a/multimedia/imagination/Makefile
+++ b/multimedia/imagination/Makefile
@@ -19,8 +19,6 @@ USE_GNOME=	gtk20 intltool intlhack libxslt
 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>
diff --git a/multimedia/imagination/files/patch-configure b/multimedia/imagination/files/patch-configure
index 277c8dbbdd86..087578d6476c 100644
--- a/multimedia/imagination/files/patch-configure
+++ b/multimedia/imagination/files/patch-configure
@@ -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
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 9e2de8f6cf08..ed4f6192196a 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -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
diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile
index 6d5a65d9cfa1..e81ee5f26b04 100644
--- a/multimedia/sabbu/Makefile
+++ b/multimedia/sabbu/Makefile
@@ -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>
diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile
index cfdb4ddc692d..f42d876f511b 100644
--- a/multimedia/tvheadend/Makefile
+++ b/multimedia/tvheadend/Makefile
@@ -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 -lssl -lcrypto -lz
 
 OPTIONS_DEFINE=	AVAHI DVBCSA TRANSCODING XMLTV
 OPTIONS_DEFAULT=DVBCSA
diff --git a/net-im/hotot/Makefile b/net-im/hotot/Makefile
index da3c440c5817..be6f9e1404f1 100644
--- a/net-im/hotot/Makefile
+++ b/net-im/hotot/Makefile
@@ -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
diff --git a/net-im/imspector/files/patch-Makefile b/net-im/imspector/files/patch-Makefile
index 4a2e2b5f1e84..2a6dd7e0163f 100644
--- a/net-im/imspector/files/patch-Makefile
+++ b/net-im/imspector/files/patch-Makefile
@@ -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
  
diff --git a/net-im/imspector/pkg-plist b/net-im/imspector/pkg-plist
index f05d5b0ef660..7a1bf7d14a83 100644
--- a/net-im/imspector/pkg-plist
+++ b/net-im/imspector/pkg-plist
@@ -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
diff --git a/net-im/vqcc-gtk/Makefile b/net-im/vqcc-gtk/Makefile
index c23544344cfa..ad044a44b7e9 100644
--- a/net-im/vqcc-gtk/Makefile
+++ b/net-im/vqcc-gtk/Makefile
@@ -14,9 +14,10 @@ LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
 
 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>
diff --git a/net-im/zephyr/files/patch-zhm__Makefile.in b/net-im/zephyr/files/patch-zhm__Makefile.in
new file mode 100644
index 000000000000..45bc1f432d63
--- /dev/null
+++ b/net-im/zephyr/files/patch-zhm__Makefile.in
@@ -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} $<
diff --git a/net-p2p/createtorrent/Makefile b/net-p2p/createtorrent/Makefile
index f7f99cb537d1..1d42535da993 100644
--- a/net-p2p/createtorrent/Makefile
+++ b/net-p2p/createtorrent/Makefile
@@ -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
 
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index e760be40bf47..60403528b9e1 100644
--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@@ -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>
diff --git a/net-p2p/gtorrentviewer/pkg-plist b/net-p2p/gtorrentviewer/pkg-plist
index 7b2ac0d181f8..686a2da77bad 100644
--- a/net-p2p/gtorrentviewer/pkg-plist
+++ b/net-p2p/gtorrentviewer/pkg-plist
@@ -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
diff --git a/net-p2p/libbt/Makefile b/net-p2p/libbt/Makefile
index bbca2c125ac3..23e582002e14 100644
--- a/net-p2p/libbt/Makefile
+++ b/net-p2p/libbt/Makefile
@@ -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:
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index 4536654e743c..7d3de3abf105 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -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,29 +14,17 @@ COMMENT=	Private and secure decentralised communication platform
 
 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 \
+BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		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 \
 		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
-USE_GNOME=	glib20
-USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
+USES=		compiler:features dos2unix pkgconfig qmake
+USE_GNOME=	glib20 libxml2 libxslt
+USE_XORG=	x11 xscrnsaver
 USE_QT4=	corelib gui network xml script designer_build uic_build \
 		qmake_build moc_build rcc_build multimedia
 HAS_CONFIGURE=	yes
diff --git a/net-p2p/retroshare/files/patch-retroshare-gui__src__retroshare-gui.pro b/net-p2p/retroshare/files/patch-retroshare-gui__src__retroshare-gui.pro
index c97372734ee0..6255e157257c 100644
--- a/net-p2p/retroshare/files/patch-retroshare-gui__src__retroshare-gui.pro
+++ b/net-p2p/retroshare/files/patch-retroshare-gui__src__retroshare-gui.pro
@@ -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 ######################################
diff --git a/net-p2p/retroshare/files/patch-retroshare-nogui__src__retroshare-nogui.pro b/net-p2p/retroshare/files/patch-retroshare-nogui__src__retroshare-nogui.pro
index 90292c2c22e5..fd794a6492f8 100644
--- a/net-p2p/retroshare/files/patch-retroshare-nogui__src__retroshare-nogui.pro
+++ b/net-p2p/retroshare/files/patch-retroshare-nogui__src__retroshare-nogui.pro
@@ -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  ######################################
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index d4c5136459e5..034ed34d5351 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -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
diff --git a/net/omnitty/Makefile b/net/omnitty/Makefile
index 2520703fb9b4..e67c57f8a451 100644
--- a/net/omnitty/Makefile
+++ b/net/omnitty/Makefile
@@ -14,6 +14,7 @@ LIB_DEPENDS=	librote.so:${PORTSDIR}/devel/rote
 
 USES=		gmake
 GNU_CONFIGURE=	yes
+LIBS+=		-lncurses
 
 ALL_TARGET=	${PORTNAME}
 
diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index a4a544342ee3..4879835b0155 100644
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -12,10 +12,12 @@ COMMENT=	Production quality, multilayer virtual switch
 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
 
diff --git a/net/packter-agent/Makefile b/net/packter-agent/Makefile
index ef2b282c3912..4a37742f5898 100644
--- a/net/packter-agent/Makefile
+++ b/net/packter-agent/Makefile
@@ -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}
diff --git a/net/packter-agent/pkg-plist b/net/packter-agent/pkg-plist
index 79a2d04cdd25..9d00071e443f 100644
--- a/net/packter-agent/pkg-plist
+++ b/net/packter-agent/pkg-plist
@@ -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
diff --git a/net/udt/Makefile b/net/udt/Makefile
index c61eee7eadb6..b2a5069ed8dc 100644
--- a/net/udt/Makefile
+++ b/net/udt/Makefile
@@ -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>
diff --git a/net/udt/files/BSDmakefile b/net/udt/files/BSDmakefile
index c0d5c5111ca5..7625197ad218 100644
--- a/net/udt/files/BSDmakefile
+++ b/net/udt/files/BSDmakefile
@@ -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
diff --git a/net/vortex/Makefile b/net/vortex/Makefile
index 007f889cbea0..d6eff948cf7e 100644
--- a/net/vortex/Makefile
+++ b/net/vortex/Makefile
@@ -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
diff --git a/net/wireshark/files/patch-Makefile.in b/net/wireshark/files/patch-Makefile.in
deleted file mode 100644
index 8c5f811bb124..000000000000
--- a/net/wireshark/files/patch-Makefile.in
+++ /dev/null
@@ -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@
diff --git a/net/wireshark/files/patch-epan_Makefile.in b/net/wireshark/files/patch-epan_Makefile.in
deleted file mode 100644
index 534461e11a1e..000000000000
--- a/net/wireshark/files/patch-epan_Makefile.in
+++ /dev/null
@@ -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
diff --git a/polish/tleenx2/Makefile b/polish/tleenx2/Makefile
index 0d2a4da0057a..36d8f53c60a5 100644
--- a/polish/tleenx2/Makefile
+++ b/polish/tleenx2/Makefile
@@ -24,7 +24,10 @@ 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} \
+		-e '/^tleenx2_LDADD =/,+1s,/usr/X11R6/lib/libXss.a,-lXss,' \
+		-e 's,/usr/X11R6/lib/libXss.a,,' \
+		${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
diff --git a/ports-mgmt/fbsdmon/Makefile b/ports-mgmt/fbsdmon/Makefile
index a072f57bd75f..e0b74efdc50e 100644
--- a/ports-mgmt/fbsdmon/Makefile
+++ b/ports-mgmt/fbsdmon/Makefile
@@ -16,6 +16,9 @@ LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 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
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index cf92590fe7e4..5a519bd39985 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -14,13 +14,17 @@ 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
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lm
 INSTALL_TARGET=	install-strip
 
 GCONF_SCHEMAS=	ggv.schemas
 
+post-patch:
+	@${REINPLACE_CMD} '/^LIBS =/s/=.*/= @LIBS@/' ${WRKSRC}/src/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/print/ggv/files/patch-src_Makefile.in b/print/ggv/files/patch-src_Makefile.in
deleted file mode 100644
index 76847cf3e9b2..000000000000
--- a/print/ggv/files/patch-src_Makefile.in
+++ /dev/null
@@ -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
diff --git a/print/ggv/pkg-plist b/print/ggv/pkg-plist
index de58dd02a8d7..3d3fe17ede2d 100644
--- a/print/ggv/pkg-plist
+++ b/print/ggv/pkg-plist
@@ -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
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index c5cd794f488d..7145e7f231fc 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -19,11 +19,12 @@ RUN_DEPENDS=	gnomesu:${PORTSDIR}/security/libgnomesu
 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' \
diff --git a/print/photoprint/Makefile b/print/photoprint/Makefile
index 39657ad6b5cc..2462ac35f663 100644
--- a/print/photoprint/Makefile
+++ b/print/photoprint/Makefile
@@ -12,24 +12,21 @@ COMMENT=	Utility to print multiple images per sheet
 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' \
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 4a00f9378e18..061999e84b0d 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -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>
diff --git a/science/chemtool-devel/Makefile b/science/chemtool-devel/Makefile
index dd33f7af783c..4cbee98e48c4 100644
--- a/science/chemtool-devel/Makefile
+++ b/science/chemtool-devel/Makefile
@@ -17,26 +17,22 @@ RUN_DEPENDS=	transfig:${PORTSDIR}/print/transfig
 
 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>
diff --git a/science/chemtool/Makefile b/science/chemtool/Makefile
index 0e5550b72b1d..823de2da6598 100644
--- a/science/chemtool/Makefile
+++ b/science/chemtool/Makefile
@@ -10,22 +10,21 @@ MASTER_SITES=	http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
 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>
diff --git a/science/chemtool/files/patch-Makefile.in b/science/chemtool/files/patch-Makefile.in
index bcdf12b98d33..305e49ef1e77 100644
--- a/science/chemtool/files/patch-Makefile.in
+++ b/science/chemtool/files/patch-Makefile.in
@@ -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
diff --git a/science/gsmc/Makefile b/science/gsmc/Makefile
index 5740c556fea8..c66ad25f2d7b 100644
--- a/science/gsmc/Makefile
+++ b/science/gsmc/Makefile
@@ -12,10 +12,11 @@ COMMENT=	Smith chart program for impedance matching
 
 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>
diff --git a/science/medit/files/patch-makefile b/science/medit/files/patch-makefile
index d6b50ce84e8a..a6694bea59a1 100644
--- a/science/medit/files/patch-makefile
+++ b/science/medit/files/patch-makefile
@@ -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" \
diff --git a/security/gnome-gpg/Makefile b/security/gnome-gpg/Makefile
index 3b42c8630876..1474d4f8f7bb 100644
--- a/security/gnome-gpg/Makefile
+++ b/security/gnome-gpg/Makefile
@@ -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
diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 36de7a4885e4..0f18b9988e1c 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -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
diff --git a/security/pkcs11-dump/Makefile b/security/pkcs11-dump/Makefile
index c6ace9a979d6..b57790c42f46 100644
--- a/security/pkcs11-dump/Makefile
+++ b/security/pkcs11-dump/Makefile
@@ -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
diff --git a/security/rainbowcrack/Makefile b/security/rainbowcrack/Makefile
index d1ded4a2620b..3de108aab9e3 100644
--- a/security/rainbowcrack/Makefile
+++ b/security/rainbowcrack/Makefile
@@ -18,7 +18,9 @@ BROKEN=		does not compile on ia64, powerpc, or sparc64
 .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:
diff --git a/security/tpm-tools/Makefile b/security/tpm-tools/Makefile
index e903400c6282..3ee259b06cae 100644
--- a/security/tpm-tools/Makefile
+++ b/security/tpm-tools/Makefile
@@ -22,8 +22,11 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/tcsd:${PORTSDIR}/security/trousers \
 
 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>
diff --git a/sysutils/battfink/Makefile b/sysutils/battfink/Makefile
index 875652572a3f..b3f5dcee8eaa 100644
--- a/sysutils/battfink/Makefile
+++ b/sysutils/battfink/Makefile
@@ -11,13 +11,13 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Energy saving preferences app for GNOME
 
-USE_XORG=	x11
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomeprefix libgnomeui
 USES=		gettext gmake pathfix pkgconfig tar:bzip2
+USE_XORG=	x11 xext
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lX11 -lXext
 INSTALL_TARGET=	install-strip
 
 GCONF_SCHEMAS=	battfink.schemas
diff --git a/sysutils/battfink/files/patch-configure b/sysutils/battfink/files/patch-configure
deleted file mode 100644
index 6e7783f3e9ba..000000000000
--- a/sysutils/battfink/files/patch-configure
+++ /dev/null
@@ -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
- 
- 
diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index 491d3ed4b68d..fa7375138b75 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -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'
 
diff --git a/sysutils/fusefs-rar2fs/Makefile b/sysutils/fusefs-rar2fs/Makefile
index 1231844094a8..3986aa0fdd31 100644
--- a/sysutils/fusefs-rar2fs/Makefile
+++ b/sysutils/fusefs-rar2fs/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Mount rar archives as filesystem
 
 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=${LOCALBASE}/lib \
 	--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
diff --git a/sysutils/gapcmon/Makefile b/sysutils/gapcmon/Makefile
index d8782ea2059d..9600fcb0777f 100644
--- a/sysutils/gapcmon/Makefile
+++ b/sysutils/gapcmon/Makefile
@@ -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
 
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 2b8e0384df8d..b5c018342a42 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -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}/devel/liboobs \
 		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>
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 254a48735ef2..97bb39d9663b 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -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
diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index 2ebac168b41e..0649549926da 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -12,22 +12,12 @@ COMMENT=	GTK2-based imond-client to control an on(e) disc fli4l router
 
 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 \
diff --git a/sysutils/ldapvi/Makefile b/sysutils/ldapvi/Makefile
index 0b3e0d5a6de8..1fdfe8ae97c9 100644
--- a/sysutils/ldapvi/Makefile
+++ b/sysutils/ldapvi/Makefile
@@ -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>
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index 772afa198aaa..ee7cd8e655c9 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -17,12 +17,23 @@ LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
 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} '/AM_CFLAGS/s/-g -O2//' \
+		${WRKSRC}/gksu-properties/Makefile.in \
+		${WRKSRC}/libgksu/Makefile.in \
+		${WRKSRC}/libgksuui/Makefile.in
+	@${REINPLACE_CMD} '/^test_gksu_LDFLAGS =/s/glib-2.0/gtk+-2.0/' \
+		${WRKSRC}/libgksu/Makefile.in
+	@${REINPLACE_CMD} '/^libgksuui1_0_la_LIBADD =/s/$$/ -lX11/' \
+		${WRKSRC}/libgksuui/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/libgksu/files/patch-libgksu_Makefile.in b/sysutils/libgksu/files/patch-libgksu_Makefile.in
deleted file mode 100644
index 6d0a436a03f6..000000000000
--- a/sysutils/libgksu/files/patch-libgksu_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgksu/Makefile.in.o	2011-04-11 13:45:10.938246716 -0400
-+++ libgksu/Makefile.in	2011-04-11 13:46:36.384246142 -0400
-@@ -266,7 +266,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--AM_CFLAGS = -g -O2 -Wall
-+AM_CFLAGS = $(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
diff --git a/sysutils/nitrogen/Makefile b/sysutils/nitrogen/Makefile
index ac2e49444b40..cb111f0f1ca4 100644
--- a/sysutils/nitrogen/Makefile
+++ b/sysutils/nitrogen/Makefile
@@ -13,19 +13,6 @@ COMMENT=	Background browser and setter for X windows
 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>
diff --git a/sysutils/nvclock/Makefile b/sysutils/nvclock/Makefile
index c2ca40e5fef4..09d7e153dea9 100644
--- a/sysutils/nvclock/Makefile
+++ b/sysutils/nvclock/Makefile
@@ -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>
diff --git a/sysutils/pcbsd-utils-qt4/Makefile b/sysutils/pcbsd-utils-qt4/Makefile
index d8b8c4c4df7c..573eac7a3027 100644
--- a/sysutils/pcbsd-utils-qt4/Makefile
+++ b/sysutils/pcbsd-utils-qt4/Makefile
@@ -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>
diff --git a/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in b/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in
index e00d83cf4e40..c4aa666359d6 100644
--- a/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in
+++ b/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in
@@ -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)
diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile
index 3ac7b2de4650..23197bdba157 100644
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -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}
diff --git a/textproc/fldiff/Makefile b/textproc/fldiff/Makefile
index 4739e476b81d..687e951c3ad9 100644
--- a/textproc/fldiff/Makefile
+++ b/textproc/fldiff/Makefile
@@ -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
 
diff --git a/textproc/goldendict/Makefile b/textproc/goldendict/Makefile
index 8731c541a437..bc3d0c856ee2 100644
--- a/textproc/goldendict/Makefile
+++ b/textproc/goldendict/Makefile
@@ -14,12 +14,11 @@ COMMENT=	Feature-rich Qt4 based dictionary lookup program
 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 \
diff --git a/www/blastbeat/Makefile b/www/blastbeat/Makefile
index 4087bdb0c6b6..6045bdcd0770 100644
--- a/www/blastbeat/Makefile
+++ b/www/blastbeat/Makefile
@@ -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
diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index 3cbf0cc297c4..e6183d4c3f94 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -14,18 +14,17 @@ COMMENT=	Gnome program to check a page/website for broken links
 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>
 
diff --git a/www/surf/Makefile b/www/surf/Makefile
index e7178bd5a478..2bb1476c1718 100644
--- a/www/surf/Makefile
+++ b/www/surf/Makefile
@@ -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}/share/pixmaps/surf.png" "surf" "" true
 
 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
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 104b6d902d8c..c3120b3657ae 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -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} '/^libutil_la_LIBADD =/s/$$/ -lm/' \
+		${WRKSRC}/gal/util/Makefile.in
 	@${REINPLACE_CMD} -e 's|glib/gmacros.h|glib.h|g' \
 		${WRKSRC}/gal/util/e-text-event-processor-types.h
 
diff --git a/x11-wm/devilspie/Makefile b/x11-wm/devilspie/Makefile
index d5f0b91a5846..4f5bb3022e6d 100644
--- a/x11-wm/devilspie/Makefile
+++ b/x11-wm/devilspie/Makefile
@@ -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 \
diff --git a/x11-wm/gcompmgr/Makefile b/x11-wm/gcompmgr/Makefile
index 8fcb83105813..caf1fd396c2b 100644
--- a/x11-wm/gcompmgr/Makefile
+++ b/x11-wm/gcompmgr/Makefile
@@ -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" \
diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile
index f286f14a040e..ad2e67e00f09 100644
--- a/x11/alltray/Makefile
+++ b/x11/alltray/Makefile
@@ -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
diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile
index da8d6dd8b325..3fb7edd6c065 100644
--- a/x11/bbrun/Makefile
+++ b/x11/bbrun/Makefile
@@ -14,7 +14,7 @@ OPTIONS_DEFINE=	DOCS
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/bbrun
 
-USE_XORG=	xpm
+USE_XORG=	x11 xext xpm
 USE_GNOME=	gtk20
 USES=		gmake pkgconfig
 USE_CSTD=	gnu89
diff --git a/x11/bbrun/files/patch-Makefile b/x11/bbrun/files/patch-Makefile
index 7144020704a9..1605750fa0bd 100644
--- a/x11/bbrun/files/patch-Makefile
+++ b/x11/bbrun/files/patch-Makefile
@@ -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 x11 xext xpm`
++CFLAGS += `pkg-config --cflags gtk+-2.0 x11 xext xpm`
  
  OBJS   = bbrun.o \
           ../wmgeneral/wmgeneral.o \
diff --git a/x11/brightside/Makefile b/x11/brightside/Makefile
index fdad585953b7..4363c2ea5277 100644
--- a/x11/brightside/Makefile
+++ b/x11/brightside/Makefile
@@ -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
 
diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile
index 81abc268eb9c..1a010f02a45d 100644
--- a/x11/fbpanel/Makefile
+++ b/x11/fbpanel/Makefile
@@ -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}" "${PORTNAME} NETWM compliant X11 desktop panel" \
 		"${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
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 825a562ade55..843f72183f89 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -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 gnomedesktop are unsupported on ${ARCH}"
 .endif
 
 .if ${ARCH} != "i386" && ${ARCH} != "amd64"
-CFLAGS+=	-fPIC
 PLIST_SUB+=	BATTERY="@comment "
 .else
 GCONF_SCHEMAS+=	battstat.schemas
@@ -95,6 +94,12 @@ 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
+	@${REINPLACE_CMD} '/^stickynotes_applet_LDADD =/s/=/= $$(X_LIBS)/' \
+		${WRKSRC}/stickynotes/Makefile.in
+	@${REINPLACE_CMD} '/^trashapplet_LDADD =/s/=/= $$(X_LIBS)/' \
+		${WRKSRC}/trashapplet/src/Makefile.in
 .if !defined(USE_PYTHON)
 	@${REINPLACE_CMD} -e 's|HAVE_PYGTK="yes"|HAVE_PYGTK="no"|' \
 		${WRKSRC}/configure
diff --git a/x11/gnome-clipboard-daemon/Makefile b/x11/gnome-clipboard-daemon/Makefile
index 4c8ecba5de71..fd2650226cac 100644
--- a/x11/gnome-clipboard-daemon/Makefile
+++ b/x11/gnome-clipboard-daemon/Makefile
@@ -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
diff --git a/x11/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile
index c48f33cc1a85..9758a54e84be 100644
--- a/x11/gnome-swallow/Makefile
+++ b/x11/gnome-swallow/Makefile
@@ -10,17 +10,17 @@ MASTER_SITES=	http://interreality.org/~tetron/technology/swallow/
 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>
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index e93812e17915..bead657e8d78 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://www.home.unix-ag.org/simon/gromit/
 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
 
diff --git a/x11/gromit/files/patch-Makefile b/x11/gromit/files/patch-Makefile
index 0f41bedb2776..e0309e0a8bd6 100644
--- a/x11/gromit/files/patch-Makefile
+++ b/x11/gromit/files/patch-Makefile
@@ -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
diff --git a/x11/sbxkb/Makefile b/x11/sbxkb/Makefile
index 5952faf62d73..c49c75c92322 100644
--- a/x11/sbxkb/Makefile
+++ b/x11/sbxkb/Makefile
@@ -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
diff --git a/x11/simdock/Makefile b/x11/simdock/Makefile
index 9b6254d96a89..1c20adb0c1dc 100644
--- a/x11/simdock/Makefile
+++ b/x11/simdock/Makefile
@@ -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
diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile
index 63f49cf78ef2..0cb7dfaaf559 100644
--- a/x11/sisctrl/Makefile
+++ b/x11/sisctrl/Makefile
@@ -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
 
diff --git a/x11/stjerm/Makefile b/x11/stjerm/Makefile
index eb2a4ee79845..11318d8dcd94 100644
--- a/x11/stjerm/Makefile
+++ b/x11/stjerm/Makefile
@@ -9,15 +9,17 @@ MASTER_SITES=	http://stjerm-terminal.googlecode.com/files/
 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>
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index d7970d3319a3..4fe05c18dabd 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Clipboard history management dockapp for Window Maker
 SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USES=		pkgconfig
-USE_XORG=	xpm
 USE_GNOME=	gtk20
+USE_XORG=	x11
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/x11/wmcliphist/files/patch-Makefile b/x11/wmcliphist/files/patch-Makefile
index 3b297e3c13de..319e5225db69 100644
--- a/x11/wmcliphist/files/patch-Makefile
+++ b/x11/wmcliphist/files/patch-Makefile
@@ -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