svn commit: r366215 - in head: accessibility/gnopernicus audio/gqradio audio/jack-rack audio/padevchooser comms/kb/files deskutils/fusenshi deskutils/fusenshi/files deskutils/glabels deskutils/gnom...

Tijl Coosemans tijl at FreeBSD.org
Tue Aug 26 14:06:23 UTC 2014 

Author: tijl
Date: Tue Aug 26 14:06:08 2014
New Revision: 366215
URL: http://svnweb.freebsd.org/changeset/ports/366215
QAT: https://qat.redports.org/buildarchive/r366215/

Log:
  - Fix missing library problems when the linker enforces explicit linking
  
  PR:		192062
  Exp-run by:	antoine
  Approved by:	portmgr (antoine)

Added:
  head/deskutils/multisync/files/patch-src-Makefile.am   (contents, props changed)
  head/editors/codelite/files/patch-sdk_codelite_indexer_CMakeLists.txt   (contents, props changed)
  head/games/liquidwar/files/patch-src-Makefile.in   (contents, props changed)
  head/mail/mail-notification/files/patch-jbsrc-jb.c   (contents, props changed)
  head/net-im/zephyr/files/patch-zhm__Makefile.in   (contents, props changed)
Deleted:
  head/games/gillo/files/patch-src_Jamfile
  head/graphics/cinepaint/files/patch-app__menus.c
  head/graphics/cinepaint/files/patch-lib__fl_i18n__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__blur__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__jhead__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__compose__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__dbbrowser__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__decompose__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__dicom__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__fits__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__gbr__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__hdr__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__iff__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__jpeg__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__median__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__minimum__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__noisify__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__openexr__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__pdf__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__pic__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__png__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__pnm__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__psd_save__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__screenshot__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__sgi__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__tga__Makefile.am
  head/graphics/cinepaint/files/patch-plug-ins__xwd__Makefile.am
  head/net/wireshark/files/patch-Makefile.in
  head/net/wireshark/files/patch-epan_Makefile.in
  head/print/ggv/files/
  head/sysutils/battfink/files/patch-configure
  head/sysutils/libgksu/files/patch-libgksu_Makefile.in
Modified:
  head/accessibility/gnopernicus/Makefile
  head/audio/gqradio/Makefile
  head/audio/jack-rack/Makefile
  head/audio/padevchooser/Makefile
  head/comms/kb/files/Makefile
  head/deskutils/fusenshi/Makefile
  head/deskutils/fusenshi/files/patch-src-Makefile
  head/deskutils/glabels/Makefile
  head/deskutils/gnome-main-menu/files/patch-configure
  head/deskutils/gtimer/Makefile
  head/deskutils/mdh/Makefile
  head/deskutils/multisync/Makefile
  head/deskutils/notecase/Makefile
  head/deskutils/notecase/files/patch-Makefile
  head/deskutils/notify-osd/Makefile
  head/deskutils/xfce4-notification-daemon/Makefile
  head/editors/ghex/Makefile
  head/editors/madedit/Makefile
  head/emulators/jzintv/Makefile
  head/emulators/tilem/Makefile
  head/finance/grisbi/Makefile
  head/finance/xtrader/Makefile
  head/finance/xtrader/files/patch-Makefile.linux
  head/ftp/pureadmin/Makefile
  head/games/airstrike/Makefile
  head/games/asteroid/Makefile
  head/games/atanks/Makefile
  head/games/belooted/Makefile
  head/games/belooted/pkg-plist
  head/games/bitefusion/Makefile
  head/games/blokish/Makefile
  head/games/bomberclone/Makefile
  head/games/caph/Makefile
  head/games/construo/Makefile
  head/games/d2x-xl/Makefile
  head/games/defendguin/Makefile
  head/games/egoboo/files/patch-game-Makefile.unix
  head/games/frogatto/Makefile
  head/games/frogatto/files/patch-Makefile
  head/games/gillo/Makefile
  head/games/gillo/files/patch-Jamrules
  head/games/gnomebreakout/Makefile
  head/games/gnurobbo/Makefile
  head/games/goonies/Makefile
  head/games/goonies/files/patch-build-linux-Makefile
  head/games/holotz-castle/files/patch-src__Makefile
  head/games/lianliankan/Makefile
  head/games/lianliankan/files/patch-src__Makefile.am
  head/games/lucidlife/Makefile
  head/games/luola/Makefile
  head/games/macopix/Makefile
  head/games/meritous/files/patch-Makefile
  head/games/monkeybubble/Makefile
  head/games/motogt/Makefile
  head/games/motogt/files/patch-src-Makefile.lnx
  head/games/naev/Makefile
  head/games/neverball/Makefile
  head/games/neverball/files/patch-Makefile
  head/games/noegnud-littlehack/files/noegnud-littlehack.patch
  head/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch
  head/games/noegnud-nethack/files/noegnud-nethack.patch
  head/games/noegnud-slashem/files/noegnud-slashem.patch
  head/games/nuclearchess/Makefile
  head/games/openjazz/files/patch-Makefile
  head/games/pacmanarena/Makefile
  head/games/phlipple/Makefile
  head/games/powermanga/Makefile
  head/games/simplevaders/Makefile
  head/games/thevalley/Makefile
  head/games/viruskiller/Makefile
  head/games/volleyball/Makefile
  head/games/vor/Makefile
  head/games/wargus/Makefile
  head/graphics/cfdg/files/patch-Makefile
  head/graphics/cinepaint/Makefile
  head/graphics/cinepaint/files/patch-app__Makefile.am
  head/graphics/exiftran/files/Makefile.exiftran
  head/graphics/gimageview/Makefile
  head/graphics/gimp-wavelet-denoise-plugin/Makefile
  head/graphics/gimp-wavelet-sharpen-plugin/Makefile
  head/graphics/gpaint/Makefile
  head/graphics/gqview/Makefile
  head/graphics/inventor/Makefile
  head/graphics/inventor/files/patch-lib-GNUmakefile
  head/graphics/klatexformula/Makefile
  head/graphics/kudu/Makefile
  head/graphics/lprof-devel/files/patch-src-CMakeLists.txt
  head/graphics/nomacs/files/patch-CMakeLists.txt
  head/graphics/panoglview/Makefile
  head/graphics/pornview/Makefile
  head/graphics/reallyslick/Makefile
  head/graphics/rgbpaint/Makefile
  head/graphics/separate/Makefile
  head/graphics/vp/Makefile
  head/graphics/xzgv/Makefile
  head/japanese/im-ja/Makefile
  head/korean/gtkcomm/Makefile
  head/lang/cduce/Makefile
  head/mail/deforaos-mailer/Makefile
  head/mail/gnubiff/Makefile
  head/math/calcoo/Makefile
  head/math/goblin/Makefile
  head/math/qtiplot/files/build.conf
  head/math/qtiplot/files/patch-qtiplot__qtiplot.pro
  head/misc/wmcalendar/Makefile
  head/multimedia/aegisub/Makefile
  head/multimedia/ffmpeg2theora/Makefile
  head/multimedia/ffmpeg2theora/files/patch-SConstruct
  head/multimedia/gmerlin/Makefile
  head/multimedia/gmerlin/files/patch-configure
  head/multimedia/imagination/Makefile
  head/multimedia/imagination/files/patch-configure
  head/multimedia/mpeg4ip/Makefile
  head/multimedia/sabbu/Makefile
  head/multimedia/tvheadend/Makefile
  head/net-im/hotot/Makefile
  head/net-im/imspector/files/patch-Makefile
  head/net-im/imspector/pkg-plist
  head/net-im/vqcc-gtk/Makefile
  head/net-p2p/createtorrent/Makefile
  head/net-p2p/gtorrentviewer/Makefile
  head/net-p2p/gtorrentviewer/pkg-plist
  head/net-p2p/libbt/Makefile
  head/net-p2p/retroshare/Makefile
  head/net-p2p/retroshare/files/patch-retroshare-gui__src__retroshare-gui.pro
  head/net-p2p/retroshare/files/patch-retroshare-nogui__src__retroshare-nogui.pro
  head/net/gnome-netstatus/Makefile
  head/net/omnitty/Makefile
  head/net/openvswitch/Makefile
  head/net/packter-agent/Makefile
  head/net/packter-agent/pkg-plist
  head/net/udt/Makefile
  head/net/udt/files/BSDmakefile
  head/net/vortex/Makefile
  head/polish/tleenx2/Makefile
  head/ports-mgmt/fbsdmon/Makefile
  head/print/ggv/Makefile
  head/print/ggv/pkg-plist
  head/print/gnome-cups-manager/Makefile
  head/print/photoprint/Makefile
  head/print/xfce4-print/Makefile
  head/science/chemtool-devel/Makefile
  head/science/chemtool/Makefile
  head/science/chemtool/files/patch-Makefile.in
  head/science/gsmc/Makefile
  head/science/medit/files/patch-makefile
  head/security/gnome-gpg/Makefile
  head/security/opensc/Makefile
  head/security/pkcs11-dump/Makefile
  head/security/rainbowcrack/Makefile
  head/security/tpm-tools/Makefile
  head/sysutils/battfink/Makefile
  head/sysutils/fusefs-encfs/Makefile
  head/sysutils/fusefs-rar2fs/Makefile
  head/sysutils/gapcmon/Makefile
  head/sysutils/gnome-system-tools/Makefile
  head/sysutils/gnome-system-tools/pkg-plist
  head/sysutils/gtk-imonc/Makefile
  head/sysutils/ldapvi/Makefile
  head/sysutils/libgksu/Makefile
  head/sysutils/nitrogen/Makefile
  head/sysutils/nvclock/Makefile
  head/sysutils/pcbsd-utils-qt4/Makefile
  head/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in
  head/sysutils/xvidcap/Makefile
  head/textproc/fldiff/Makefile
  head/textproc/goldendict/Makefile
  head/www/blastbeat/Makefile
  head/www/gurlchecker/Makefile
  head/www/surf/Makefile
  head/x11-toolkits/gal2/Makefile
  head/x11-wm/devilspie/Makefile
  head/x11-wm/gcompmgr/Makefile
  head/x11/alltray/Makefile
  head/x11/bbrun/Makefile
  head/x11/bbrun/files/patch-Makefile
  head/x11/brightside/Makefile
  head/x11/fbpanel/Makefile
  head/x11/gnome-applets/Makefile
  head/x11/gnome-clipboard-daemon/Makefile
  head/x11/gnome-swallow/Makefile
  head/x11/gromit/Makefile
  head/x11/gromit/files/patch-Makefile   (contents, props changed)
  head/x11/sbxkb/Makefile
  head/x11/simdock/Makefile
  head/x11/sisctrl/Makefile
  head/x11/stjerm/Makefile
  head/x11/wmcliphist/Makefile
  head/x11/wmcliphist/files/patch-Makefile

Modified: head/accessibility/gnopernicus/Makefile
==============================================================================
--- head/accessibility/gnopernicus/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/accessibility/gnopernicus/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -16,10 +16,12 @@ LIB_DEPENDS=	libgnome-mag.so:${PORTSDIR}
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
+USE_XORG=	x11
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix intlhack libgnomeui atspi gnomespeech
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	X_LIBS=-lX11
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	SED="${SED}"

Modified: head/audio/gqradio/Makefile
==============================================================================
--- head/audio/gqradio/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/audio/gqradio/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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
 

Modified: head/audio/jack-rack/Makefile
==============================================================================
--- head/audio/jack-rack/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/audio/jack-rack/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -20,7 +20,7 @@ USES=		gettext shebangfix pkgconfig tar:
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lm
 CONFIGURE_ARGS=	--disable-ladcca --disable-lash --disable-aseq
 SHEBANG_FILES=	ecarack
 

Modified: head/audio/padevchooser/Makefile
==============================================================================
--- head/audio/padevchooser/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/audio/padevchooser/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -16,7 +16,9 @@ LIB_DEPENDS=	libglademm-2.4.so:${PORTSDI
 RUN_DEPENDES=	dbus-daemon:${PORTSDIR}/devel/dbus
 
 GNU_CONFIGURE=	yes
+LIBS+=		-L${LOCALBASE}/lib -lX11
 USES=		gmake pkgconfig
+USE_XORG=	x11
 
 CONFIGURE_ARGS=	--disable-lynx
 

Modified: head/comms/kb/files/Makefile
==============================================================================
--- head/comms/kb/files/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/comms/kb/files/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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

Modified: head/deskutils/fusenshi/Makefile
==============================================================================
--- head/deskutils/fusenshi/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/deskutils/fusenshi/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -10,11 +10,9 @@ MASTER_SITES=	http://www.ongs.co.jp/proj
 MAINTAINER=	ozawa at 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

Modified: head/deskutils/fusenshi/files/patch-src-Makefile
==============================================================================
--- head/deskutils/fusenshi/files/patch-src-Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/deskutils/fusenshi/files/patch-src-Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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:

Modified: head/deskutils/glabels/Makefile
==============================================================================
--- head/deskutils/glabels/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/deskutils/glabels/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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>

Modified: head/deskutils/gnome-main-menu/files/patch-configure
==============================================================================
--- head/deskutils/gnome-main-menu/files/patch-configure	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/deskutils/gnome-main-menu/files/patch-configure	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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
  

Modified: head/deskutils/gtimer/Makefile
==============================================================================
--- head/deskutils/gtimer/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/deskutils/gtimer/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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

Modified: head/deskutils/mdh/Makefile
==============================================================================
--- head/deskutils/mdh/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/deskutils/mdh/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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

Modified: head/deskutils/multisync/Makefile
==============================================================================
--- head/deskutils/multisync/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/deskutils/multisync/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -11,12 +11,10 @@ DISTNAME=	multisync-${PORTVERSION}
 MAINTAINER?=	ports at 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>

Added: head/deskutils/multisync/files/patch-src-Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/multisync/files/patch-src-Makefile.am	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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
+ 

Modified: head/deskutils/notecase/Makefile
==============================================================================
--- head/deskutils/notecase/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/deskutils/notecase/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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)
 

Modified: head/deskutils/notecase/files/patch-Makefile
==============================================================================
--- head/deskutils/notecase/files/patch-Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/deskutils/notecase/files/patch-Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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	
  
  #

Modified: head/deskutils/notify-osd/Makefile
==============================================================================
--- head/deskutils/notify-osd/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/deskutils/notify-osd/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -13,18 +13,18 @@ COMMENT=	On-screen-display notification 
 
 LICENSE=	GPLv3
 
-CONFLICTS=	xfce4-notification-daemon-[0-9]*
-
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libnotify.so:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	dbus-daemon:${PORTSDIR}/devel/dbus
 
+CONFLICTS=	xfce4-notification-daemon-[0-9]*
+
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pkgconfig
 USE_GNOME=	libwnck gconf2
-USE_XORG=	pixman
+USE_XORG=	pixman x11
 
-LDFLAGS+=	-L${LOCALBASE}/lib -lpixman-1
+LIBS+=		-L${LOCALBASE}/lib -lpixman-1 -lX11
 
 .include <bsd.port.options.mk>
 

Modified: head/deskutils/xfce4-notification-daemon/Makefile
==============================================================================
--- head/deskutils/xfce4-notification-daemon/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/deskutils/xfce4-notification-daemon/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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

Added: head/editors/codelite/files/patch-sdk_codelite_indexer_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/codelite/files/patch-sdk_codelite_indexer_CMakeLists.txt	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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)
+ 

Modified: head/editors/ghex/Makefile
==============================================================================
--- head/editors/ghex/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/editors/ghex/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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>

Modified: head/editors/madedit/Makefile
==============================================================================
--- head/editors/madedit/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/editors/madedit/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -12,20 +12,16 @@ COMMENT=	Open-source and cross-platform 
 
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
+
 USES=		gettext pkgconfig dos2unix desktop-file-utils
 USE_WX=		2.8+
 WANT_UNICODE=	yes
-
-LIB_DEPENDS+=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
+USE_XORG=	x11
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
-CONFIGURE_ENV+=	PKG_CONFIG="${PKG_CONFIG}" glib_gtk2_CFLAGS="${glib_gtk2_CFLAGS}" glib_gtk2_LIBS="${glib_gtk2_LIBS}"
-CXXFLAGS+=	${glib_gtk2_CFLAGS}
-
-PKG_CONFIG?=	${LOCALBASE}/bin/pkgconf
-glib_gtk2_CFLAGS=`${PKG_CONFIG} --cflags gtk+-2.0`
-glib_gtk2_LIBS=	`${PKG_CONFIG} --libs gtk+-2.0`
+CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
+LIBS+=		-L${LOCALBASE}/lib -lX11
 
 BROKEN_sparc64=	yes
 

Modified: head/emulators/jzintv/Makefile
==============================================================================
--- head/emulators/jzintv/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/emulators/jzintv/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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

Modified: head/emulators/tilem/Makefile
==============================================================================
--- head/emulators/tilem/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/emulators/tilem/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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:

Modified: head/finance/grisbi/Makefile
==============================================================================
--- head/finance/grisbi/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/finance/grisbi/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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
 

Modified: head/finance/xtrader/Makefile
==============================================================================
--- head/finance/xtrader/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/finance/xtrader/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -13,7 +13,6 @@ COMMENT=	Technical analysis program for 
 LIB_DEPENDS=	libptypes.so:${PORTSDIR}/devel/ptypes \
 		libfltk.so.1:${PORTSDIR}/x11-toolkits/fltk
 
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 MAKEFILE=	Makefile.linux
 USE_XORG=	x11 xpm
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}

Modified: head/finance/xtrader/files/patch-Makefile.linux
==============================================================================
--- head/finance/xtrader/files/patch-Makefile.linux	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/finance/xtrader/files/patch-Makefile.linux	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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
  

Modified: head/ftp/pureadmin/Makefile
==============================================================================
--- head/ftp/pureadmin/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/ftp/pureadmin/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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

Modified: head/games/airstrike/Makefile
==============================================================================
--- head/games/airstrike/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/airstrike/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -39,6 +39,7 @@ DESKTOP_ENTRIES="Airstrike" "" "${PORTNA
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CFLAGS += -DLINUX|#CFLAGS += -DLINUX|' \
+		-e '/$$(CC)/s/$$/ -lm/' \
 		${WRKSRC}/src/Makefile
 	@${FIND} ${WRKSRC} -name '*.c' -or -name '*.h' | ${XARGS} \
 		${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g'

Modified: head/games/asteroid/Makefile
==============================================================================
--- head/games/asteroid/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/asteroid/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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

Modified: head/games/atanks/Makefile
==============================================================================
--- head/games/atanks/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/atanks/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -22,6 +22,7 @@ PORTDOCS=	Changelog README README_ru.txt
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
+	@${REINPLACE_CMD} '/^LDFLAGS =/s/$$/ -pthread/' ${WRKSRC}/src/Makefile.bsd
 	@${REINPLACE_CMD} -e \
 		's/int Filter_File( struct dirent/int Filter_File( const struct dirent/' \
 		${WRKSRC}/src/files.cpp

Modified: head/games/belooted/Makefile
==============================================================================
--- head/games/belooted/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/belooted/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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 at 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>

Modified: head/games/belooted/pkg-plist
==============================================================================
--- head/games/belooted/pkg-plist	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/belooted/pkg-plist	Tue Aug 26 14:06:08 2014	(r366215)
@@ -42,5 +42,3 @@ share/pixmaps/belooted/icon-spade.xpm
 share/pixmaps/belooted/icon-none.xpm
 @dirrm share/pixmaps/belooted
 share/pixmaps/belooted.png
- at exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
- at unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true

Modified: head/games/bitefusion/Makefile
==============================================================================
--- head/games/bitefusion/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/bitefusion/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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
 

Modified: head/games/blokish/Makefile
==============================================================================
--- head/games/blokish/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/blokish/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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>

Modified: head/games/bomberclone/Makefile
==============================================================================
--- head/games/bomberclone/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/bomberclone/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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
 

Modified: head/games/caph/Makefile
==============================================================================
--- head/games/caph/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/caph/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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

Modified: head/games/construo/Makefile
==============================================================================
--- head/games/construo/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/construo/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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

Modified: head/games/d2x-xl/Makefile
==============================================================================
--- head/games/d2x-xl/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/d2x-xl/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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} && \

Modified: head/games/defendguin/Makefile
==============================================================================
--- head/games/defendguin/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/defendguin/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -30,7 +30,7 @@ DESKTOP_ENTRIES="Defendguin" "" "${PORTN
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} -DDATA_PREFIX=\"${DATADIR}/\" \
 		`${SDL_CONFIG} --cflags` defendguin.c -o defendguin \
-		`${SDL_CONFIG} --libs` -lSDL_mixer
+		`${SDL_CONFIG} --libs` -lSDL_mixer -lm
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/

Modified: head/games/egoboo/files/patch-game-Makefile.unix
==============================================================================
--- head/games/egoboo/files/patch-game-Makefile.unix	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/egoboo/files/patch-game-Makefile.unix	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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
  

Modified: head/games/frogatto/Makefile
==============================================================================
--- head/games/frogatto/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/frogatto/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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

Modified: head/games/frogatto/files/patch-Makefile
==============================================================================
--- head/games/frogatto/files/patch-Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/frogatto/files/patch-Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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
  

Modified: head/games/gillo/Makefile
==============================================================================
--- head/games/gillo/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/gillo/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -20,21 +20,20 @@ BUILD_DEPENDS=	${JAM}:${PORTSDIR}/devel/
 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:

Modified: head/games/gillo/files/patch-Jamrules
==============================================================================
--- head/games/gillo/files/patch-Jamrules	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/gillo/files/patch-Jamrules	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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 ;

Modified: head/games/gnomebreakout/Makefile
==============================================================================
--- head/games/gnomebreakout/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/gnomebreakout/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -14,11 +14,12 @@ COMMENT=	GNOME version of the classic br
 
 USES=		pathfix pkgconfig
 USE_GNOME=	gnomeprefix libgnomeui
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lm
+LIBS+=		-L${LOCALBASE}/lib -lX11 -lm
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 

Modified: head/games/gnurobbo/Makefile
==============================================================================
--- head/games/gnurobbo/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/gnurobbo/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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:

Modified: head/games/goonies/Makefile
==============================================================================
--- head/games/goonies/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/goonies/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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}

Modified: head/games/goonies/files/patch-build-linux-Makefile
==============================================================================
--- head/games/goonies/files/patch-build-linux-Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/goonies/files/patch-build-linux-Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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

Modified: head/games/holotz-castle/files/patch-src__Makefile
==============================================================================
--- head/games/holotz-castle/files/patch-src__Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/holotz-castle/files/patch-src__Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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: 

Modified: head/games/lianliankan/Makefile
==============================================================================
--- head/games/lianliankan/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/lianliankan/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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
 

Modified: head/games/lianliankan/files/patch-src__Makefile.am
==============================================================================
--- head/games/lianliankan/files/patch-src__Makefile.am	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/lianliankan/files/patch-src__Makefile.am	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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
+ 

Added: head/games/liquidwar/files/patch-src-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/liquidwar/files/patch-src-Makefile.in	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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 . \

Modified: head/games/lucidlife/Makefile
==============================================================================
--- head/games/lucidlife/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/lucidlife/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -12,8 +12,12 @@ COMMENT=	GTK2 implementation of Conway's
 
 USES=		gmake pkgconfig
 USE_GNOME=	gtk20 gnomevfs2 intlhack
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
+post-patch:
+	@${REINPLACE_CMD} '/^GNOME_MODULES=/s/"$$/ x11"/' ${WRKSRC}/configure
+
 .include <bsd.port.mk>

Modified: head/games/luola/Makefile
==============================================================================
--- head/games/luola/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/luola/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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

Modified: head/games/macopix/Makefile
==============================================================================
--- head/games/macopix/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/macopix/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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
 

Modified: head/games/meritous/files/patch-Makefile
==============================================================================
--- head/games/meritous/files/patch-Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/meritous/files/patch-Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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 \

Modified: head/games/monkeybubble/Makefile
==============================================================================
--- head/games/monkeybubble/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/monkeybubble/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -13,13 +13,13 @@ COMMENT=	GTK2 Puzzle Bobble clone with m
 
 LICENSE=	GPLv2
 
-USES=		pathfix gmake pkgconfig
+USES=		gmake libtool pathfix pkgconfig
 USE_GNOME=	gnomedocutils gnomeprefix intlhack \
 		librsvg2 libgnomeui
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lm
 INSTALLS_OMF=	yes
 
 GCONF_SCHEMAS=	monkey-bubble.schemas

Modified: head/games/motogt/Makefile
==============================================================================
--- head/games/motogt/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/motogt/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -21,14 +21,14 @@ LICENSE_PERMS_CCbySA=	dist-mirror dist-s
 LICENSE_FILE_CCbySA=	${WRKSRC}/doc/cc-by-sa.txt
 
 USES=		zip
+USE_GL=		gl
 BUILD_WRKSRC=	${WRKSRC}/src
 MAKEFILE=	Makefile.lnx
 MAKE_JOBS_UNSAFE=	yes
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
-MAKE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 SUB_FILES=	motogt
 CXXFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/${PORTNAME} libexec/MotoGT.bin
 PORTDATA=	*

Modified: head/games/motogt/files/patch-src-Makefile.lnx
==============================================================================
--- head/games/motogt/files/patch-src-Makefile.lnx	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/motogt/files/patch-src-Makefile.lnx	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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
  

Modified: head/games/naev/Makefile
==============================================================================
--- head/games/naev/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/naev/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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

Modified: head/games/neverball/Makefile
==============================================================================
--- head/games/neverball/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/neverball/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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>

Modified: head/games/neverball/files/patch-Makefile
==============================================================================
--- head/games/neverball/files/patch-Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/neverball/files/patch-Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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%%

Modified: head/games/noegnud-littlehack/files/noegnud-littlehack.patch
==============================================================================
--- head/games/noegnud-littlehack/files/noegnud-littlehack.patch	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/noegnud-littlehack/files/noegnud-littlehack.patch	Tue Aug 26 14:06:08 2014	(r366215)
@@ -73,7 +73,7 @@ diff -urN variants/littlehack-0.0.1.orig
 +CFLAGS += $(STD_CFLAGS)
  
 -LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L${LOCALBASE}/lib -lgnuregex
++LFLAGS = -L${LOCALBASE}/lib -lgnuregex -lm
  
  #   OR compile backwards compatible a.out format
  # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include

Modified: head/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch
==============================================================================
--- head/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch	Tue Aug 26 14:06:08 2014	(r366215)
@@ -82,7 +82,7 @@ diff -urN variants/nethack-3.4.2-deet.or
 +CFLAGS += $(STD_CFLAGS)
  
 -LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L${LOCALBASE}/lib -lgnuregex
++LFLAGS = -L${LOCALBASE}/lib -lgnuregex -lm
  
  #   OR compile backwards compatible a.out format
  # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include

Modified: head/games/noegnud-nethack/files/noegnud-nethack.patch
==============================================================================
--- head/games/noegnud-nethack/files/noegnud-nethack.patch	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/noegnud-nethack/files/noegnud-nethack.patch	Tue Aug 26 14:06:08 2014	(r366215)
@@ -73,7 +73,7 @@ diff -urN variants/nethack-3.4.3.orig/sy
 +CFLAGS += $(STD_CFLAGS)
  
 -LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L${LOCALBASE}/lib -lgnuregex
++LFLAGS = -L${LOCALBASE}/lib -lgnuregex -lm
  
  #   OR compile backwards compatible a.out format
  # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include

Modified: head/games/noegnud-slashem/files/noegnud-slashem.patch
==============================================================================
--- head/games/noegnud-slashem/files/noegnud-slashem.patch	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/noegnud-slashem/files/noegnud-slashem.patch	Tue Aug 26 14:06:08 2014	(r366215)
@@ -54,7 +54,7 @@ diff -urN variants/slashem-0.0.6E4F8.ori
  
  WINNOEGNUDCFLAGS = 
 -WINNOEGNUDLIB = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU
-+WINNOEGNUDLIB = `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -lgnuregex
++WINNOEGNUDLIB = `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -lgnuregex -lm
 +
 +.c.o:
 +	${CC} ${CFLAGS} -c $< -o $@

Modified: head/games/nuclearchess/Makefile
==============================================================================
--- head/games/nuclearchess/Makefile	Tue Aug 26 13:47:21 2014	(r366214)
+++ head/games/nuclearchess/Makefile	Tue Aug 26 14:06:08 2014	(r366215)
@@ -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
+

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list