Fix problems with missing libs when the linker enforces explicit linking

(a* to d* categories)

PR:		192062

26 files changed, 100 insertions, 103 deletions

diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index 80d911d1d65a..0b634474f38c 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -22,7 +22,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-garmin
 CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib -lgmodule-2.0
+LIBS+=		-L${LOCALBASE}/lib -lgmodule-2.0 -lm
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	NLS
diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile
index 1ff497127589..2a1e20d2d318 100644
--- a/audio/adplay/Makefile
+++ b/audio/adplay/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	adplay
 PORTVERSION=	1.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	SF/adplug/AdPlay_UNIX/${PORTVERSION}:main \
 		SF/adplug/Database/2006-07-06:db
@@ -19,13 +19,14 @@ LIB_DEPENDS=	libadplug.so:${PORTSDIR}/audio/libadplug \
 		libbinio.so:${PORTSDIR}/devel/libbinio
 
 GNU_CONFIGURE=	yes
+USES=		libtool
 WANT_SDL=	yes
 
 DBFILE=		adplug.db
 DBVERSION=	2006-07-07
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libbinio
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lbinio
 
 CONFIGURE_ARGS+=	--sharedstatedir=${DATADIR}
 
@@ -43,6 +44,7 @@ CONFIGURE_ARGS+=	--disable-output-sdl
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's/-lstdc++//g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|^\(adplug_data_dir.*\)/.*|\1|' \
 		${WRKSRC}/src/Makefile.in
 	@${RM} ${WRKSRC}/src/getopt.h
diff --git a/audio/cueplayer/Makefile b/audio/cueplayer/Makefile
index 74d57f6140c4..de96eacb28ba 100644
--- a/audio/cueplayer/Makefile
+++ b/audio/cueplayer/Makefile
@@ -15,6 +15,7 @@ LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
 USES=		pkgconfig qmake
 USE_QT4=	gui xml uic_build moc_build rcc_build network
 USE_GSTREAMER=	flac good dvd lame ugly ffmpeg taglib ogg vorbis soup libmms wavpack
+USE_XORG=	x11
 
 LICENSE=	GPLv3
 
@@ -23,10 +24,11 @@ DESKTOP_ENTRIES="Cueplayer" "Lightweight media player based on Qt and Gstreamer"
 		"AudioVideo;Audio;Video;" true
 
 post-patch:
-	cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/share/cueplayer/,${DATADIR}/,g' \
-		main.cpp ${PORTNAME}.pro
-	${REINPLACE_CMD} -e 's,/usr/share,${PREFIX},g' \
+	@${REINPLACE_CMD} -e 's,/usr/share/cueplayer/,${DATADIR}/,g' \
+		${WRKSRC}/main.cpp ${WRKSRC}/${PORTNAME}.pro
+	@${REINPLACE_CMD} -e 's,/usr/share,${PREFIX},g' \
 		${WRKSRC}/${PORTNAME}.pro
+	@${ECHO_CMD} 'PKGCONFIG += x11' >> ${WRKSRC}/${PORTNAME}.pro
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${STAGEDIR}${DATADIR}
diff --git a/audio/dumb/Makefile b/audio/dumb/Makefile
index 0f291c0d0d87..9cf4697b7af3 100644
--- a/audio/dumb/Makefile
+++ b/audio/dumb/Makefile
@@ -21,7 +21,7 @@ ALLEGRO_DESC=	Enable allegro support
 LIB_DEPENDS+=	liballeg.so:${PORTSDIR}/devel/allegro
 PLIST_SUB+=	ALLEGRO=""
 MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`"
-MAKE_ARGS+=	LINK_ALLEGRO="`allegro-config --libs`"
+MAKE_ARGS+=	LINK_ALLEGRO="`allegro-config --libs` -lm"
 PKGNAMESUFFIX=	-allegro
 CONFLICTS=	dumb-[0-9]*
 .else
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index f13487b18d87..80a3d3415ef7 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -24,6 +24,7 @@ CONFLICTS=	py*-ro-[0-9]*
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|esdconf_DATA = esd.conf|esdconf_DATA = |g' \
+		-e '/^esd_LDADD =/s/$$/ -lm/' \
 		${WRKSRC}/Makefile.in
 
 post-install:
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index 820c5f2136f6..9fc0ac69d3a0 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	glib20 gtk20 libglade2
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--enable-system-libsexy
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lm
 
 OPTIONS_DEFINE=	MMKEYS XSPF
 OPTIONS_DEFAULT=	MMKEYS
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index 7483d1826a07..8ed829cd6d29 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -27,7 +27,7 @@ GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lm
 INSTALL_TARGET=	install-strip
 
 GCONF_SCHEMAS=	goobox.schemas
diff --git a/audio/gqradio/Makefile b/audio/gqradio/Makefile
index 7ac5385d278d..527f4967e66e 100644
--- a/audio/gqradio/Makefile
+++ b/audio/gqradio/Makefile
@@ -17,7 +17,7 @@ USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lm
 
 OPTIONS_DEFINE=		DOCS V4L
 
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index d4974c968fea..b5b368cc28cf 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -28,7 +28,7 @@ OPTIONS_DEFAULT=	JACK
 LIBARCHIVE_DESC=	LibArchive support
 
 post-patch:
-	${REINPLACE_CMD} -e "s|includes = \[\]|includes = \['-I${QT_INCDIR}/QtCore', '-I${QT_INCDIR}/QtXml', '-I${QT_INCDIR}/QtGui',  '-I${QT_INCDIR}', '-I${QT_INCDIR}/Qt', '-I${LOCALBASE}/include', '-I${LOCALBASE}/include/raptor2'\]|g; s|ldflags = \[\]|ldflags = \['-L${QT_LIBDIR}','-L${LOCALBASE}/lib'\,'-lQtCore', '-lQtGui', '-lQtXml', '-lQtNetwork', '${PTHREAD_LIBS}']|g" ${WRKSRC}/Sconstruct
+	${REINPLACE_CMD} -e "s|includes = \[\]|includes = \['-I${QT_INCDIR}/QtCore', '-I${QT_INCDIR}/QtXml', '-I${QT_INCDIR}/QtGui',  '-I${QT_INCDIR}', '-I${QT_INCDIR}/Qt', '-I${LOCALBASE}/include', '-I${LOCALBASE}/include/raptor2'\]|g; s|ldflags = \[\]|ldflags = \['-L${QT_LIBDIR}','-L${LOCALBASE}/lib'\,'-lQtCore', '-lQtGui', '-lQtXml', '-lQtNetwork']|g" ${WRKSRC}/Sconstruct
 
 .include <bsd.port.options.mk>
 
@@ -36,8 +36,6 @@ MAKE_ARGS+=	oss=1
 
 .if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
-CPPFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
 MAKE_ARGS+=	jack=1
 .else
 MAKE_ARGS+=	jack=0
diff --git a/audio/hydrogen/files/patch-Sconstruct b/audio/hydrogen/files/patch-Sconstruct
index cce4295e0f11..f817238e3c03 100644
--- a/audio/hydrogen/files/patch-Sconstruct
+++ b/audio/hydrogen/files/patch-Sconstruct
@@ -18,12 +18,21 @@
  		ldflags.append('-lpthread')
  		ldflags.append('-lasound')
  	#	ldflags.append('-lrubberband')
-
+ 
 +	elif sys.platform > 'freebsd' :
 +		print "Alsa disabled; nothing to do"
  	elif sys.platform == "win32":
  		includes.append( '3rdparty\libsndfile-1_0_17' )
  		includes.append( 'build\pthreads\include' )
+@@ -279,7 +281,7 @@
+ 	if str(env['lash']) == "1":
+ 	        env.ParseConfig('pkg-config --cflags --libs lash-1.0')
+ 
+-	if sys.platform == "darwin" or sys.platform == "linux2" or sys.platform == "linux3":
++	if sys.platform == "darwin" or sys.platform == "linux2" or sys.platform == "linux3" or sys.platform > "freebsd":
+ 		env.Append( LIBS = ["z"] )
+ 		env.Append( LIBS = ["pthread"] )
+ 
 @@ -299,7 +301,7 @@
  
          for N in glob.glob('./data/i18n/hydrogen.*'):
@@ -46,4 +55,3 @@
  
  
  print ""
-
diff --git a/audio/mixxx/files/patch-build__depends.py b/audio/mixxx/files/patch-build__depends.py
index bdcdfb98cd15..4102f892f831 100644
--- a/audio/mixxx/files/patch-build__depends.py
+++ b/audio/mixxx/files/patch-build__depends.py
@@ -67,7 +67,7 @@
          elif build.toolchain_is_msvs:
              # Validate the specified winlib directory exists
              mixxx_lib_path = SCons.ARGUMENTS.get('winlib', '..\\..\\..\\mixxx-win32lib-msvc100-release')
-@@ -851,16 +847,19 @@
+@@ -851,16 +847,20 @@
  
          elif build.platform_is_bsd:
              build.env.Append(CPPDEFINES='__BSD__')
@@ -77,7 +77,7 @@
 -            build.env.Append(LIBPATH=['/usr/lib/',
 -                                      '/usr/local/lib',
 -                                      '/usr/X11R6/lib'])
--            build.env.Append(LIBS='pthread')
+             build.env.Append(LIBS='pthread')
 +            build.env.Append(CPPPATH=['%%LOCALBASE%%/include/portaudio2',
 +                                      '%%LOCALBASE%%/include/qt4',
 +                                      '%%LOCALBASE%%/include'])
diff --git a/audio/osd-lyrics/Makefile b/audio/osd-lyrics/Makefile
index 087150075218..873393d81c4e 100644
--- a/audio/osd-lyrics/Makefile
+++ b/audio/osd-lyrics/Makefile
@@ -47,8 +47,8 @@ AMAROK_CONFIGURE_ENABLE=	amarok1
 
 post-patch:
 .for i in src/Makefile.in src/tests/Makefile.in
-	@${REINPLACE_CMD} -e \
-		'/-lstdc++/d' ${WRKSRC}/${i}
+	@${REINPLACE_CMD} -e '/-lstdc++/d' -e '/^CCLD =/s/=.*/= $$(CXX)/' \
+		${WRKSRC}/${i}
 .endfor
 .for i in lib/chardetect/Makefile.in
 	@${REINPLACE_CMD} -e \
diff --git a/audio/raop_play/Makefile b/audio/raop_play/Makefile
index 47c452c81444..7286ec42d186 100644
--- a/audio/raop_play/Makefile
+++ b/audio/raop_play/Makefile
@@ -23,6 +23,10 @@ LDFLAGS+=	`fltk-config --ldflags`
 USES=		gmake
 USE_GNOME=	glib20
 
+post-patch:
+	@${REINPLACE_CMD} 's/-lssl/-lcrypto/' \
+		${WRKSRC}/configure ${WRKSRC}/raop_play/Makefile.in
+
 pre-build:
 	${CP} ${FILESDIR}/getline.c ${FILESDIR}/getline.h ${WRKSRC}/rendezvous/
 
diff --git a/audio/ripperx/Makefile b/audio/ripperx/Makefile
index 395ad969b51b..c0bf4d304fe9 100644
--- a/audio/ripperx/Makefile
+++ b/audio/ripperx/Makefile
@@ -15,8 +15,20 @@ LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib
 RUN_DEPENDS=	cdparanoia:${PORTSDIR}/audio/cdparanoia
 
 GNU_CONFIGURE=	yes
-CFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	ac_cv_lib_id3_ID3Tag_Link=yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 USES=		gmake pathfix pkgconfig
 USE_GNOME=	gtk20
 
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+
+post-patch:
+	@${REINPLACE_CMD} 's/-lstdc++/-lm/' ${WRKSRC}/configure
+	@${REINPLACE_CMD} '/^CCLD =/s/=.*/= $$(CXX)/' \
+		${WRKSRC}/plugins/Makefile.in ${WRKSRC}/src/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/audio/shairport/Makefile b/audio/shairport/Makefile
index e8e1486e83d3..d81e74754b2e 100644
--- a/audio/shairport/Makefile
+++ b/audio/shairport/Makefile
@@ -41,6 +41,7 @@ post-patch:
 		-e 's|$$FindBin.*|"${PREFIX}/bin/hairtunes";|' \
 		-e '/use FindBin;/d;s|/usr/bin/env perl|${PERL}|' \
 		${WRKSRC}/shairport.c ${WRKSRC}/shairport.pl
+	@${REINPLACE_CMD} 's/-lssl/-lcrypto/' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${STAGEDIR}${PREFIX}/bin
diff --git a/cad/klayout/files/patch-config-Makefile.conf b/cad/klayout/files/patch-config-Makefile.conf
index 5de90c7232d9..f75b6e01dd51 100644
--- a/cad/klayout/files/patch-config-Makefile.conf
+++ b/cad/klayout/files/patch-config-Makefile.conf
@@ -2,7 +2,7 @@
 +++ config/Makefile.conf.freebsd-32-gcc-release	2013-04-27 17:37:10.000000000 +0900
 @@ -0,0 +1,49 @@
 +
-+# Configuration file for 
++# Configuration file for
 +# gcc, FreeBSD
 +# release build
 +
@@ -11,12 +11,12 @@
 +AR=ar -r
 +
 +# Compiler general
-+INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE) 
++INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE)
 +DEFS=-DQT_THREAD_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII
 +
 +# C++
 +CXX?=gcc
-+CXXOPT_DEP=-MM -MG 
++CXXOPT_DEP=-MM -MG
 +CXXWARN=-Wall -Wno-deprecated -Woverloaded-virtual \
 +       -Wsign-promo -Wsynth -Wno-long-long -Wno-strict-aliasing
 +CXXOPT=${CXXFLAGS} -c -o
@@ -24,17 +24,17 @@
 +
 +# C
 +CC?=gcc
-+CCOPT_DEP=-MM -MG 
++CCOPT_DEP=-MM -MG
 +CCWARN=
 +CCOPT=${CFLAGS} -c -o
 +CCOPT_SO=-fPIC $(CCOPT)
 +
 +# Linker
-+LINK?=${CC}
++LINK?=${CXX}
 +LOPT=${LDFLAGS} -g -Wl,-E -o
-+LOPT_SO=${LDFLAGS} -g -shared -fPIC -o
++LOPT_SO=${LDFLAGS} -g -shared -o
 +
-+LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lstdc++ -lcrypt -lz 
++LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz
 +
 +.PHONY: install
 +install:
diff --git a/cad/openvsp/files/patch-vsp-CMakeLists.txt b/cad/openvsp/files/patch-vsp-CMakeLists.txt
new file mode 100644
index 000000000000..fcd38f6a195b
--- /dev/null
+++ b/cad/openvsp/files/patch-vsp-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- src/vsp/CMakeLists.txt.orig	2014-08-08 15:23:12.000000000 +0200
++++ src/vsp/CMakeLists.txt	2014-08-08 15:23:59.000000000 +0200
+@@ -216,6 +216,7 @@
+     ${FLTK_LIBRARIES}
+     ${OPENGL_LIBRARIES}
+     ${OPENNURBS_LIBRARIES}
++    -pthread
+ )
+ 
+ INSTALL( TARGETS vsp RUNTIME DESTINATION . )
diff --git a/comms/libimobiledevice/Makefile b/comms/libimobiledevice/Makefile
index 4b399ec74af7..0c30addf90f3 100644
--- a/comms/libimobiledevice/Makefile
+++ b/comms/libimobiledevice/Makefile
@@ -13,11 +13,13 @@ LICENSE?=	LGPL21
 
 SLAVE_PORT?=	no
 
-USES=		pkgconfig tar:bzip2
+USES=		pathfix pkgconfig tar:bzip2
+USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	openssl_LIBS=-lssl
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	openssl_CFLAGS="-I${OPENSSLINC}" \
+		openssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 .if ${SLAVE_PORT} == "no"
 
@@ -36,8 +38,6 @@ OPTIONS_DEFINE=	DOCS
 post-patch:
 	@${REINPLACE_CMD} -e 's, *@ssl_requires@,,' \
 		${WRKSRC}/${PORTNAME}*.pc.in
-	@${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,g' \
-		${WRKSRC}/Makefile.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/comms/libimobiledevice/files/patch-configure b/comms/libimobiledevice/files/patch-configure
deleted file mode 100644
index c286b6f000ac..000000000000
--- a/comms/libimobiledevice/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./configure.orig	2013-03-18 10:28:26.000000000 +0100
-+++ ./configure	2013-04-30 14:56:00.356777062 +0200
-@@ -17262,6 +17262,7 @@
- $as_echo "yes" >&6; }
- 	have_openssl=yes
- fi
-+have_openssl=yes
- if test "x$have_openssl" = "xyes"; then
-   if test "x$use_openssl" != "xyes"; then
-     enable_openssl=no
diff --git a/comms/usrp/files/patch-host_examples_CMakeLists.txt b/comms/usrp/files/patch-host_examples_CMakeLists.txt
new file mode 100644
index 000000000000..edb9accee47d
--- /dev/null
+++ b/comms/usrp/files/patch-host_examples_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- host/examples/CMakeLists.txt.orig
++++ host/examples/CMakeLists.txt
+@@ -41,6 +41,7 @@
+     TARGET_LINK_LIBRARIES(${example_name} uhd)
+     INSTALL(TARGETS ${example_name} RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples)
+ ENDFOREACH(example_source)
++TARGET_LINK_LIBRARIES(network_relay -pthread)
+ 
+ ########################################################################
+ # ASCII Art DFT - requires curses, so this part is optional
diff --git a/databases/mydumper/Makefile b/databases/mydumper/Makefile
index 37e2d3e2cbfc..a5f190fb8375 100644
--- a/databases/mydumper/Makefile
+++ b/databases/mydumper/Makefile
@@ -20,7 +20,9 @@ USES=		cmake pkgconfig
 PLIST_FILES=	sbin/mydumper sbin/myloader
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} \
+		-e '/link_libraries(mydumper/s/)$$/ -lm)/' \
+		-e 's|-Werror||' ${WRKSRC}/CMakeLists.txt
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mydumper ${WRKSRC}/myloader ${STAGEDIR}${PREFIX}/sbin/
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index edb1a60cc5f8..3c4f5f7921f6 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -27,7 +27,7 @@ INSTALLS_OMF=	yes
 GCONF_SCHEMAS=	drivel.schemas
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lm
 
 GTKSPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
 GTKSPELL_CONFIGURE_OFF=	--without-gtkspell
diff --git a/deskutils/notecase/Makefile b/deskutils/notecase/Makefile
index 80b7501d1de9..c162df5ecf3b 100644
--- a/deskutils/notecase/Makefile
+++ b/deskutils/notecase/Makefile
@@ -18,16 +18,10 @@ USES=		dos2unix gmake desktop-file-utils gettext pkgconfig shared-mime-info
 
 DOS2UNIX_REGEX=	.*\.(c|h|cpp)
 
+MAKE_ARGS=	prefix=${PREFIX}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PORTDOCS=	help.ncd
-INSTALL_TARGET=	install docinstall
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|^prefix=.*|prefix=${PREFIX}|' \
-		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|^docsdir=.*|docsdir=${DOCSDIR}|' \
-		${WRKSRC}/Makefile
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notecase
diff --git a/deskutils/notecase/files/patch-Makefile b/deskutils/notecase/files/patch-Makefile
index c4a85f4ef2c3..e80a34e57d30 100644
--- a/deskutils/notecase/files/patch-Makefile
+++ b/deskutils/notecase/files/patch-Makefile
@@ -1,18 +1,6 @@
 --- Makefile.orig	2008-12-09 11:07:06.000000000 +0100
 +++ Makefile	2013-11-05 17:07:34.000000000 +0100
-@@ -10,9 +10,10 @@
- VERSION=1.9.8
- 
- # define install target dirs
--prefix=/usr
-+prefix=/usr/local
- bindir=$(prefix)/bin
- datadir=$(prefix)/share
-+docsdir=/usr/local/share/doc/notecase
- 
- # define top of RPM build area
- topdir=/usr/src/redhat
-@@ -268,7 +269,6 @@
+@@ -268,7 +268,6 @@
   $(OBJ)/IOLayerRedirect.o $(OBJ)/FileExportDlg.o $(OBJ)/FormatIOTxt.o $(OBJ)/FindReplaceDlg.o \
   $(OBJ)/FindReplaceInfo.o $(OBJ)/LinkInfo.o $(OBJ)/LinkPropertiesDlg.o $(OBJ)/ExecuteFile.o \
   $(OBJ)/FileSaveAsDlg.o $(OBJ)/CircularBuffer.o $(OBJ)/FormatIOMMLX.o \
@@ -20,44 +8,16 @@
   $(OBJ)/ProgressDlg.o $(OBJ)/DocActionPix.o $(OBJ)/DocActionFinish.o $(OBJ)/DocActionFmt.o $(OBJ)/FmtInfo.o \
   $(OBJ)/FileAttachmentDlg.o $(OBJ)/DocActionAtt.o $(OBJ)/PixPropertiesDlg.o $(OBJ)/DocActionFinishDel.o \
   $(OBJ)/ShortcutsList.o $(OBJ)/ShortcutsListDlg.o $(OBJ)/DateTimeDlg.o $(OBJ)/AboutDlg.o $(OBJ)/EditDlg.o \
-@@ -601,18 +601,20 @@
- pouninstall:
- 	@rm -vf $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/notecase.mo
- 	@echo done uninstalling translations
--	
-+
-+docinstall:
-+	install -d -m 755 "$(DESTDIR)$(docsdir)"
-+	$(INSTALL) -m 644 -c docs/help.ncd "$(DESTDIR)$(docsdir)/help.ncd"
-+
- #
- # install application
+@@ -316,7 +315,7 @@
+ 	$(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS)
+ 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
+ endif	
+ 
  #
- install: $(BIN)/notecase$(EXE) poinstall
- 	install -d -m 755 $(DESTDIR)$(bindir)
--	install -d -m 755 $(DESTDIR)$(datadir)/doc/notecase/
- 	install -d -m 755 $(DESTDIR)$(datadir)/applications/
- 	install -d -m 755 $(DESTDIR)$(datadir)/mime/packages/
- 	install -d -m 755 $(DESTDIR)$(datadir)/pixmaps/
- 	$(INSTALL) -m 755 $(BIN)/notecase$(EXE) "$(DESTDIR)$(bindir)/notecase$(EXE)"
--	$(INSTALL) -m 644 docs/help.ncd "$(DESTDIR)$(docdir)/notecase/help.ncd"
- 	$(INSTALL) -m 644 docs/notecase.xml "$(DESTDIR)$(datadir)/mime/packages/notecase.xml"
- 	$(Q)if [ -n "$(NOKIA_MAEMO_BUILD)" ]; then \
- 		$(INSTALL) -m 644 docs/notecase.desktop "$(DESTDIR)$(datadir)/applications/hildon/notecase.desktop"; \
-@@ -694,12 +696,6 @@
- 		echo 'pkg-config error detected $(shell pkg-config --cflags $(LIBS))';\
- 		exit 1;\
- 	fi;  
--	$(Q)if [ "$(HAVE_GTKSOURCEVIEW)" = "1" ]; then \
--		if [[ "$(TEST_SRCVIEW_VER)" < "2.4.1" ]]; then \
--		echo 'ERROR: gtksourceview package is too old ($(shell pkg-config --modversion gtksourceview-2.0))!';\
--		exit 1;\
--		fi;\
--	fi;
- 	$(Q)echo 'Configuration: GNOME_VFS=$(HAVE_GNOME_VFS);GTKSOURCEVIEW=$(HAVE_GTKSOURCEVIEW);DEBUG=$(DEBUG);PROFILE=$(PROFILE);BYTE_ORDER=$(BYTE_ORDER);PLATFORM=$(PLATFORM)' 
- 	$(Q)$(SED) 's/^Version:.*/Version:        $(VERSION)/' ./docs/notecase.spec
- 	$(Q)$(SED) 's/^Source:.*/Source:         $(archive)_src.tar.gz/' ./docs/notecase.spec
-@@ -820,7 +816,7 @@
+@@ -820,7 +819,7 @@
  #
  # Note: first "make" command forces generating correct help file path in "config.h"
  #
diff --git a/devel/firmware-utils/files/Makefile b/devel/firmware-utils/files/Makefile
index 5fdba2379026..745147dc709c 100644
--- a/devel/firmware-utils/files/Makefile
+++ b/devel/firmware-utils/files/Makefile
@@ -20,7 +20,7 @@ OBJS+=	mkplanexfw.o sha1.o
 OBJS+=	mkzcfw.o
 OBJS+=	wrt400n.o cyg_crc32.o
 
-LDFLAGS+=	-lmd -lssl -lz
+LDFLAGS+=	-lmd -lcrypto -lz
 
 INSTALL_PROGRAM?=	echo /usr/bin/install -C -o root -g bin -m 0644
 PREFIX?=	/usr/local
diff --git a/devel/hadoop/Makefile b/devel/hadoop/Makefile
index c0e41b0a3f3e..32ab02a4ceca 100644
--- a/devel/hadoop/Makefile
+++ b/devel/hadoop/Makefile
@@ -87,6 +87,9 @@ PLIST_SUB+=	HADOOP_ARCH=${_HADOOP_ARCH}
 post-patch:
 	@${REINPLACE_CMD} -e 's/ -DCPU=\\\\\\".*\\\\\\"//' \
 		${WRKSRC}/src/c++/libhdfs/configure
+	@${REINPLACE_CMD} 's/-lssl/-lcrypto/' \
+		${WRKSRC}/src/c++/pipes/configure \
+		${WRKSRC}/src/examples/pipes/configure
 .for f in ${FIX_GCC}
 	@${REINPLACE_CMD} -e 's/`gcc/`$$LTCC/' ${WRKSRC}/${f}
 .endfor