From 2efe4b8c83f689539c43d3835699e82fb3ef9bac Mon Sep 17 00:00:00 2001 From: steven Date: Fri, 20 Jan 2006 08:39:12 +0000 Subject: [PATCH] fix WANTLIB after gtk+2 downgrade add USE_X11 and MODULES=devel/gettext where appropriate --- net/etherape/Makefile | 13 ++++++++----- net/ettercap/Makefile | 14 ++++++++------ net/gajim/Makefile | 11 ++++++----- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/net/etherape/Makefile b/net/etherape/Makefile index 44eb82934b7..1a6bf6895f8 100644 --- a/net/etherape/Makefile +++ b/net/etherape/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.5 2005/11/15 15:55:53 wilfried Exp $ +# $OpenBSD: Makefile,v 1.6 2006/01/20 08:39:12 steven Exp $ COMMENT= "graphical network monitor" DISTNAME= etherape-0.9.0 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= net HOMEPAGE= http://etherape.sourceforge.net/ @@ -15,15 +15,15 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xext \ +WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xext Xft \ Xrender art_lgpl_2 atk-1.0.0.0 audiofile \ bonobo-activation bonoboui-2 c crypto esd fontconfig \ freetype gconf-2 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 \ glib-2.0.0.0 gmodule-2.0.0.0 gnome-2 gnome-keyring \ gnomecanvas-2 gnomevfs-2 gobject-2.0.0.0 \ iconv intl jpeg m pango-1.0.0.0 pangoft2-1.0.0.0 \ - pcap popt pthread ssl xml2 z bonobo-2 cairo \ - glitz gthread-2.0.0.0 pangocairo-1.0.0.0 png + pcap popt pthread ssl xml2 z bonobo-2 \ + gthread-2.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=etherape/} @@ -39,6 +39,9 @@ LIB_DEPENDS= gtk-x11-2.0.0.11::x11/gtk+2 \ glade-2.0.0.1::devel/libglade2 \ gnomeui-2::x11/gnome/libgnomeui +MODULES= devel/gettext + +USE_X11= Yes USE_LIBTOOL= Yes .include diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile index c7afd22dd6f..c741e2f1527 100644 --- a/net/ettercap/Makefile +++ b/net/ettercap/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.31 2005/11/26 21:17:54 kurt Exp $ +# $OpenBSD: Makefile,v 1.32 2006/01/20 08:39:12 steven Exp $ -NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} +SHARED_ONLY= Yes COMMENT= "multi-purpose sniffer/interceptor/logger" VER= 0.6.b DISTNAME= ettercap-${VER} -PKGNAME= ${DISTNAME}p2 +PKGNAME= ${DISTNAME}p3 CATEGORIES= net HOMEPAGE= http://ettercap.sourceforge.net/ @@ -33,10 +33,12 @@ BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig CONFIGURE_ARGS+= --enable-gtk=no .else LIB_DEPENDS= gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 -WANTLIB+= X11 atk-1.0.0.0 cairo fontconfig \ +WANTLIB+= X11 Xext Xft Xrender atk-1.0.0.0 fontconfig \ freetype glib-2.0.0.0 gmodule-2.0.0.0 \ - gobject-2.0.0.0 iconv intl m pango-1.0.0.0 \ - pangocairo-1.0.0.0 pangoft2-1.0.0.0 + gobject-2.0.0.0 m pango-1.0.0.0 pangox-1.0.0.0 \ + pangoxft-1.0.0.0 pangoft2-1.0.0.0 +MODULES= devel/gettext +USE_X11= Yes .endif NO_REGRESS= Yes diff --git a/net/gajim/Makefile b/net/gajim/Makefile index cba01e5ff65..2e57a37170e 100644 --- a/net/gajim/Makefile +++ b/net/gajim/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2005/11/16 09:10:10 wilfried Exp $ +# $OpenBSD: Makefile,v 1.3 2006/01/20 08:39:12 steven Exp $ SHARED_ONLY= Yes COMMENT= "jabber client written in pygtk" DISTNAME= gajim-0.8.2 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 EXTRACT_SUFX= .tar.bz2 CATEGORIES= net x11 MASTER_SITES= ${HOMEPAGE}downloads/ @@ -18,6 +18,7 @@ PERMIT_PACKAGE_FTP= Yes PYTHON_VER= 2.3 +USE_X11= Yes USE_GMAKE= Yes MODULES= devel/gettext @@ -29,11 +30,11 @@ RUN_DEPENDS= :python-${PYTHON_VER}*:lang/python/${PYTHON_VER} \ :python-expat-${PYTHON_VER}*:lang/python/${PYTHON_VER},-expat \ ::net/py-dns \ ::x11/py-gtk2 -WANTLIB= X11 Xext Xss fontconfig freetype m \ +WANTLIB= X11 Xext Xft Xrender Xss fontconfig freetype m \ aspell atk-1.0.1011.0 gdk-x11-2.0.600.0 gdk_pixbuf-2.0.600.0 \ glib-2.0.600.0 gmodule-2.0.600.0 gobject-2.0.600.0 \ - gtk-x11-2.0.600.0 pango-1.0.800.0 cairo pangocairo-1.0.0.0 \ - pangoft2-1.0.0.0 + gtk-x11-2.0.600.0 pango-1.0.800.0 pangox-1.0.0.0 \ + pangoft2-1.0.0.0 pangoxft-1.0.0.0 MAKE_ENV+= PY_CFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/python${PYTHON_VER}" \ PY_PREFIX=${LOCALBASE} \