[pkgsrc/trunk]: pkgsrc/security/hydra Explicitly pull PREFIX/lib into the nor...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8fe0b7eb93c
branches:  trunk
changeset: 572418:a8fe0b7eb93c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Feb 25 17:55:48 2010 +0000

description:
Explicitly pull PREFIX/lib into the normal library search path too.
DESTDIR support

diffstat:

 security/hydra/Makefile   |  10 ++++++----
 security/hydra/options.mk |   4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r ae2dbe1ee4a3 -r a8fe0b7eb93c security/hydra/Makefile
--- a/security/hydra/Makefile   Thu Feb 25 17:29:52 2010 +0000
+++ b/security/hydra/Makefile   Thu Feb 25 17:55:48 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2010/01/17 12:02:40 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/02/25 17:55:48 joerg Exp $
 #
 
 DISTNAME=      ${PKGNAME_NOREV}-src
@@ -12,6 +12,8 @@
 COMMENT=       Login password cracker
 LICENSE=       hydra-license
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 USE_TOOLS+=    pkg-config
@@ -26,7 +28,7 @@
 SUBST_SED.build+=      -e "s|@PREFIX@|${PREFIX}|g"
 SUBST_SED.build+=      -e "s|uname|${UNAME}|g"
 SUBST_SED.build+=      -e "s|\\./hydra|${PREFIX}/bin/hydra|g"
-SUBST_SED.build+=      -e "s|LIBS=-lm|LIBS=-lm ${COMPILER_RPATH_FLAG}${PREFIX}/lib ${COMPILER_RPATH_FLAG}/usr/lib|g"
+SUBST_SED.build+=      -e "s|LIBS=-lm|LIBS=-L${PREFIX}/lib -lm ${COMPILER_RPATH_FLAG}${PREFIX}/lib ${COMPILER_RPATH_FLAG}/usr/lib|g"
 SUBST_MESSAGE.build=   Patching build files.
 
 USE_OLD_DES_API=       YES
@@ -45,7 +47,7 @@
        ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/hydra ${PREFIX}/bin
-       ${INSTALL_PROGRAM} ${WRKSRC}/pw-inspector ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/hydra ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/pw-inspector ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff -r ae2dbe1ee4a3 -r a8fe0b7eb93c security/hydra/options.mk
--- a/security/hydra/options.mk Thu Feb 25 17:29:52 2010 +0000
+++ b/security/hydra/options.mk Thu Feb 25 17:55:48 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2009/08/27 19:40:44 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2010/02/25 17:55:48 joerg Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.hydra
 PKG_SUPPORTED_OPTIONS= gtkfe svn pgsql
@@ -16,7 +16,7 @@
        cd ${WRKSRC}/hydra-gtk && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
 
 post-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/hydra-gtk/src/xhydra ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/hydra-gtk/src/xhydra ${DESTDIR}${PREFIX}/bin
 PLIST_SRC+=    ${PKGDIR}/PLIST.xhydra
 .endif