From c6e748f9cd81a3e5e3c80735f8d693acbc3fdedf Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Thu, 25 Feb 2010 17:55:48 +0000
Subject: Explicitly pull PREFIX/lib into the normal library search path too.
 DESTDIR support

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

(limited to 'security')

diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index 8a40381cb6e..f6990a313b6 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -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 @@ HOMEPAGE=	http://freeworld.thc.org/thc-hydra/
 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|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g"
 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 @@ pre-build:
 	${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 --git a/security/hydra/options.mk b/security/hydra/options.mk
index 19a40c9036f..b19d7d6270b 100644
--- a/security/hydra/options.mk
+++ b/security/hydra/options.mk
@@ -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 @@ post-build:
 	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
 
-- 
cgit v1.2.3