From 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Sat, 19 Apr 2008 17:56:05 +0000 Subject: - Remove unneeded dependency from gtk12/gtk20 [1] - Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG - Remove X11BASE support in favor of LOCALBASE or PREFIX - Use USE_LDCONFIG instead of INSTALLS_SHLIB - Remove unneeded USE_GCC 3.4+ Thanks to all Helpers: Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr, ehaupt, nox, itetcu, flz, pav PR: 116263 Tested on: pointyhat Approved by: portmgr (pav) --- net-im/aim/Makefile | 5 ++--- net-im/ayttm/Makefile | 10 +++++----- net-im/cli-msn/Makefile | 4 ++-- net-im/fugu/Makefile | 4 +--- net-im/gajim-devel/Makefile | 5 +++-- net-im/gajim/Makefile | 5 +++-- net-im/gnome-jabber/Makefile | 6 ++---- net-im/gnomeicu/Makefile | 5 ++--- net-im/gossip/Makefile | 4 ++-- net-im/kf/Makefile | 3 ++- net-im/konverse/Makefile | 5 +---- net-im/linpopup/Makefile | 3 ++- net-im/meanwhile/Makefile | 2 +- net-im/psi/Makefile | 8 ++++---- net-im/sim-im-devel/Makefile | 4 ++-- net-im/sim-im/Makefile | 4 ++-- net-im/vqcc-gtk/Makefile | 7 +++---- 17 files changed, 39 insertions(+), 45 deletions(-) (limited to 'net-im') diff --git a/net-im/aim/Makefile b/net-im/aim/Makefile index 6f30b9411b0a..f8241aee817b 100644 --- a/net-im/aim/Makefile +++ b/net-im/aim/Makefile @@ -20,11 +20,10 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux ONLY_FOR_ARCHS= i386 amd64 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_WRKSUBDIR= yes NO_BUILD= yes -#USE_LDCONFIG= yes (should replace INSTALLS_SHLIB after ports/102750 got committed) -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_LINUX_PREFIX= yes PLIST_SUB= LINUXBASE=${LINUXBASE} diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile index 976889fda406..268470e153d8 100644 --- a/net-im/ayttm/Makefile +++ b/net-im/ayttm/Makefile @@ -7,10 +7,9 @@ PORTNAME= ayttm PORTVERSION= 0.4.6.17 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-im -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} MAINTAINER= ports@FreeBSD.org @@ -23,6 +22,7 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} +USE_XORG= xpm USE_BZIP2= yes USE_GCC= 3.4 WANT_GNOME= yes @@ -36,8 +36,8 @@ CONFIGURE_ARGS= --enable-smtp --enable-jasper-filter MAN1= ayttm.1 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include diff --git a/net-im/cli-msn/Makefile b/net-im/cli-msn/Makefile index 02ce0276a167..d61af5d06c6c 100644 --- a/net-im/cli-msn/Makefile +++ b/net-im/cli-msn/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_GMAKE= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_LIBS} -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile index 74d13afd9f2a..395627179bae 100644 --- a/net-im/fugu/Makefile +++ b/net-im/fugu/Makefile @@ -7,7 +7,7 @@ PORTNAME= fugu PORTVERSION= 1.1.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im python MASTER_SITES= http://fugu.gale.org/dist/old/ @@ -18,8 +18,6 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw USE_OPENSSL= yes USE_PYTHON= yes -USE_XLIB= yes -USE_X_PREFIX= yes USE_AUTOTOOLS= autoconf:213 GNU_CONFIGURE= yes diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile index 863f65af73f6..1330a6994359 100644 --- a/net-im/gajim-devel/Makefile +++ b/net-im/gajim-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= gajim PORTVERSION= 20080309 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= http://ports.internal.vlink.ru/distfiles/ PKGNAMESUFFIX= -devel @@ -19,12 +19,13 @@ COMMENT= Gajim is a Jabber client based on a plugin system LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenSSL/SSL.so:${PORTSDIR}/security/py-openssl +USE_XORG= x11 xext GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= pygtk2 USE_PYTHON= 2.4+ -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I ${X11BASE}/include" \ +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I ${LOCALBASE}/include" \ LDFLAGS="-L ${LOCALBASE}/lib" PYTHON=${PYTHON_CMD} .if !defined(WITHOUT_NLS) diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile index fd6d7958bf88..076991d23ba0 100644 --- a/net-im/gajim/Makefile +++ b/net-im/gajim/Makefile @@ -7,7 +7,7 @@ PORTNAME= gajim PORTVERSION= 0.11.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= http://www.gajim.org/downloads/ \ http://ports.internal.vlink.ru/distfiles/ @@ -23,8 +23,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= pygtk2 USE_PYTHON= 2.4+ +USE_XORG= x11 xext -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I ${X11BASE}/include" \ +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I ${LOCALBASE}/include" \ LDFLAGS="-L ${LOCALBASE}/lib" PYTHON=${PYTHON_CMD} .if !defined(WITHOUT_NLS) diff --git a/net-im/gnome-jabber/Makefile b/net-im/gnome-jabber/Makefile index cced48c43c50..bef0a62c8550 100644 --- a/net-im/gnome-jabber/Makefile +++ b/net-im/gnome-jabber/Makefile @@ -7,17 +7,15 @@ PORTNAME= gnome-jabber PORTVERSION= 0.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-im gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 Jabber Client LIB_DEPENDS= gnet-2.0.0:${PORTSDIR}/net/gnet2 -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui USE_GETTEXT= yes diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile index dc8ba3d9bc9f..f58c0457a5eb 100644 --- a/net-im/gnomeicu/Makefile +++ b/net-im/gnomeicu/Makefile @@ -7,9 +7,9 @@ PORTNAME= gnomeicu PORTVERSION= 0.99.14 +PORTREVISION= 1 CATEGORIES= net-im gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gnomeicu +MASTER_SITES= SF MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 ICQ client @@ -17,7 +17,6 @@ COMMENT= GNOME 2 ICQ client LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm USE_BZIP2= yes -USE_XLIB= yes INSTALLS_OMF= yes USE_GNOME= gnomeprefix gnomehack libglade2 gnomepanel libxml2 \ intlhack diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile index 5ddc5d3f999a..62799b458816 100644 --- a/net-im/gossip/Makefile +++ b/net-im/gossip/Makefile @@ -8,7 +8,7 @@ PORTNAME= gossip PORTVERSION= 0.26 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,8 +23,8 @@ LIB_DEPENDS= loudmouth-1.0:${PORTSDIR}/net-im/loudmouth \ aspell.16:${PORTSDIR}/textproc/aspell RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes +USE_XORG= x11 xext ice USE_BZIP2= yes -USE_XLIB= yes GNU_CONFIGURE= yes USE_GETTEXT= yes USE_GMAKE= yes diff --git a/net-im/kf/Makefile b/net-im/kf/Makefile index 35c7e7d7c9e5..5cc1ea73e0fc 100644 --- a/net-im/kf/Makefile +++ b/net-im/kf/Makefile @@ -7,7 +7,7 @@ PORTNAME= kf PORTVERSION= 0.5.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MASTER_SITES= http://files.jabberstudio.org/kf/ \ http://jabberstudio.rediris.es/kf/ \ @@ -18,6 +18,7 @@ COMMENT= A simple Jabber client using the GTK+ 2.0 toolkit LIB_DEPENDS= loudmouth-1.0:${PORTSDIR}/net-im/loudmouth +USE_XORG= x11 xscrnsaver USE_GNOME= libglade2 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GNU_CONFIGURE= yes diff --git a/net-im/konverse/Makefile b/net-im/konverse/Makefile index 1116c90354a2..57671d7d4736 100644 --- a/net-im/konverse/Makefile +++ b/net-im/konverse/Makefile @@ -9,8 +9,7 @@ PORTNAME= konverse PORTVERSION= 0.2 PORTREVISION= 6 CATEGORIES= net-im kde -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= KDE Jabber Client @@ -20,8 +19,6 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes CONFIGURE_ARGS+=--with-extra-includes=${LOCALBASE}/include \ - --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ --with-qt-libraries=${QT_PREFIX}/lib pre-patch: diff --git a/net-im/linpopup/Makefile b/net-im/linpopup/Makefile index d51a9d231150..cbd0c12fcac1 100644 --- a/net-im/linpopup/Makefile +++ b/net-im/linpopup/Makefile @@ -7,7 +7,7 @@ PORTNAME= linpopup PORTVERSION= 1.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im MASTER_SITES= http://www.chez.com/littleigloo/files/ DISTNAME= LinPopUp-${PORTVERSION}.src @@ -19,6 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/smbclient:${PORTSDIR}/net/samba3 WRKSRC= ${WRKDIR}/LinPopUp-${PORTVERSION}/src +USE_XORG= x11 xmu USE_GNOME= gtk12 ALL_TARGET= LinPopUp diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile index 48fa0885821a..e16307159ba7 100644 --- a/net-im/meanwhile/Makefile +++ b/net-im/meanwhile/Makefile @@ -18,7 +18,7 @@ COMMENT= Open Source implementation of the Lotus Sametime protocol USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GNOME= gnomehack glib20 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-doxygen=no \ --with-gmp-prefix=${LOCALBASE} diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile index ece0e3276cd2..d75265a74341 100644 --- a/net-im/psi/Makefile +++ b/net-im/psi/Makefile @@ -17,7 +17,7 @@ COMMENT?= A Qt-based Jabber client BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake LIB_DEPENDS= qca.1:${PORTSDIR}/devel/qca -RUN_DEPENDS= ${X11BASE}/lib/plugins/crypto/libqca-tls.so:${PORTSDIR}/security/qca-tls +RUN_DEPENDS= ${LOCALBASE}/lib/plugins/crypto/libqca-tls.so:${PORTSDIR}/security/qca-tls HAS_CONFIGURE= yes USE_BZIP2= yes @@ -27,9 +27,9 @@ CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LDFLAGS=${PTHREAD_LIBS} \ KDEDIR=${LOCALBASE} -CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${X11BASE} \ - --with-qca-inc=${X11BASE}/include/plugins/qca \ - --with-qca-lib=${X11BASE}/lib \ +CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${LOCALBASE} \ + --with-qca-inc=${LOCALBASE}/include/plugins/qca \ + --with-qca-lib=${LOCALBASE}/lib \ --disable-growl --disable-dnotify --disable-ghbnr MAKE_ARGS+= QTDIR=${QT_PREFIX} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ diff --git a/net-im/sim-im-devel/Makefile b/net-im/sim-im-devel/Makefile index 23496cc0d2ca..509a21b7babb 100644 --- a/net-im/sim-im-devel/Makefile +++ b/net-im/sim-im-devel/Makefile @@ -6,6 +6,7 @@ PORTNAME= sim-im-devel PORTVERSION= 0.9.5.2099 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://sim-im.lehis.ru/dist/ \ http://www.sim-im.lehis.ru/dist/ @@ -22,6 +23,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_QT_VER= 3 +USE_XORG= x11 xext USE_OPENSSL= yes USE_PERL5_BUILD= yes USE_GETTEXT= yes @@ -31,8 +33,6 @@ INSTALLS_ICONS= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --prefix=${PREFIX} --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib - OPTIONS= KDE "Enable KDE support" off \ DEBUG "Enable debug" on diff --git a/net-im/sim-im/Makefile b/net-im/sim-im/Makefile index 667a680cf7e1..329c57b0092b 100644 --- a/net-im/sim-im/Makefile +++ b/net-im/sim-im/Makefile @@ -6,7 +6,7 @@ PORTNAME= sim-im PORTVERSION= 0.9.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= ${MASTER_SITE_BERLIOS} \ http://sim-im.lehis.ru/dist/ \ @@ -33,9 +33,9 @@ USE_OPENSSL= yes USE_LDCONFIG= yes USE_GETTEXT= yes INSTALLS_ICONS= yes +USE_XORG= x11 xext ice CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --prefix=${PREFIX} --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib .if !defined(WITH_KDE) CONFIGURE_ARGS+=--disable-kde --enable-mt diff --git a/net-im/vqcc-gtk/Makefile b/net-im/vqcc-gtk/Makefile index 5c6e7b044fe0..f23d11aca566 100644 --- a/net-im/vqcc-gtk/Makefile +++ b/net-im/vqcc-gtk/Makefile @@ -9,8 +9,7 @@ PORTNAME= vqcc-gtk PORTVERSION= 0.5 PORTREVISION= 3 CATEGORIES?= net-im -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER?= ports@FreeBSD.org COMMENT= LAN chat client compatible with quickChat and Vypress Chat (TM) @@ -22,7 +21,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include -- cgit v1.2.3