fix WANTLIB after gtk+2 downgrade, add USE_X11

This commit is contained in:
steven 2006-01-20 20:47:25 +00:00
parent b2442128e2
commit c25c3c1fbe
2 changed files with 13 additions and 9 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2005/11/15 09:21:52 wilfried Exp $
# $OpenBSD: Makefile,v 1.24 2006/01/20 20:47:25 steven Exp $
COMMENT= "parallelized login hacker"
COMMENT-gui= "GTK frontend for hydra"
@ -6,7 +6,7 @@ COMMENT-gui= "GTK frontend for hydra"
VERSION= 4.6
DISTNAME= hydra-4.6-src
PKGNAME= hydra-${VERSION}p1
PKGNAME-gui= hydra-gui-${VERSION}p1
PKGNAME-gui= hydra-gui-${VERSION}p2
CATEGORIES= security
HOMEPAGE= http://thc.org/thc-hydra/
@ -36,6 +36,8 @@ NO_REGRESS= Yes
ALL_TARGET= hydra pw-inspector
INSTALL_TARGET= install
.else
USE_X11= Yes
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
MULTI_PACKAGES+=-gui
@ -54,8 +56,9 @@ post-configure:
.if defined(PACKAGING) && !empty(SUBPACKAGE)
RUN_DEPENDS= :hydra-${VERSION}*:security/hydra
WANTLIB+= X11 atk-1.0.0.0 cairo freetype fontconfig gmodule-2.0.0.0 \
gobject-2.0.0.0 glib-2.0.0.0 pango-1.0.0.0 pangocairo-1.0.0.0 \
WANTLIB+= X11 Xext Xft Xrender atk-1.0.0.0 freetype fontconfig \
gmodule-2.0.0.0 gobject-2.0.0.0 glib-2.0.0.0 \
pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 \
pangoft2-1.0.0.0
.else
WANTLIB+= ssl crypto

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2005/11/15 18:59:08 wilfried Exp $
# $OpenBSD: Makefile,v 1.7 2006/01/20 20:47:25 steven Exp $
COMMENT= "network security scanner"
DISTNAME= nessus-core-${VERSION}
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
FLAVORS= no_x11
FLAVOR?=
@ -14,10 +14,11 @@ LIB_DEPENDS= nasl.4::security/nessus/libnasl
BUILD_DEPENDS= :bison-*:devel/bison
.if empty(FLAVOR:L:Mno_x11)
USE_X11= Yes
MODULES= devel/gettext
WANTLIB+= X11 atk-1.0.0.0 cairo fontconfig freetype glib-2.0.0.0 \
gmodule-2.0.0.0 gobject-2.0.0.0 pango-1.0.0.0 \
pangocairo-1.0.0.0 pangoft2-1.0.0.0
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 pango-1.0.0.0 \
pangox-1.0.0.0 pangoxft-1.0.0.0 pangoft2-1.0.0.0
BUILD_DEPENDS+= :pkgconfig-*:devel/pkgconfig
LIB_DEPENDS+= gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2
CONFIGURE_ARGS+=--enable-gtk