Hydra does not depend on arp0. And subversion-base pulls in the correct version of APR by itself.diff -r1.18 -r1.19 pkgsrc/security/hydra/Makefile
(bad)
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.18 2008/09/06 20:54:34 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.19 2008/10/30 14:49:41 bad Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= ${PKGNAME_NOREV}-src | 4 | DISTNAME= ${PKGNAME_NOREV}-src | |
5 | PKGNAME= hydra-5.4 | 5 | PKGNAME= hydra-5.4 | |
6 | PKGREVISION= 1 | 6 | PKGREVISION= 1 | |
7 | CATEGORIES= security | 7 | CATEGORIES= security | |
8 | MASTER_SITES= http://freeworld.thc.org/releases/ | 8 | MASTER_SITES= http://freeworld.thc.org/releases/ | |
9 | 9 | |||
10 | MAINTAINER= adrianp@NetBSD.org | 10 | MAINTAINER= adrianp@NetBSD.org | |
11 | HOMEPAGE= http://freeworld.thc.org/thc-hydra/ | 11 | HOMEPAGE= http://freeworld.thc.org/thc-hydra/ | |
12 | COMMENT= Login password cracker | 12 | COMMENT= Login password cracker | |
13 | 13 | |||
14 | .include "../../mk/bsd.prefs.mk" | 14 | .include "../../mk/bsd.prefs.mk" | |
@@ -31,23 +31,22 @@ SUBST_SED.build+= -e "s|LIBS=-lm|LIBS=-l | @@ -31,23 +31,22 @@ SUBST_SED.build+= -e "s|LIBS=-lm|LIBS=-l | |||
31 | SUBST_MESSAGE.build= Patching build files. | 31 | SUBST_MESSAGE.build= Patching build files. | |
32 | 32 | |||
33 | USE_OLD_DES_API= YES | 33 | USE_OLD_DES_API= YES | |
34 | PLIST_SRC= ${WRKDIR}/.PLIST_SRC | 34 | PLIST_SRC= ${WRKDIR}/.PLIST_SRC | |
35 | CONFIGURE_ARGS+= --prefix=${PREFIX:Q} | 35 | CONFIGURE_ARGS+= --prefix=${PREFIX:Q} | |
36 | BUILDLINK_API_DEPENDS.libssh+= libssh-0.11{,nb*} | 36 | BUILDLINK_API_DEPENDS.libssh+= libssh-0.11{,nb*} | |
37 | 37 | |||
38 | INSTALLATION_DIRS= bin | 38 | INSTALLATION_DIRS= bin | |
39 | 39 | |||
40 | .include "options.mk" | 40 | .include "options.mk" | |
41 | 41 | |||
42 | .include "../../security/openssl/buildlink3.mk" | 42 | .include "../../security/openssl/buildlink3.mk" | |
43 | .include "../../security/libssh/buildlink3.mk" | 43 | .include "../../security/libssh/buildlink3.mk" | |
44 | .include "../../devel/apr0/buildlink3.mk" | |||
45 | 44 | |||
46 | pre-build: | 45 | pre-build: | |
47 | ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC | 46 | ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC | |
48 | 47 | |||
49 | do-install: | 48 | do-install: | |
50 | ${INSTALL_PROGRAM} ${WRKSRC}/hydra ${PREFIX}/bin | 49 | ${INSTALL_PROGRAM} ${WRKSRC}/hydra ${PREFIX}/bin | |
51 | ${INSTALL_PROGRAM} ${WRKSRC}/pw-inspector ${PREFIX}/bin | 50 | ${INSTALL_PROGRAM} ${WRKSRC}/pw-inspector ${PREFIX}/bin | |
52 | 51 | |||
53 | .include "../../mk/bsd.pkg.mk" | 52 | .include "../../mk/bsd.pkg.mk" |
@@ -1,36 +1,35 @@ | @@ -1,36 +1,35 @@ | |||
1 | # $NetBSD: options.mk,v 1.3 2008/08/31 10:54:52 adrianp Exp $ | 1 | # $NetBSD: options.mk,v 1.4 2008/10/30 14:49:42 bad Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.hydra | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.hydra | |
4 | PKG_SUPPORTED_OPTIONS= gtkfe svn pgsql | 4 | PKG_SUPPORTED_OPTIONS= gtkfe svn pgsql | |
5 | 5 | |||
6 | .include "../../mk/bsd.options.mk" | 6 | .include "../../mk/bsd.options.mk" | |
7 | 7 | |||
8 | .if !empty(PKG_OPTIONS:Mgtkfe) | 8 | .if !empty(PKG_OPTIONS:Mgtkfe) | |
9 | .include "../../x11/gtk2/buildlink3.mk" | 9 | .include "../../x11/gtk2/buildlink3.mk" | |
10 | 10 | |||
11 | post-configure: | 11 | post-configure: | |
12 | cd ${WRKSRC}/hydra-gtk && \ | 12 | cd ${WRKSRC}/hydra-gtk && \ | |
13 | ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} | 13 | ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} | |
14 | 14 | |||
15 | post-build: | 15 | post-build: | |
16 | cd ${WRKSRC}/hydra-gtk && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} | 16 | cd ${WRKSRC}/hydra-gtk && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} | |
17 | 17 | |||
18 | post-install: | 18 | post-install: | |
19 | ${INSTALL_PROGRAM} ${WRKSRC}/hydra-gtk/src/xhydra ${PREFIX}/bin | 19 | ${INSTALL_PROGRAM} ${WRKSRC}/hydra-gtk/src/xhydra ${PREFIX}/bin | |
20 | PLIST_SRC+= ${PKGDIR}/PLIST.xhydra | 20 | PLIST_SRC+= ${PKGDIR}/PLIST.xhydra | |
21 | .endif | 21 | .endif | |
22 | 22 | |||
23 | .if !empty(PKG_OPTIONS:Msvn) | 23 | .if !empty(PKG_OPTIONS:Msvn) | |
24 | .include "../../devel/subversion-base/buildlink3.mk" | 24 | .include "../../devel/subversion-base/buildlink3.mk" | |
25 | .include "../../devel/apr0/buildlink3.mk" | |||
26 | CONFIGURE_ENV+= WITH_SVN=1 | 25 | CONFIGURE_ENV+= WITH_SVN=1 | |
27 | .else | 26 | .else | |
28 | CONFIGURE_ENV+= WITH_SVN=0 | 27 | CONFIGURE_ENV+= WITH_SVN=0 | |
29 | .endif | 28 | .endif | |
30 | 29 | |||
31 | .if !empty(PKG_OPTIONS:Mpgsql) | 30 | .if !empty(PKG_OPTIONS:Mpgsql) | |
32 | .include "../../databases/postgresql81-client/buildlink3.mk" | 31 | .include "../../databases/postgresql81-client/buildlink3.mk" | |
33 | CONFIGURE_ENV+= WITH_PGSQL=1 | 32 | CONFIGURE_ENV+= WITH_PGSQL=1 | |
34 | .else | 33 | .else | |
35 | CONFIGURE_ENV+= WITH_PGSQL=0 | 34 | CONFIGURE_ENV+= WITH_PGSQL=0 | |
36 | .endif | 35 | .endif |