From owner-svn-ports-all@FreeBSD.ORG Wed Jun 11 14:50:14 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7FB2F3FE; Wed, 11 Jun 2014 14:50:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 69F512FE0; Wed, 11 Jun 2014 14:50:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5BEoEfb019426; Wed, 11 Jun 2014 14:50:14 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5BEo01w018842; Wed, 11 Jun 2014 14:50:00 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201406111450.s5BEo01w018842@svn.freebsd.org> From: Tijl Coosemans Date: Wed, 11 Jun 2014 14:50:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357486 - in head: Mk archivers/rpm astro/cfitsio astro/openuniverse astro/roadmap astro/xplanet audio/deadbeef audio/fdk-aac audio/festival audio/firefly audio/jack audio/mp3plot audio... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jun 2014 14:50:14 -0000 Author: tijl Date: Wed Jun 11 14:49:59 2014 New Revision: 357486 URL: http://svnweb.freebsd.org/changeset/ports/357486 QAT: https://qat.redports.org/buildarchive/r357486/ Log: Support LIBS like LDFLAGS. - Add LIBS="${LIBS}" to MAKE_ENV and CONFIGURE_ENV. - Add an option helper for LIBS. - Adjust all ports that already use LIBS. Also remove references to PTHREAD_CFLAGS and PTHREAD_LIBS while here. - Some ports did not support having a LIBS environment variable and required additional patches. Somewhat simplified a linker command line looks like: ${CC} ${src_LDFLAGS} ${LDFLAGS} ${src_LIBS} ${LIBS} where src_LDFLAGS and src_LIBS are controlled by upstream and LDFLAGS and LIBS can be controlled by us. If possible -L and -l flags need to be added to LIBS to make sure they appear after any -L and -l flags set by upstream. Many ports currently add -L${LOCALBASE}/lib to LDFLAGS but this may appear too early on the command line causing installed libraries to be linked in instead of freshly built ones. Additional changes: benchmarks/netio: Replace WITH_IPV6 with an IPV6 option. comms/gnokii: Replace some patches with USES=pathfix. Also remove -fPIC. graphics/gimageview: USES=libtool and install desktop file in DESKTOPDIR. graphics/visionworkbench: Remove FreeBSD 7 support. multimedia/libmovtar: New LIB_DEPENDS syntax. multimedia/opencinematools: Use standard do-build. net/siproxd: USES=libtool:keepla (port actually needs .la files for plugins) net-mgmt/nagios: Remove -fPIC. net-mgmt/nagios4: Remove -fPIC. print/cups-base: Only add -lssp_nonshared on i386 and OSVERSION < 1000036. security/p11-kit: Replace PTHREAD_LIBS in CONFIGURE_ENV with ac_cv_func_pthread_mutexattr_init=no in CONFIGURE_ARGS. This skips a test in configure that falsely detects pthread_mutexattr_init in our libc. sysutils/dar: Fix iconv detection. x11/rxvt-unicode: Remove -lstdc++ and patch configure to remove a FreeBSD hack and use $CXX as linker as on other platforms. PR: 190592 Exp-run by: antoine Approved by: portmgr (antoine) Added: head/net/freeswitch-core-devel/files/patch-build-modmake.rules.in (contents, props changed) head/sysutils/dar/files/patch-configure (contents, props changed) head/x11/rxvt-unicode/files/patch-configure (contents, props changed) Deleted: head/comms/gnokii/files/patch-common-Makefile.in head/graphics/gimageview/files/patch-ltmain.sh head/net/siproxd/files/patch-aclocal.m4 head/net/siproxd/files/patch-libltdl_aclocal.m4 head/net/siproxd/files/patch-libltdl_configure Modified: head/Mk/bsd.gecko.mk head/Mk/bsd.options.mk head/Mk/bsd.port.mk head/archivers/rpm/Makefile head/astro/cfitsio/Makefile head/astro/openuniverse/Makefile head/astro/roadmap/Makefile head/astro/xplanet/Makefile head/audio/deadbeef/Makefile head/audio/fdk-aac/Makefile head/audio/festival/Makefile head/audio/firefly/Makefile head/audio/jack/Makefile head/audio/mp3plot/Makefile head/audio/playgsf/Makefile head/audio/pulseaudio/Makefile head/audio/rhythmbox/Makefile head/audio/rplay/Makefile head/audio/spiralsynthmodular/Makefile head/benchmarks/dbench/Makefile head/benchmarks/netio/Makefile head/chinese/oto/Makefile head/chinese/reciteword/Makefile head/comms/gmfsk/Makefile head/comms/gnokii/Makefile head/comms/gnokii/files/patch-xgnokii-Makefile.in head/comms/hamlib/Makefile head/comms/minicom/Makefile head/comms/nokryptia/Makefile head/comms/predict/Makefile head/comms/predict/files/Makefile head/converters/fix-mime-charset/Makefile head/converters/pdf2djvu/Makefile head/converters/rcctools/Makefile head/databases/dbtool/Makefile head/databases/hk_classes/Makefile head/databases/libodbc++/Makefile head/databases/oracle_odbc_driver/Makefile head/databases/pgadmin3/Makefile head/deskutils/gnome-main-menu/Makefile head/deskutils/logjam/Makefile head/deskutils/multisync/Makefile head/devel/apr1/Makefile head/devel/apr2/Makefile head/devel/asmutils/Makefile head/devel/ccrtp/Makefile head/devel/google-perftools/Makefile head/devel/ifd-test/Makefile head/devel/libgutenfetch/Makefile head/devel/libunicode/Makefile head/devel/libzvbi/Makefile head/devel/nspr/Makefile head/devel/pypersrc/Makefile head/devel/srecord/Makefile head/dns/libidn/Makefile head/editors/joe/Makefile head/editors/joe2/Makefile head/editors/mlview/Makefile head/editors/xcoral/Makefile head/emulators/fuse/Makefile head/emulators/vba/Makefile head/emulators/x48/Makefile head/ftp/lftp/Makefile head/ftp/proftpd/Makefile head/ftp/wput/Makefile head/games/alienarena/Makefile head/games/battalion/Makefile head/games/chroma/Makefile head/games/frobtads/Makefile head/games/glest/Makefile head/games/gnomeattacks/Makefile head/games/gnuchess/Makefile head/games/gracer/Makefile head/games/gturing/Makefile head/games/highmoon/Makefile head/games/lbreakout/Makefile head/games/pioneers/Makefile head/games/sdb/Makefile head/games/spacejunk/Makefile head/games/super_methane_brothers/Makefile head/games/torcs/Makefile head/games/trophy/Makefile head/games/tsito/Makefile head/games/tuxkart/Makefile head/games/warzone2100/Makefile head/games/xqf/Makefile head/graphics/EZWGL/Makefile head/graphics/bugle/Makefile head/graphics/colord/Makefile head/graphics/danpei/Makefile head/graphics/enblend/Makefile head/graphics/epeg/Makefile head/graphics/flam3/Makefile head/graphics/gcolor/Makefile head/graphics/gimageview/Makefile head/graphics/gimageview/pkg-plist head/graphics/gimp-app/Makefile head/graphics/gimp-resynthesizer/Makefile head/graphics/gle/Makefile head/graphics/gltt/Makefile head/graphics/gphoto2/Makefile head/graphics/gtkgraph/Makefile head/graphics/jpeginfo/Makefile head/graphics/kudu/Makefile head/graphics/libvisual/Makefile head/graphics/libvisual04-plugins/Makefile head/graphics/php-facedetect/Makefile head/graphics/phplot/Makefile head/graphics/pngnq/Makefile head/graphics/povray37/Makefile head/graphics/radius-engine/Makefile head/graphics/stamp/Makefile head/graphics/tesseract/Makefile head/graphics/visionworkbench/Makefile head/graphics/xaos/Makefile head/graphics/xsane/Makefile head/graphics/zphoto/Makefile head/irc/bitchx/Makefile head/irc/miau/Makefile head/irc/xchat/Makefile head/japanese/groff/Makefile head/japanese/jvim3/Makefile head/japanese/php5-mecab/Makefile head/java/jikes/Makefile head/korean/eterm/Makefile head/korean/eterm/files/patch-ac head/lang/hugs/Makefile head/lang/lush/Makefile head/lang/php5/Makefile head/lang/php53/Makefile head/lang/php55/Makefile head/lang/python27/Makefile head/lang/ruby19/Makefile head/lang/ruby20/Makefile head/lang/ruby21/Makefile head/mail/bogofilter/Makefile head/mail/crm114/Makefile head/mail/cyrus-imapd23/Makefile head/mail/cyrus-imapd24/Makefile head/mail/dspam-devel/Makefile head/mail/dspam/Makefile head/mail/gbuffy/Makefile head/mail/gmime2/Makefile head/mail/gmime24/Makefile head/mail/lmtp2nntp/files/patch-configure head/mail/mboxgrep/Makefile head/mail/milter-greylist-devel/Makefile head/mail/milter-greylist/Makefile head/mail/mmr/Makefile head/mail/popper/Makefile head/mail/popular/Makefile head/mail/qmailadmin/Makefile head/mail/qpopper/Makefile head/mail/smtpmail/Makefile head/mail/sylpheed/Makefile head/math/geg/Makefile head/math/goblin/Makefile head/math/numdiff/Makefile head/math/oleo/Makefile head/math/tablix/Makefile head/misc/gnome-mime-data/Makefile head/misc/gnuls/Makefile head/misc/lingoteach/Makefile head/misc/pdmenu/Makefile head/misc/xosd/Makefile head/multimedia/gmencoder/Makefile head/multimedia/gnome-mplayer/Makefile head/multimedia/libmovtar/Makefile head/multimedia/libmpeg3/Makefile head/multimedia/libmtp/Makefile head/multimedia/libtheora/Makefile head/multimedia/mpeg4ip/Makefile head/multimedia/opencinematools/Makefile head/multimedia/totem/Makefile head/multimedia/xawtv/Makefile head/net-im/libpurple/Makefile head/net-im/mu-conference/Makefile head/net-mgmt/ap-utils/Makefile head/net-mgmt/bwm-ng/Makefile head/net-mgmt/collectd/Makefile head/net-mgmt/collectd5/Makefile head/net-mgmt/disco/Makefile head/net-mgmt/flow-extract/Makefile head/net-mgmt/icinga/Makefile head/net-mgmt/nagios/Makefile head/net-mgmt/nagios4/Makefile head/net-mgmt/nbtscan/Makefile head/net-mgmt/nefu/Makefile head/net-mgmt/rate/Makefile head/net-mgmt/sing/Makefile head/net-mgmt/snmp4nagios/Makefile head/net-p2p/jigdo/Makefile head/net-p2p/teknap/Makefile head/net/arping/Makefile head/net/c3270/Makefile head/net/dante/Makefile head/net/freeradius2/Makefile head/net/freeradius3/Makefile head/net/freeswitch-core-devel/Makefile head/net/gutenfetch/Makefile head/net/isc-dhcp41-server/Makefile head/net/isc-dhcp42-server/Makefile head/net/isc-dhcp43-server/Makefile head/net/ldap2dns/Makefile head/net/nast/Makefile head/net/nast/files/patch-configure head/net/netdude/Makefile head/net/ntopng/Makefile head/net/ntopng/files/patch-configure head/net/openldap24-server/Makefile head/net/rtpproxy/Makefile head/net/siproxd/Makefile head/net/siproxd/files/patch-configure head/net/siproxd/pkg-plist head/net/tac_plus4/Makefile head/net/traff/Makefile head/net/trafshow3/Makefile head/net/trickle/Makefile head/net/tsclient/Makefile head/net/uplog/Makefile head/net/wire/Makefile head/net/wireshark/Makefile head/news/newsstar/Makefile head/news/noffle/Makefile head/print/a2ps/Makefile head/print/cups-base/Makefile head/print/gv/Makefile head/print/openprinting/Makefile head/print/ttf2pt1/Makefile head/security/bsmtrace/Makefile head/security/libgnomesu/Makefile head/security/libgringotts/Makefile head/security/libpwquality/Makefile head/security/openscep/Makefile head/security/p11-kit/Makefile head/security/prelude-manager/Makefile head/security/sectok/Makefile head/security/steghide/Makefile head/security/vlog/Makefile head/security/xca/Makefile head/sysutils/apcupsd/Makefile head/sysutils/coreutils/Makefile head/sysutils/dar/Makefile head/sysutils/dar/files/patch-src-dar-Makefile.in head/sysutils/dc3dd/Makefile head/sysutils/fileschanged/Makefile head/sysutils/gcombust/Makefile head/sysutils/graveman/Makefile head/sysutils/htop/Makefile head/sysutils/mate-system-monitor/Makefile head/sysutils/uniutils/Makefile head/textproc/exempi/Makefile head/textproc/redland/Makefile head/textproc/scrollkeeper/Makefile head/textproc/spellutils/Makefile head/textproc/stardict3/Makefile head/textproc/uim-el/Makefile head/www/dpsearch/Makefile head/www/epiphany/Makefile head/www/mod_encoding/Makefile head/www/mod_log_sql2-dtc/Makefile head/www/mod_log_sql2/Makefile head/www/shttpd/Makefile head/www/sitecopy/Makefile head/www/webalizer/Makefile head/www/wwwoffle/Makefile head/x11-fm/nautilus/Makefile head/x11-toolkits/gtk12/Makefile head/x11-toolkits/gtksourceview/Makefile head/x11-toolkits/gtksourceview2/Makefile head/x11-toolkits/libzvt/Makefile head/x11-toolkits/py-gnome2/Makefile head/x11-toolkits/wxgtk28/Makefile head/x11-toolkits/wxgtk30/Makefile head/x11-wm/fbcmd/Makefile head/x11-wm/fluxbox/Makefile head/x11/gdm/Makefile head/x11/gnome-swallow/Makefile head/x11/libxcb/Makefile head/x11/mrxvt/Makefile head/x11/rxvt-devel/Makefile head/x11/rxvt-unicode/Makefile head/x11/wbar/Makefile head/x11/workrave/Makefile head/x11/x3270/Makefile head/x11/xscreensaver-gnome/Makefile head/x11/xterm/Makefile head/x11/xtermcontrol/Makefile head/x11/zenity/Makefile Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Wed Jun 11 14:45:18 2014 (r357485) +++ head/Mk/bsd.gecko.mk Wed Jun 11 14:49:59 2014 (r357486) @@ -114,7 +114,7 @@ MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmoze ${MOZILLA}-xpcom ${MOZILLA}-plugin MOZ_EXPORT+= ${CONFIGURE_ENV} \ - LIBS="${LIBS}" PERL="${PERL}" + PERL="${PERL}" MOZ_OPTIONS+= --prefix="${PREFIX}" CPPFLAGS+= -isystem${LOCALBASE}/include Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Wed Jun 11 14:45:18 2014 (r357485) +++ head/Mk/bsd.options.mk Wed Jun 11 14:49:59 2014 (r357486) @@ -104,11 +104,11 @@ # FOO=bar,baz and you'll get USE_FOO=bar baz # # For each of: -# ALL_TARGET CATEGORIES CONFIGURE_ENV CONFLICTS CONFLICTS_BUILD -# CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES EXTRA_PATCHES FLAGS -# INSTALL_TARGET LDFLAGS MAKE_ARGS MAKE_ENV PATCHFILES PATCH_SITES PLIST_DIRS -# PLIST_DIRSTRY PLIST_FILES USES, defining ${opt}_${variable} will add its -# content to the actual variable when the option is enabled. Defining +# ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS CONFLICTS_BUILD +# CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES EXTRA_PATCHES +# INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV PATCHFILES PATCH_SITES +# PLIST_DIRS PLIST_DIRSTRY PLIST_FILES USES, defining ${opt}_${variable} will +# add its content to the actual variable when the option is enabled. Defining # ${opt}_${variable}_OFF will add its content to the actual variable when the # option is disabled. # @@ -131,7 +131,7 @@ OPTIONS_FILE?= ${PORT_DBDIR}/${OPTIONS_N _OPTIONS_FLAGS= ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \ CONFLICTS_BUILD CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES \ - EXTRA_PATCHES INSTALL_TARGET LDFLAGS MAKE_ARGS MAKE_ENV \ + EXTRA_PATCHES INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV \ PATCHFILES PATCH_SITES PLIST_DIRS PLIST_DIRSTRY PLIST_FILES \ USES _OPTIONS_DEPENDS= PKG FETCH EXTRACT PATCH BUILD LIB RUN Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Jun 11 14:45:18 2014 (r357485) +++ head/Mk/bsd.port.mk Wed Jun 11 14:49:59 2014 (r357486) @@ -2032,7 +2032,7 @@ MAKE_ENV+= PREFIX=${PREFIX} \ LIBDIR="${LIBDIR}" \ CC="${CC}" CFLAGS="${CFLAGS}" \ CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ + LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \ CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ MANPREFIX="${MANPREFIX}" @@ -3629,7 +3629,7 @@ do-configure: ${SET_LATE_CONFIGURE_ARGS} \ if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ + LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \ INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \ INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_LIB="${INSTALL_LIB}" \ Modified: head/archivers/rpm/Makefile ============================================================================== --- head/archivers/rpm/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/archivers/rpm/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -28,7 +28,7 @@ MAKE_ENV= OLD_PO_FILE_INPUT=1 OPTIONS_SUB= yes NLS_USES= gettext NLS_CPPFLAGS= -I${LOCALBASE}/include -NLS_CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl ${ICONV_LIB}" +NLS_LIBS= -L${LOCALBASE}/lib -lintl ${ICONV_LIB} NLS_CONFIGURE_ENABLE= nls post-patch: Modified: head/astro/cfitsio/Makefile ============================================================================== --- head/astro/cfitsio/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/astro/cfitsio/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -23,8 +23,8 @@ OPTIONS_DEFINE= DOCS ALL_TARGET= libcfitsio.a shared CFLAGS+= -I${INCLUDEDIR} +LIBS+= -L${LIBDIR} -lz CONFIGURE_ARGS= ac_cv_prog_FC=f2c -CONFIGURE_ENV= LIBS="-L${LIBDIR} -lz" GNU_CONFIGURE= yes MAKE_ARGS= ZLIB_SOURCES="zlib/zcompress.c zlib/zuncompress.c" USE_LDCONFIG= yes Modified: head/astro/openuniverse/Makefile ============================================================================== --- head/astro/openuniverse/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/astro/openuniverse/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -21,8 +21,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \ --libdir="${LOCALBASE}/lib" \ -CONFIGURE_ENV= LIBS="-lcompat" CPPFLAGS+= -I${LOCALBASE}/include/GL -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lm +LIBS+= -L${LOCALBASE}/lib -lm -lcompat .include Modified: head/astro/roadmap/Makefile ============================================================================== --- head/astro/roadmap/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/astro/roadmap/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -52,6 +52,9 @@ post-patch: s|/usr/include|${LOCALBASE}/include|g ; \ s|/usr/local/include|${LOCALBASE}/include|g ; \ s|/usr/local/lib|${LOCALBASE}/lib|g' ${WRKSRC}/src/options.mk + @${ECHO_CMD} 'CFLAGS=${CFLAGS}' > ${WRKSRC}/src/overrides.mk + @${ECHO_CMD} 'LDFLAGS=${LDFLAGS}' >> ${WRKSRC}/src/overrides.mk + @${ECHO_CMD} 'LIBS=${LIBS}' >> ${WRKSRC}/src/overrides.mk do-install: .for _BIN in ${BINS} Modified: head/astro/xplanet/Makefile ============================================================================== --- head/astro/xplanet/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/astro/xplanet/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -14,8 +14,8 @@ GNU_CONFIGURE= yes USES= iconv USE_XORG= xt xscrnsaver CONFIGURE_ARGS= --with-map-extension=jpg -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lm" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lm OPTIONS_DEFINE= FREETYPE PANGO GIF JPEG PNG PNM TIFF OPTIONS_DEFAULT= FREETYPE PANGO GIF JPEG PNG PNM TIFF Modified: head/audio/deadbeef/Makefile ============================================================================== --- head/audio/deadbeef/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/audio/deadbeef/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -21,9 +21,9 @@ GNU_CONFIGURE= yes USES= gmake pkgconfig gettext iconv shebangfix tar:bzip2 desktop-file-utils \ libtool USE_LDCONFIG= yes -CONFIGURE_ARGS= --disable-alsa --disable-nullout \ - CPPFLAGS="-I../dumb/dumb-kode54/include -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lexecinfo -lintl" +CONFIGURE_ARGS= --disable-alsa --disable-nullout +CPPFLAGS+= -I../dumb/dumb-kode54/include -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lexecinfo -lintl WANT_GNOME= yes INSTALLS_ICONS= yes CONFIGURE_ENV+= CONFIG_SHELL="${LOCALBASE}/bin/bash" Modified: head/audio/fdk-aac/Makefile ============================================================================== --- head/audio/fdk-aac/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/audio/fdk-aac/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -17,7 +17,7 @@ LICENSE_PERMS= dist-mirror pkg-mirror au NOT_FOR_ARCHS= sparc64 NOT_FOR_ARCHS_REASON= not yet ported to this architecture -CONFIGURE_ENV= LIBS="-lm" +LIBS+= -lm GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= pathfix Modified: head/audio/festival/Makefile ============================================================================== --- head/audio/festival/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/audio/festival/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -37,11 +37,9 @@ CONFIGURE_WRKSRC= ${WRKDIR}/festival USES= gmake SPEECHTOOLS= ${WRKSRC}/speech_tools FESTIVAL= ${WRKSRC}/festival -MAKE_ENV+= GCC="${CC}" \ - GXX="${CXX}" \ - EST_HOME=${SPEECHTOOLS} \ - EGCS_CC="${CC}" \ - EGCS_CXX="${CXX}" +MAKE_ARGS+= CC="${CC}" GCC="${CC}" \ + CXX="${CXX}" GXX="${CXX}" \ + EST_HOME=${SPEECHTOOLS} WRKSRC= ${WRKDIR} SPT_PATCHES= base__class_EST__TVector.cc \ @@ -60,14 +58,13 @@ SPT_PATCHES= base__class_EST__TVector.cc do-build: .for d in speech_tools festival - ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKDIR}/$d ${MAKE_FLAGS} Makefile \ - ${MAKE_ARGS} + ${MAKE_CMD} -C ${WRKDIR}/$d ${MAKE_FLAGS} Makefile ${MAKE_ARGS} .endfor # Can not make test in `festival', because the voices may not be installed # XXX: this should fail, if the verdict is not "CORRECT"... post-build test: - ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKDIR}/speech_tools test + ${MAKE_CMD} -C ${WRKDIR}/speech_tools test # The below is needed, because Debian's patches expect a different # directory-name @@ -96,8 +93,8 @@ CONFIGURE_ARGS+=--disable-$m do-configure: .for d in speech_tools festival @cd ${WRKDIR}/$d && \ - if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}; then \ ${ECHO_CMD} "===> configuration script for $d failed."; \ ${FALSE}; \ @@ -105,8 +102,9 @@ do-configure: # This step helps non-i386 systems and is harmless on i386 -${LN} -s ix86_FreeBSD.mak ${WRKDIR}/$d/config/systems/${ARCH}_unknown.mak .endfor - ${REINPLACE_CMD} -E -e 's,^(CC|CXX) *=,\1 ?=,' \ - -e 's,^(CFLAGS|CXXFLAGS) *=,\1 +=,' \ + ${REINPLACE_CMD} \ + -e '/^CFLAGS *=/s|$$| ${CFLAGS}|' \ + -e '/^CXXFLAGS *=/s|$$| ${CXXFLAGS}|' \ -e 's,^OPTIMI,#OPTIMI,' \ ${WRKSRC}/speech_tools/config/compilers/gcc*.mak # This step helps to use a compiler, the vendor has not seen before: Modified: head/audio/firefly/Makefile ============================================================================== --- head/audio/firefly/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/audio/firefly/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -24,10 +24,8 @@ LIB_DEPENDS= libogg.so:${PORTSDIR}/audio GNU_CONFIGURE= yes NO_STAGE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CFLAGS+= ${PTHREAD_CFLAGS} CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --prefix=${PREFIX} --with-id3tag=${PREFIX} \ --enable-sqlite3 --enable-oggvorbis --enable-flac Modified: head/audio/jack/Makefile ============================================================================== --- head/audio/jack/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/audio/jack/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -20,11 +20,10 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= gmake pathfix pkgconfig libtool:keepla -CONFIGURE_ENV= LIBS="-pthread" CONFIGURE_ARGS= --enable-portaudio \ --with-default-tmpdir=/tmp CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib LATEST_LINK= jack Modified: head/audio/mp3plot/Makefile ============================================================================== --- head/audio/mp3plot/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/audio/mp3plot/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -20,12 +20,11 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-boost-program-options=boost_program_options \ --with-boost-thread=boost_thread -CONFIGURE_ENV+= "LIBS=-lboost_system" PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lboost_system .include Modified: head/audio/playgsf/Makefile ============================================================================== --- head/audio/playgsf/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/audio/playgsf/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -19,8 +19,6 @@ GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV+= LIBS="${LDFLAGS}" -CONFIGURE_ENV+= LIBS="${LDFLAGS}" CONFIGURE_ARGS+= --enable-ccore --disable-optimisations PLIST_FILES= bin/playgsf @@ -29,7 +27,7 @@ ONLY_FOR_ARCHS= i386 amd64 PORTSCOUT= skipv:0.7.2 -.include +.include .if ${OSVERSION} >= 901000 EXTRA_PATCHES= ${FILESDIR}/extrapatch-VBA__Util.cpp @@ -37,19 +35,20 @@ EXTRA_PATCHES= ${FILESDIR}/extrapatch-VB post-patch: @${REINPLACE_CMD} \ - -e 's|\(@LDFLAGS@\)|\1 ${LDFLAGS}|' \ -e 's|\([[:space:]]*\).*configure.*|\1@true|' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|^\(CFLAGS="\)\(-DLINUX\)|\1${CFLAGS} \2|' \ + @${REINPLACE_CMD} \ + -e '/^CFLAGS="-DLINUX/s|"$$| ${CFLAGS}"|' \ + -e '/^LDFLAGS="-lz/s|"$$| ${LDFLAGS}"|' \ ${WRKSRC}/configure post-configure: - @(cd ${WRKSRC}/libresample-0.1.3; ./configure ${CONFIGURE_ENV}) + @(cd ${WRKSRC}/libresample-0.1.3 && ${SETENV} \ + CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + ${CONFIGURE_ENV} ./configure) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin -post-install: - ${CAT} ${PKGMESSAGE} - -.include +.include Modified: head/audio/pulseaudio/Makefile ============================================================================== --- head/audio/pulseaudio/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/audio/pulseaudio/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -35,10 +35,9 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD PTHREAD_LIBS="${PTHREAD_LIBS}" \ OPENSSL_CFLAGS="-I/usr/include" \ OPENSSL_LIBS="-lcrypto -lssl" \ - LIBS="-lm -lintl" \ ac_cv_header_linux_input_h= CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lm -lintl .if ${CC} == clang CFLAGS+= -fheinous-gnu-extensions Modified: head/audio/rhythmbox/Makefile ============================================================================== --- head/audio/rhythmbox/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/audio/rhythmbox/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -36,10 +36,9 @@ CONFIGURE_ARGS= --disable-vala --with-li INSTALLS_ICONS= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="-lm" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lm GCONF_SCHEMAS= rhythmbox.schemas Modified: head/audio/rplay/Makefile ============================================================================== --- head/audio/rplay/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/audio/rplay/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -14,8 +14,8 @@ LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INFO= RPLAY RPTP librplay rplayd Modified: head/audio/spiralsynthmodular/Makefile ============================================================================== --- head/audio/spiralsynthmodular/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/audio/spiralsynthmodular/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -19,9 +19,9 @@ LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11- USE_XORG= x11 GNU_CONFIGURE= yes -CONFIGURE_ENV= FLTK_CONFIG="${FLTK_CONFIG}" \ - LIBS="${LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= FLTK_CONFIG="${FLTK_CONFIG}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/spiralmodular-0.2.2 Modified: head/benchmarks/dbench/Makefile ============================================================================== --- head/benchmarks/dbench/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/benchmarks/dbench/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -16,9 +16,9 @@ LIB_DEPENDS= libpopt.so:${PORTSDIR}/deve LICENSE= GPLv3 CFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USE_AUTOTOOLS= autoconf GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+=--datadir=${DATADIR} post-install: Modified: head/benchmarks/netio/Makefile ============================================================================== --- head/benchmarks/netio/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/benchmarks/netio/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -15,23 +15,26 @@ WRKSRC= ${WRKDIR} USES= gmake zip PLIST_FILES= bin/netio -CFLAGS+= -DUNIX ${PTHREAD_CFLAGS} -MAKE_ENV+= OUT="-o" LIBS=${PTHREAD_LIBS} -.if defined(WITH_IPV6) -PLIST_FILES+= bin/netio6 -.endif +CFLAGS+= -DUNIX +LIBS+= -pthread +MAKE_ENV+= OUT=-o + +OPTIONS_DEFINE= IPV6 +IPV6_PLIST_FILES= bin/netio6 + +.include do-build: - cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} O=.o CFLAGS="${CFLAGS}" ${GMAKE} all -.if defined(WITH_IPV6) - cd ${WRKSRC}; \ - ${MAKE_ENV} O=.6o X=6 CFLAGS="${CFLAGS} -DUSE_IPV6" ${GMAKE} all + @(cd ${WRKSRC} && \ + ${SETENV} ${MAKE_ENV} O=.o CFLAGS="${CFLAGS}" ${MAKE_CMD} all) +.if ${PORT_OPTIONS:MIPV6} + @(cd ${WRKSRC} && \ + ${MAKE_ENV} O=.6o X=6 CFLAGS="${CFLAGS} -DUSE_IPV6" ${MAKE_CMD} all) .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/netio ${STAGEDIR}${PREFIX}/bin -.if defined(WITH_IPV6) +.if ${PORT_OPTIONS:MIPV6} ${INSTALL_PROGRAM} ${WRKSRC}/netio6 ${STAGEDIR}${PREFIX}/bin .endif Modified: head/chinese/oto/Makefile ============================================================================== --- head/chinese/oto/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/chinese/oto/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -12,7 +12,7 @@ COMMENT= Show you font info and add new USES= gmake iconv GNU_CONFIGURE= YES CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} post-patch: @${FIND} ${WRKSRC}/src/ -type f -print0 | \ Modified: head/chinese/reciteword/Makefile ============================================================================== --- head/chinese/reciteword/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/chinese/reciteword/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -17,10 +17,10 @@ COMMENT= Education software to help peop LIB_DEPENDS= libespeak.so:${PORTSDIR}/audio/espeak GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" USES= tar:bzip2 gettext gmake pkgconfig USE_GNOME= gtk20 esound -CPPFLAGS+= "-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README TODO readme.txt Modified: head/comms/gmfsk/Makefile ============================================================================== --- head/comms/gmfsk/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/comms/gmfsk/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -15,10 +15,8 @@ COMMENT= The Gnome MFSK terminal program LIB_DEPENDS= libfftw.so:${PORTSDIR}/math/fftw GNU_CONFIGURE= yes -# This is pure evil but it looks like autoconf 2.53 has a bug in linking the -# preprocessor include tests. The following line is a work around. -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USES_CSTD= gnu89 USES= gmake pkgconfig USE_GNOME= libgnomeui gnomehack gnomeprefix Modified: head/comms/gnokii/Makefile ============================================================================== --- head/comms/gnokii/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/comms/gnokii/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -19,19 +19,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser GROUPS= ${PORTNAME} -USES= gettext gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes USE_CSTD= gnu89 -WANT_GNOME= yes USE_GNOME= intltool GNU_CONFIGURE= yes -CPPFLAGS+= ${CFLAGS} -I${LOCALBASE}/include -fPIC CONFIGURE_ARGS+= --enable-security -CONFIGURE_ENV+= MSGFMT="${LOCALBASE}/bin/msgfmt" \ - XGETTEXT="${LOCALBASE}/bin/xgettext" \ - LIBS="-L${WRKSRC}/common -L${LOCALBASE}/lib" \ - PKG_CONFIG="${LOCALBASE}/bin/pkg-config" -LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib SUB_FILES+= pkg-message PORTDOCS= * Modified: head/comms/gnokii/files/patch-xgnokii-Makefile.in ============================================================================== --- head/comms/gnokii/files/patch-xgnokii-Makefile.in Wed Jun 11 14:45:18 2014 (r357485) +++ head/comms/gnokii/files/patch-xgnokii-Makefile.in Wed Jun 11 14:49:59 2014 (r357486) @@ -9,13 +9,3 @@ am__DEPENDENCIES_1 = xgnokii_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(top_builddir)/common/libgnokii.la \ -@@ -360,7 +360,8 @@ - #FIXME install help - HELP_DIR = docs/help - pkgconfig_DATA = xgnokii.pc --pkgconfigdir = $(libdir)/pkgconfig -+libdatadir = $(libdir)data -+pkgconfigdir = $(libdatadir)/pkgconfig - desktop_in_files = xgnokii.desktop.in - desktopdir = $(datadir)/applications - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) Modified: head/comms/hamlib/Makefile ============================================================================== --- head/comms/hamlib/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/comms/hamlib/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -19,8 +19,8 @@ USE_GNOME= libxml2 USE_PYTHON= yes USE_AUTOTOOLS= autoconf libtool libltdl USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-perl-binding \ --enable-tcl-binding --with-tcl=${TCL_LIBDIR} \ --with-python-binding --without-rigmatrix Modified: head/comms/minicom/Makefile ============================================================================== --- head/comms/minicom/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/comms/minicom/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -20,13 +20,12 @@ NLS_CONFIGURE_ENABLE= nls USES= iconv CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} -lcurses GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-dfl-baud=57600 \ --sysconfdir=${PREFIX}/etc/minicom \ --enable-lock-dir=/var/spool/lock \ --enable-dfl-port=/dev/cuau0 -MAKE_ARGS+= LIBS+="${ICONV_LIB} -lcurses" .include Modified: head/comms/nokryptia/Makefile ============================================================================== --- head/comms/nokryptia/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/comms/nokryptia/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -14,8 +14,8 @@ LIB_DEPENDS= libid3.so:${PORTSDIR}/audio GNU_CONFIGURE= yes USE_BZIP2= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PLIST_FILES= bin/nokryptia man/man1/${PORTNAME}.1.gz Modified: head/comms/predict/Makefile ============================================================================== --- head/comms/predict/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/comms/predict/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -15,7 +15,7 @@ LICENSE= GPLv2 INSTALL_TARGET= install install.man -MAKE_ENV= LIBS="${PTHREAD_LIBS}" +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" post-patch: @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/predict.h > ${WRKSRC}/predict.h Modified: head/comms/predict/files/Makefile ============================================================================== --- head/comms/predict/files/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/comms/predict/files/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -16,7 +16,7 @@ CFLAGS = -O2 default: all all: predict vocalizer/vocalizer -LIBS += -lm -lncurses +LIBS = ${LDFLAGS} -pthread -lm -lncurses predict: predict.c predict.h ${CC} ${CFLAGS} -o predict predict.c ${LIBS} Modified: head/converters/fix-mime-charset/Makefile ============================================================================== --- head/converters/fix-mime-charset/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/converters/fix-mime-charset/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -20,8 +20,8 @@ GNU_CONFIGURE= yes USES= perl5 USE_PERL5= build -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PLIST_FILES= bin/fix-mime-charset \ man/man1/fix-mime-charset.1.gz Modified: head/converters/pdf2djvu/Makefile ============================================================================== --- head/converters/pdf2djvu/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/converters/pdf2djvu/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -18,8 +18,6 @@ LIB_DEPENDS= libpoppler.so:${PORTSDIR}/g libdjvulibre.so:${PORTSDIR}/graphics/djvulibre GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS=-pthread -CPPFLAGS+= -I${LOCALBASE}/include USES= compiler:c++11-lang gmake pkgconfig PLIST_FILES= bin/pdf2djvu man/man1/pdf2djvu.1.gz Modified: head/converters/rcctools/Makefile ============================================================================== --- head/converters/rcctools/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/converters/rcctools/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -15,8 +15,8 @@ LIB_DEPENDS= librcc.so:${PORTSDIR}/devel USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PLIST_FILES= bin/rcc-recode Modified: head/databases/dbtool/Makefile ============================================================================== --- head/databases/dbtool/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/databases/dbtool/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -24,8 +24,8 @@ EXAMPLES_RUN_DEPENDS= bash:${PORTSDIR}/s LICENSE= GPLv2 GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USES= gmake REINPLACE_ARGS= -i "" Modified: head/databases/hk_classes/Makefile ============================================================================== --- head/databases/hk_classes/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/databases/hk_classes/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -16,8 +16,7 @@ LIB_DEPENDS= libfontconfig.so:${PORTSDIR USES= pkgconfig gettext iconv tar:bzip2 USE_PYTHON= yes -CXXFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl +LIBS+= -L${LOCALBASE}/lib -largp -lintl USE_AUTOTOOLS= libtool CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S/python//} CONFIGURE_ARGS+=--with-python-libdir=${PYTHON_LIBDIR} \ Modified: head/databases/libodbc++/Makefile ============================================================================== --- head/databases/libodbc++/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/databases/libodbc++/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -19,9 +19,6 @@ USES= gmake libtool pkgconfig tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-isqlxx -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" -CXXFLAGS+= ${PTHREAD_CFLAGS} -CPPFLAGS+= -I${LOCALBASE}/include INSTALL_TARGET= install-strip LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC Modified: head/databases/oracle_odbc_driver/Makefile ============================================================================== --- head/databases/oracle_odbc_driver/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/databases/oracle_odbc_driver/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -22,8 +22,8 @@ ORACLE_HOME= ${LOCALBASE}/oracle8-client GNU_CONFIGURE= yes CONFIGURE_ENV= ORACLE_HOME="${ORACLE_HOME}" \ - LIBS="`${CAT} ${ORACLE_HOME}/lib/sysliblist`"\ AUTOHEADER=true +LIBS+= `${CAT} ${ORACLE_HOME}/lib/sysliblist` USE_LDCONFIG= yes USE_AUTOTOOLS= libtool Modified: head/databases/pgadmin3/Makefile ============================================================================== --- head/databases/pgadmin3/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/databases/pgadmin3/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -18,8 +18,6 @@ IGNORE_WITH_PGSQL= 82 83 USES= gettext gmake pgsql GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" -CPPFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ARGS= --with-wx-version=${USE_WX} --enable-databasedesigner USE_GNOME= libxml2 libxslt USE_WX= 2.8 Modified: head/deskutils/gnome-main-menu/Makefile ============================================================================== --- head/deskutils/gnome-main-menu/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/deskutils/gnome-main-menu/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -18,9 +18,8 @@ USE_GNOME= gnomehack gnomeprefix gnomepa libgnomeui USES= gettext gmake pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`" CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0` -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0` GCONF_SCHEMAS= application-browser.schemas slab.schemas Modified: head/deskutils/logjam/Makefile ============================================================================== --- head/deskutils/logjam/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/deskutils/logjam/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -19,8 +19,8 @@ WANT_GNOME= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gtk20 libxml2 intlhack CONFIGURE_ARGS= --program-transform-name="s/$$//" -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .ifndef(WITHOUT_GTKSPELL) LIB_DEPENDS+= libgtkspell.so:${PORTSDIR}/textproc/gtkspell Modified: head/deskutils/multisync/Makefile ============================================================================== --- head/deskutils/multisync/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/deskutils/multisync/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -17,8 +17,8 @@ USE_BZIP2= yes USE_GNOME= gnomeprefix libgnomeui USES= gmake pathfix pkgconfig USE_AUTOTOOLS= automake:env libtool -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes pre-configure: Modified: head/devel/apr1/Makefile ============================================================================== --- head/devel/apr1/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/devel/apr1/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -114,9 +114,8 @@ APU_CONF_ARGS+= --without-freetds APU_EXTRAS= yes USE_MYSQL= yes APU_CONF_ARGS+= --with-mysql=${LOCALBASE} -CONFIGURE_ENV+= LIBS="${LIBS}" CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H -LDFLAGS+= -L${LOCALBASE}/lib/mysql +LIBS+= -L${LOCALBASE}/lib/mysql .else APU_CONF_ARGS+= --without-mysql .endif Modified: head/devel/apr2/Makefile ============================================================================== --- head/devel/apr2/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/devel/apr2/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -134,9 +134,8 @@ EXTRAS= yes PLIST_SUB+= MYSQL="" USE_MYSQL= YES CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} -CONFIGURE_ENV+= LIBS="${LIBS}" CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H -LDFLAGS+= -L${LOCALBASE}/lib/mysql +LIBS+= -L${LOCALBASE}/lib/mysql . if defined(PKGNAMESUFFIX) PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-mysql${MYSQL_VER} . else Modified: head/devel/asmutils/Makefile ============================================================================== --- head/devel/asmutils/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/devel/asmutils/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -34,10 +34,10 @@ BINS= bonus/asmutils basename cal cat c LINKS= arch cpuspeed domainname false halt inflate kldstat kldunload \ mkfifo more poweroff regs rmdir size sln todos umount usleep -LIBS= libc.so.0 libcrypto.so.0 libm.so.0 +LIBRARIES= libc.so.0 libcrypto.so.0 libm.so.0 PLIST_FILES= ${BINS:S/^/bin\/asmutils\//:S/bonus\///} \ - ${LINKS:S/^/bin\/asmutils\//} ${LIBS:S/^/lib\/asmutils\//} + ${LINKS:S/^/bin\/asmutils\//} ${LIBRARIES:S/^/lib\/asmutils\//} PLIST_DIRS= bin/asmutils lib/asmutils PORTDOCS= * @@ -53,7 +53,7 @@ do-install: .for bin in ${BINS} ${INSTALL_PROGRAM} ${WRKSRC}/src/${bin} ${PREFIX}/bin/asmutils .endfor -.for lib in ${LIBS} +.for lib in ${LIBRARIES} ${INSTALL_PROGRAM} ${WRKSRC}/lib/${lib} ${PREFIX}/lib/asmutils .endfor (cd ${PREFIX}/bin/asmutils && \ Modified: head/devel/ccrtp/Makefile ============================================================================== --- head/devel/ccrtp/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/devel/ccrtp/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -17,8 +17,8 @@ GNU_CONFIGURE= yes USES= gmake gettext iconv pkgconfig USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -pthread" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INFO= ccrtp post-patch: Modified: head/devel/google-perftools/Makefile ============================================================================== --- head/devel/google-perftools/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/devel/google-perftools/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -29,9 +29,7 @@ USE_LDCONFIG= yes USES= compiler CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -lexecinfo -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS+=LIBS="${LIBS}" +LIBS+= -L${LOCALBASE}/lib -lexecinfo .include Modified: head/devel/ifd-test/Makefile ============================================================================== --- head/devel/ifd-test/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/devel/ifd-test/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -15,7 +15,7 @@ LIB_DEPENDS= pcsclite.1:${PORTSDIR}/d USES= gmake NOMAN= PLIST_FILES= sbin/ifdtest -MAKE_ENV= LIBS="-L${PREFIX}/lib -lpcsclite" +LIBS+= -L${LOCALBASE}/lib -lpcsclite post-patch: ${REINPLACE_CMD} -e "s,LPSTR,LPTSTR,g; s,LPCSTR,LPCTSTR,g; \ Modified: head/devel/libgutenfetch/Makefile ============================================================================== --- head/devel/libgutenfetch/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/devel/libgutenfetch/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -14,8 +14,8 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USES= gmake USE_BZIP2= yes Modified: head/devel/libunicode/Makefile ============================================================================== --- head/devel/libunicode/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/devel/libunicode/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -19,8 +19,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share \ --datadir=${PREFIX}/share -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include Modified: head/devel/libzvbi/Makefile ============================================================================== --- head/devel/libzvbi/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/devel/libzvbi/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -18,8 +18,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -L/usr/lib" -CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|#cpu (\([^)]*\))|defined(__\1__)|g' \ Modified: head/devel/nspr/Makefile ============================================================================== --- head/devel/nspr/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/devel/nspr/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -19,7 +19,7 @@ CONFIGURE_ARGS= --srcdir=${WRKSRC:H} MAKE_ENV= DIST=${WRKSRC}/dist -LIBS= libnspr4.so.1 libplc4.so.1 libplds4.so.1 +LIBRARIES= libnspr4.so.1 libplc4.so.1 libplds4.so.1 .include @@ -44,7 +44,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/config/nspr-config ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig ${INSTALL_DATA} ${WRKSRC}/config/nspr.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig -.for lib in ${LIBS} +.for lib in ${LIBRARIES} .if defined(STRIP) && ${STRIP} != "" ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib} .endif Modified: head/devel/pypersrc/Makefile ============================================================================== --- head/devel/pypersrc/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/devel/pypersrc/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -19,8 +19,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} WRKSRC= ${WRKDIR}/${PORTNAME} -USES+= gmake -USE_BZIP2= yes +USES= gmake tar:bzip2 USE_PYTHON= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT= configure.sh @@ -39,6 +38,11 @@ post-patch: ${REINPLACE_CMD} -e 's|g++|${CXX}|g' ${WRKSRC}/tests/GNUmakefile @${REINPLACE_CMD} -e 's|tolower|::tolower|' ${WRKSRC}/src/cc/utils_string.hh +post-configure: + @(cd ${WRKSRC}/src/ctags-5.5.4 && ${SETENV} CC="${CC}" CPP="${CPP}" \ + CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ + ${CONFIGURE_ENV} ./configure) + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/out/pypersrc ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/out/pypersrc.py ${STAGEDIR}${PREFIX}/bin Modified: head/devel/srecord/Makefile ============================================================================== --- head/devel/srecord/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/devel/srecord/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -14,8 +14,8 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boos LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes USE_AUTOTOOLS= libtool Modified: head/dns/libidn/Makefile ============================================================================== --- head/dns/libidn/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/dns/libidn/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -14,8 +14,8 @@ OPTIONS_DEFINE= DOCS NLS USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib USE_PERL5= build USES= iconv pathfix perl5 pkgconfig Modified: head/editors/joe/Makefile ============================================================================== --- head/editors/joe/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/editors/joe/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -22,8 +22,8 @@ CONFLICTS= joe-2.* USES= gmake iconv ncurses GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} ALL_TARGET= ${PORTNAME} Modified: head/editors/joe2/Makefile ============================================================================== --- head/editors/joe2/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/editors/joe2/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -19,8 +19,8 @@ CONFLICTS= joe-3* GNU_CONFIGURE= yes USES= iconv gmake -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} ALL_TARGET= ${PORTNAME} Modified: head/editors/mlview/Makefile ============================================================================== --- head/editors/mlview/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/editors/mlview/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -15,8 +15,8 @@ USE_AUTOTOOLS= autoconf libtool USES= pathfix gmake iconv pkgconfig tar:bzip2 USE_GNOME= eel2 gnomeprefix gtksourceview libgnomeui USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0` ${ICONV_LIB}" CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0 libgnomeui-2.0` +LIBS+= -L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0` ${ICONV_LIB} GCONF_SCHEMAS= mlview.schemas Modified: head/editors/xcoral/Makefile ============================================================================== --- head/editors/xcoral/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/editors/xcoral/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -11,8 +11,8 @@ COMMENT= Multiwindow mouse-based text ed USE_XORG= x11 GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lgnuregex" CONFIGURE_ARGS= --libdir=${PREFIX}/share +LIBS+= -lgnuregex MAKE_JOBS_UNSAFE= yes PLIST_SUB= VERSION="${PORTVERSION}" Modified: head/emulators/fuse/Makefile ============================================================================== --- head/emulators/fuse/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/emulators/fuse/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -21,8 +21,8 @@ USES= pkgconfig gmake USE_GNOME= libxml2 glib20 CONFIGURE_ARGS+=--without-alsa --without-joystick -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= AO ICONS ROMS OPTIONS_DEFAULT= ICONS GTK2 Modified: head/emulators/vba/Makefile ============================================================================== --- head/emulators/vba/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/emulators/vba/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -19,10 +19,9 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/ USES= gettext gmake GNU_CONFIGURE= yes USE_SDL= sdl -CONFIGURE_ARGS= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" LIBS="-lintl" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lintl WRKSRC= ${WRKDIR}/VisualBoyAdvance-${PORTVERSION} SUB_FILES= pkg-message Modified: head/emulators/x48/Makefile ============================================================================== --- head/emulators/x48/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/emulators/x48/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -23,7 +23,7 @@ USE_AUTOTOOLS= aclocal autoheader automa AUTOMAKE_ARGS= --add-missing --copy -Wno-portability ACLOCAL_ARGS= # default args (--acdir=...) produce broken configure script CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LIBS=-lutil +LIBS+= -lutil USES= gmake pkgconfig USE_XORG= x11 xext xt NO_WRKSUBDIR= yes Modified: head/ftp/lftp/Makefile ============================================================================== --- head/ftp/lftp/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/ftp/lftp/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -23,11 +23,11 @@ LIB_DEPENDS= libexpat.so:${PORTSDIR}/tex USES= iconv shebangfix CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes # XXX FreeBSD 9.x has posix_fallocate() for OSVERSION > 900035, # but is missing the required POSIX_FADV_* macros -CONFIGURE_ENV= i_cv_posix_fallocate_works=no \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= i_cv_posix_fallocate_works=no PORTDOCS= AUTHORS BUGS ChangeLog FAQ FEATURES INSTALL \ MIRRORS NEWS README README.debug-levels README.modules \ Modified: head/ftp/proftpd/Makefile ============================================================================== --- head/ftp/proftpd/Makefile Wed Jun 11 14:45:18 2014 (r357485) +++ head/ftp/proftpd/Makefile Wed Jun 11 14:49:59 2014 (r357486) @@ -100,8 +100,8 @@ PLIST_SUB+= LOCALSTATEDIR="${LOCALSTATED .include .if !defined(_BUILDING_PROFTPD_MODULE) -CFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC} -PROFTPD_LIBS+= -lssl -lcrypto -L${OPENSSLLIB} +CPPFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC} +LIBS+= -lssl -lcrypto -L${OPENSSLLIB} .endif .if !defined(_BUILDING_PROFTPD_MODULE) @@ -180,7 +180,7 @@ MODULES+= mod_memcache \ mod_tls_memcache LIB_DEPENDS+= libmemcached.so:${PORTSDIR}/databases/libmemcached CONFIGURE_ARGS+= --enable-memcache -PROFTPD_LIBS+= -L${LOCALBASE}/lib -lmemcached -lmemcachedutil +LIBS+= -L${LOCALBASE}/lib -lmemcached -lmemcachedutil PLIST_SUB+= MEMCACHE="" .else CONFIGURE_ARGS+= --disable-memcache @@ -193,7 +193,6 @@ _MODULES:=${_MODULES}:${m} .endfor # Keep this here below, in case similar constructs need to be made -CONFIGURE_ENV+= LIBS="${PROFTPD_LIBS}" CONFIGURE_ARGS+= --with-shared=${_MODULES:C/^://g} .endif #!defined(_BUILDING_PROFTPD_MODULE) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***