diff options
Diffstat (limited to 'net-im')
42 files changed, 75 insertions, 86 deletions
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile index c141efb19738..d229a562ec8d 100644 --- a/net-im/ayttm/Makefile +++ b/net-im/ayttm/Makefile @@ -31,13 +31,12 @@ USE_GNOME= gtk20 USE_OPENSSL= yes USE_GMAKE= yes USE_AUTOTOOLS= libltdl libtool -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-oscar --disable-workwizu --enable-smtp --enable-lj MAN1= ayttm.1 -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile index 1dbada74d068..6f2846aea909 100644 --- a/net-im/centericq/Makefile +++ b/net-im/centericq/Makefile @@ -20,8 +20,8 @@ USE_ICONV= yes USE_OPENSSL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lstdc++ CONFIGURE_ARGS= --with-openssl --disable-konst diff --git a/net-im/centerim/Makefile b/net-im/centerim/Makefile index 258d85820363..8f98573b5119 100644 --- a/net-im/centerim/Makefile +++ b/net-im/centerim/Makefile @@ -21,8 +21,8 @@ USE_ICONV= yes USE_OPENSSL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --with-ssl --with-openssl WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CONFLICTS= centericq-[0-9]* centerim-devel-[0-9]* diff --git a/net-im/cli-msn/Makefile b/net-im/cli-msn/Makefile index f5efd28430e7..c03250357b06 100644 --- a/net-im/cli-msn/Makefile +++ b/net-im/cli-msn/Makefile @@ -21,7 +21,6 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_LIBS} LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" WRKSRC= ${WRKDIR}/climsn SUB_FILES= pkg-message diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile index cfeccae534c9..2a9f2167ceec 100644 --- a/net-im/climm/Makefile +++ b/net-im/climm/Makefile @@ -18,7 +18,6 @@ COMMENT= CLI-based Multi-Messenger USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" LDFLAGS+= -L${LOCALBASE}/lib MAN1= climm.1 diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile index 614eff0d117c..64d5163fc04e 100644 --- a/net-im/empathy/Makefile +++ b/net-im/empathy/Makefile @@ -42,8 +42,8 @@ INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_PYTHON= yes MAKE_JOBS_UNSAFE=yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-Werror \ --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile index 015e363702fe..d064f51605c6 100644 --- a/net-im/farsight2/Makefile +++ b/net-im/farsight2/Makefile @@ -23,8 +23,8 @@ USE_GNOME= gnomehack pkgconfig glib20 ltverhack \ pygtk2 USE_GSTREAMER= core good bad python USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile index 1083d01f2888..fec8de126d2c 100644 --- a/net-im/folks/Makefile +++ b/net-im/folks/Makefile @@ -25,8 +25,8 @@ USE_LDCONFIG= yes USE_GMAKE= yes USE_GNOME= gnomehack GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION=16 diff --git a/net-im/freetalk/Makefile b/net-im/freetalk/Makefile index e211bc3593e5..2dd7fcf607a3 100644 --- a/net-im/freetalk/Makefile +++ b/net-im/freetalk/Makefile @@ -21,8 +21,8 @@ RUN_DEPENDS= guile>=1.8.6:${PORTSDIR}/lang/guile USE_GNOME= pkgconfig glib20 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} MAN1= freetalk.1 INFO= freetalk diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile index 5853b98e2e10..0daee57b39a3 100644 --- a/net-im/fugu/Makefile +++ b/net-im/fugu/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALL="" +CONFIGURE_ENV= INSTALL="" PLIST_SUB+= PORTVERSION=${PORTVERSION} .include <bsd.port.mk> diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile index e24e383ac53a..b154c9326acd 100644 --- a/net-im/gajim-devel/Makefile +++ b/net-im/gajim-devel/Makefile @@ -28,8 +28,9 @@ USE_GNOME= pygtk2 USE_PYTHON= 2.5+ USE_XORG= x11 xext xscrnsaver -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" PYTHON=${PYTHON_CMD} +CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include .if !defined(WITHOUT_NLS) USE_GETTEXT= yes diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile index f08cf8e2f086..ed06f9526cb3 100644 --- a/net-im/gajim/Makefile +++ b/net-im/gajim/Makefile @@ -27,8 +27,9 @@ USE_GNOME= pygtk2 USE_PYTHON= 2.5+ USE_XORG= x11 xext xscrnsaver -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" PYTHON=${PYTHON_CMD} +CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include OPTIONS= DBUS "Adds support for D-Bus (Desktop Bus)" On \ NLS "Native Language Support via gettext utilities" On diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile index 4a236c2c4fef..18b671d01578 100644 --- a/net-im/gale/Makefile +++ b/net-im/gale/Makefile @@ -30,7 +30,6 @@ CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib \ -I${LOCALBASE}/include/w3c-libwww LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" # cheesy hack - test-oop doesn't build, but we don't care. pre-configure: diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile index 8d2ae3044e32..d7513a4f1371 100644 --- a/net-im/gicq/Makefile +++ b/net-im/gicq/Makefile @@ -22,8 +22,8 @@ USE_GETTEXT= yes GNU_CONFIGURE= yes USE_GNOME= gtk12 gnomehack gnomeprefix WANT_GNOME= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include .include <bsd.port.pre.mk> diff --git a/net-im/gloox/Makefile b/net-im/gloox/Makefile index 22f2149733f2..46e57438e0dd 100644 --- a/net-im/gloox/Makefile +++ b/net-im/gloox/Makefile @@ -21,8 +21,8 @@ USE_AUTOTOOLS= libtool USE_BZIP2= yes USE_GNOME= gnomehack GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes post-patch: diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile index bde5890c9740..707e146a98a0 100644 --- a/net-im/gossip/Makefile +++ b/net-im/gossip/Makefile @@ -35,8 +35,8 @@ USE_GNOME= gnomeprefix intlhack gnomehack gnomepanel gnomedocutils \ INSTALLS_OMF= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --enable-dbus=yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= gossip.schemas diff --git a/net-im/gyach/Makefile b/net-im/gyach/Makefile index 7dd6bb9de1a2..2520e76676b9 100644 --- a/net-im/gyach/Makefile +++ b/net-im/gyach/Makefile @@ -15,8 +15,8 @@ MAINTAINER?= aaron@snaphat.com COMMENT= Gyach is a GTK+ based Yahoo! Chat client GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} +CFLAGS+= ${PTHREAD_CFLAGS} USE_GNOME= gtk20 .include <bsd.port.pre.mk> diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile index cfc5de15d38b..95bbadc2119b 100644 --- a/net-im/ickle/Makefile +++ b/net-im/ickle/Makefile @@ -28,7 +28,7 @@ USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --with-sigc-prefix=${LOCALBASE} \ --with-gtkmm-prefix=${LOCALBASE} \ --with-gnome=no -CONFIGURE_ENV= CPPFLAGS="`${LOCALBASE}/bin/sigc-config --cflags`" +CPPFLAGS+= `${LOCALBASE}/bin/sigc-config --cflags` post-patch: @${REINPLACE_CMD} -E -e 's|(gtkmm_config_args[[:space:]]*=).+$$|\1|' \ diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile index 59a94982d170..ed46c8885798 100644 --- a/net-im/jabber/Makefile +++ b/net-im/jabber/Makefile @@ -56,7 +56,6 @@ JABBER_RUNDIR= "/var/run/jabberd" JABBER_SPOOLDIR="/var/spool/jabberd" JABBER_LOGDIR= "/var/log/jabberd" -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --localstatedir=/var \ --sysconfdir=${JABBER_ETCDIR} \ --includedir=${PREFIX}/include/jabber \ diff --git a/net-im/jggtrans/Makefile b/net-im/jggtrans/Makefile index 0bd8ea425b87..0b1841f65ca1 100644 --- a/net-im/jggtrans/Makefile +++ b/net-im/jggtrans/Makefile @@ -22,10 +22,9 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_GETTEXT= yes USE_GNOME= glib20 pkgconfig -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include -MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" USE_RC_SUBR= jggtrans.sh diff --git a/net-im/kmerlin/Makefile b/net-im/kmerlin/Makefile index 11b11b8dc2a3..274224fbc838 100644 --- a/net-im/kmerlin/Makefile +++ b/net-im/kmerlin/Makefile @@ -20,7 +20,7 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes CONFIGURE_ARGS+= --prefix=${LOCALBASE} -CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} post-patch: .for i in replacepage identityeditdialog identitysetting \ diff --git a/net-im/komclean/Makefile b/net-im/komclean/Makefile index 9cc37bd85e01..7f21ba764bb0 100644 --- a/net-im/komclean/Makefile +++ b/net-im/komclean/Makefile @@ -26,7 +26,6 @@ MAN1= komclean WRKSRC= ${WRKDIR}/${PKGNAME} CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV= LDFLAGS="${LDFLAGS}" DESKTOP_ENTRIES="KOMclean" \ "${COMMENT}" \ diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile index 92dd4b5abfc6..b0570f008996 100644 --- a/net-im/libjingle/Makefile +++ b/net-im/libjingle/Makefile @@ -13,10 +13,8 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Google Talk's implementation of Jingle and Jingle-Audio -BUILD_DEPENDS= \ - pkg-config:${PORTSDIR}/devel/pkg-config -LIB_DEPENDS= \ - speex.1:${PORTSDIR}/audio/speex \ +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config +LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \ ilbc.0:${PORTSDIR}/net/ilbc \ ortp.5:${PORTSDIR}/net/ortp \ expat.6:${PORTSDIR}/textproc/expat2 @@ -30,12 +28,9 @@ USE_AUTOTOOLS= libtool USE_DOS2UNIX= README USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= \ - --with-ilbc=${LOCALBASE} \ +CONFIGURE_ARGS= --with-ilbc=${LOCALBASE} \ --with-speex=${LOCALBASE} -CONFIGURE_ENV= \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${OPENSSLINC} ${PTHREAD_CFLAGS} -g" \ - PKG_CONFIG="${PKG_CONFIG}" \ +CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG}" \ EXPAT_CFLAGS="-I${LOCALBASE}/include" \ EXPAT_LIBS="-L${LOCALBASE}/lib -lexpat" \ GLIB_CFLAGS="$$(${PKG_CONFIG} --cflags glib-2.0)" \ @@ -44,22 +39,20 @@ CONFIGURE_ENV= \ ILBC_LIBS="-L${LOCALBASE}/lib -lilbc" \ SPEEX_CFLAGS="$$(${PKG_CONFIG} --cflags speex)" \ SPEEX_LIBS="$$(${PKG_CONFIG} --libs speex)" +CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} ${PTHREAD_CFLAGS} -g MAKE_JOBS_SAFE= yes -DOC_FILES= \ - AUTHORS \ +DOC_FILES= AUTHORS \ ChangeLog \ DOCUMENTATION \ NEWS \ README .ifndef(NOPORTDOCS) -PORTDOCS= \ - ${DOC_FILES} +PORTDOCS= ${DOC_FILES} .endif -PLIST_FILES+= \ - bin/login \ +PLIST_FILES+= bin/login \ bin/pcp \ bin/relayserver \ bin/stunserver \ diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile index 2a262071d560..8be2a43aaa4e 100644 --- a/net-im/libnice/Makefile +++ b/net-im/libnice/Makefile @@ -20,8 +20,8 @@ USE_LDCONFIG= yes USE_GNOME= gnomehack pkgconfig glib20 ltverhack USE_GSTREAMER= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GETIFADDRS" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_GETIFADDRS +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|__BYTE_ORDER|_BYTE_ORDER|g ; \ diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile index fa1e16b69f88..e2a0716b31e9 100644 --- a/net-im/libpurple/Makefile +++ b/net-im/libpurple/Makefile @@ -25,9 +25,9 @@ CONFIGURE_ARGS?=--disable-gtkui \ --with-dynamic_prpls=${PRPL_MODULES:S/,$//} \ --enable-static \ --disable-nm -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ PTHREAD_LIB="${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} .if !defined(PIDGIN_SLAVE) # Pidgin slave ports that require the following functionality, must explicitly diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile index a66e120f7668..d9cea4ef75e8 100644 --- a/net-im/loudmouth/Makefile +++ b/net-im/loudmouth/Makefile @@ -23,8 +23,8 @@ USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_GNOME= gnomehack glib20 ltverhack CONFIGURE_ARGS= --disable-gtk-doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-Wl,-Bsymbolic -L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -Wl,-Bsymbolic -L${LOCALBASE}/lib OPTIONS= GNUTLS "Enable SSL (via GnuTLS) support" on \ OPENSSL "Enable SSL (via OpenSSL) support" off diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile index 006b64fc3775..3c62060c1734 100644 --- a/net-im/mcabber/Makefile +++ b/net-im/mcabber/Makefile @@ -21,7 +21,8 @@ LICENSE= GPLv2 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-sigwinch --libdir=${PREFIX}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_ICONV= yes USE_GETTEXT= yes USE_LDCONFIG= yes diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile index fcdfcad905ed..a612f374ea94 100644 --- a/net-im/meanwhile/Makefile +++ b/net-im/meanwhile/Makefile @@ -21,8 +21,8 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-doxygen=no \ --with-gmp-prefix=${LOCALBASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-doc-${PORTVERSION} diff --git a/net-im/pidgin-birthday-reminder/Makefile b/net-im/pidgin-birthday-reminder/Makefile index 5b3252132795..dccb1bec9e11 100644 --- a/net-im/pidgin-birthday-reminder/Makefile +++ b/net-im/pidgin-birthday-reminder/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_GETTEXT= yes USE_GNOME= pkgconfig intltool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/net-im/pidgin-fetion/Makefile b/net-im/pidgin-fetion/Makefile index 731861daa150..67cc78f62877 100644 --- a/net-im/pidgin-fetion/Makefile +++ b/net-im/pidgin-fetion/Makefile @@ -22,8 +22,8 @@ MAKE_JOBS_SAFE= yes USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile index 95d1c5b8074b..429f2270fef3 100644 --- a/net-im/pidgin-guifications/Makefile +++ b/net-im/pidgin-guifications/Makefile @@ -22,7 +22,8 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack gtk20 GNU_CONFIGURE= yes -CONFIGURE_ENV= "CPPFLAGS=-I${LOCALBASE}/include" "LIBS=-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include .include <bsd.port.pre.mk> diff --git a/net-im/pidgin-libnotify/Makefile b/net-im/pidgin-libnotify/Makefile index 60ca66dbe6ab..36d1ee566388 100644 --- a/net-im/pidgin-libnotify/Makefile +++ b/net-im/pidgin-libnotify/Makefile @@ -34,8 +34,8 @@ USE_GETTEXT= yes PLIST_SUB+= NLS="" .endif -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ARGS= --disable-static diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile index 018fd3bbed44..589f7e10c539 100644 --- a/net-im/telepathy-farsight/Makefile +++ b/net-im/telepathy-farsight/Makefile @@ -29,7 +29,7 @@ USE_LDCONFIG= yes USE_PYTHON= yes USE_AUTOTOOLS= libtool USE_GNOME= gnomehack pkgconfig glib20 ltverhack -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.mk> diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile index e927679647cd..d7bd49db9604 100644 --- a/net-im/telepathy-gabble/Makefile +++ b/net-im/telepathy-gabble/Makefile @@ -28,7 +28,7 @@ LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \ RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} GNU_CONFIGURE= yes -LDFLAGS= ${PTHREAD_LIBS} +LDFLAGS+= ${PTHREAD_LIBS} USE_GMAKE= yes USE_GNOME= gnomehack pkgconfig glib20 USE_OPENSSL= yes diff --git a/net-im/telepathy-haze/Makefile b/net-im/telepathy-haze/Makefile index c7cc430bc0c3..b72ef3394ef3 100644 --- a/net-im/telepathy-haze/Makefile +++ b/net-im/telepathy-haze/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= purple.10:${PORTSDIR}/net-im/libpurple \ telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib USE_GNOME= pkgconfig -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include WRKSRC= ${WRKDIR}/telepathy-${PORTNAME}-${DISTVERSION} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile index edaad77edc5c..f3f99eeb3802 100644 --- a/net-im/telepathy-idle/Makefile +++ b/net-im/telepathy-idle/Makefile @@ -30,7 +30,8 @@ USE_GNOME= gnomehack pkgconfig glib20 MAN8= telepathy-idle.8 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile index e39ed74f8261..bbbaa6747f1a 100644 --- a/net-im/telepathy-mission-control/Makefile +++ b/net-im/telepathy-mission-control/Makefile @@ -18,7 +18,8 @@ LIB_DEPENDS= telepathy.2:${PORTSDIR}/net-im/libtelepathy \ USE_GNOME= gnomeprefix pkgconfig gconf2 libxslt gnomehack ltverhack USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_GMAKE= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes diff --git a/net-im/telepathy-python/Makefile b/net-im/telepathy-python/Makefile index 43fe33ba4456..0e977fd98217 100644 --- a/net-im/telepathy-python/Makefile +++ b/net-im/telepathy-python/Makefile @@ -25,8 +25,8 @@ RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} USE_PYTHON= 2.5+ USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes .include <bsd.port.mk> diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile index 4308ca184378..16a4a6c12d11 100644 --- a/net-im/telepathy-salut/Makefile +++ b/net-im/telepathy-salut/Makefile @@ -29,8 +29,8 @@ USE_GMAKE= yes USE_GNOME= gnomehack pkgconfig USE_OPENSSL= yes USE_PYTHON_BUILD= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ - LIBS="${PTHREAD_LIBS}" +CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} MAN8= telepathy-salut.8 diff --git a/net-im/vqcc-gtk/Makefile b/net-im/vqcc-gtk/Makefile index 256d52cece46..6319783b10f1 100644 --- a/net-im/vqcc-gtk/Makefile +++ b/net-im/vqcc-gtk/Makefile @@ -19,9 +19,8 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification USE_GNOME= gnomehack gnomeprefix gtk20 USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.mk> diff --git a/net-im/ysm/Makefile b/net-im/ysm/Makefile index 3ef69726e0ca..dd2d52b3fabb 100644 --- a/net-im/ysm/Makefile +++ b/net-im/ysm/Makefile @@ -23,9 +23,8 @@ USE_ICONV= yes USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - CFLAGS+="-I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -liconv MAN1= ysm.1 PLIST_FILES= bin/ysm diff --git a/net-im/zephyr/Makefile b/net-im/zephyr/Makefile index 3ff59eabe137..30a95580f770 100644 --- a/net-im/zephyr/Makefile +++ b/net-im/zephyr/Makefile @@ -43,6 +43,5 @@ KRB5_DIR?= ${DESTDIR}/usr # it is an upstream bug that --with-krb5 needs a path CONFIGURE_ARGS= --with-krb5="${KRB5_DIR}" -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" .include <bsd.port.mk> |