- Fix missing library problems when the linker enforces explicit linking

PR: 192062 Exp-run by: antoine Approved by: portmgr (antoine)
svn path=/head/; revision=366215
2025-07-18 17:59:20 -04:00 · 2014-08-26 14:06:08 +00:00 · 2014-08-26 14:06:08 +00:00 · 216b5a285f · 2021-03-31 03:12:20 +00:00
commit 216b5a285f
parent b829518a7d
227 changed files with 634 additions and 904 deletions
--- 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}"
--- 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

--- 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

--- 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

--- 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
--- 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
--- 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:
--- 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>
--- 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
 
--- 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
--- 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
--- 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>
--- a/deskutils/multisync/files/patch-src-Makefile.am
+++ 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
+ 
--- 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)

--- 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	
 
 #
--- 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>

--- 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
--- a/editors/codelite/files/patch-sdk_codelite_indexer_CMakeLists.txt
+++ 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)
+ 
--- 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>
--- 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

--- 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
--- 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:
--- 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

--- 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}
--- 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
 
--- 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
--- 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'
--- 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
--- 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
--- 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>
--- 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
--- 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

--- 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>
--- 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

--- 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
--- 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
--- 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} && \
--- 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/
--- 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
 
--- 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
--- 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
 
--- 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:
--- 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 ;
--- a/games/gillo/files/patch-src_Jamfile
+++ b/games/gillo/files/patch-src_Jamfile
@ -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) ;
--- 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

--- 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:
--- 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}
--- 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
--- 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: 
--- 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

--- 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
+ 
--- a/games/liquidwar/files/patch-src-Makefile.in
+++ 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 . \
--- 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>
--- 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
--- 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

--- 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 \
--- 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
--- 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=	*
--- 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
 
--- 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
--- 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>
--- 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%%
--- 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
--- 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
--- 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
--- 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 $@
--- 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/
--- 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)
--- 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
--- 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 \
--- 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/
--- 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
--- 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>
--- 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
--- 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}
--- 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=	*
--- 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}
--- 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 $@
 
 
--- 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
--- 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
--- a/graphics/cinepaint/files/patch-app__menus.c
+++ b/graphics/cinepaint/files/patch-app__menus.c
@ -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);
- }
--- a/graphics/cinepaint/files/patch-lib__fl_i18n__Makefile.am
+++ b/graphics/cinepaint/files/patch-lib__fl_i18n__Makefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-insblurMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-insblurMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__Makefile.am
+++ b/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__Makefile.am
@ -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 \
--- a/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdrjheadMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdrjheadMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-inscomposeMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-inscomposeMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-insdbbrowserMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-insdbbrowserMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-insdecomposeMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-insdecomposeMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-insdicomMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-insdicomMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-insfitsMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-insfitsMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-insgbrMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-insgbrMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-inshdrMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-inshdrMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-insiffMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-insiffMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-insjpegMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-insjpegMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-insmedianMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-insmedianMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-insminimumMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-insminimumMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-insnoisifyMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-insnoisifyMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-insopenexrMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-insopenexrMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-inspdfMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-inspdfMakefile.am
@ -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
- 
--- a/graphics/cinepaint/files/patch-plug-inspicMakefile.am
+++ b/graphics/cinepaint/files/patch-plug-inspicMakefile.am
@ -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
- 
--- a/Show more
+++ b/Show more