Use custom install rules to get user-destdir ready and most likely

also fix unprivileged builds in general.

3 files changed, 40 insertions, 7 deletions

diff --git a/security/apg/Makefile b/security/apg/Makefile
index e4daf95da46..8252ce89069 100644
--- a/security/apg/Makefile
+++ b/security/apg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/10/09 12:52:36 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/11/03 09:07:30 joerg Exp $
 #
 
 DISTNAME=	apg-2.2.3
@@ -9,7 +9,7 @@ MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://www.adel.nursat.kz/apg/
 COMMENT=	Tool set for random password generation
 
-PKG_DESTDIR_SUPPORT=	destdir
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_ENV+=	FLAGS=${CFLAGS:M*:Q} INSTALL_PREFIX=${DESTDIR:Q}${PREFIX:Q}
 
@@ -21,6 +21,8 @@ CS_LIBS.Linux+=	-lnsl
 CS_LIBS.SunOS+=	-lnsl -lsocket
 MAKE_ENV+=	CS_LIBS=${CS_LIBS:Q}
 
+INSTALLATION_DIRS+=	bin sbin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
+
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/perl/apgcli.pl ${DESTDIR}${PREFIX}/bin/apgcli
 
diff --git a/security/apg/distinfo b/security/apg/distinfo
index 94cb725086a..e5d67c19d35 100644
--- a/security/apg/distinfo
+++ b/security/apg/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/05/27 10:32:01 zuntum Exp $
+$NetBSD: distinfo,v 1.6 2006/11/03 09:07:30 joerg Exp $
 
 SHA1 (apg-2.2.3.tar.gz) = 7bdbc931ef8477717186dc3ab3a2d3c25012b4ca
 RMD160 (apg-2.2.3.tar.gz) = ccc1d8a90fcac90717a9ee16fcc85de53d5ef90d
 Size (apg-2.2.3.tar.gz) = 108186 bytes
-SHA1 (patch-aa) = d66d56ff653e66185a1af83d7b5330c1759e7573
+SHA1 (patch-aa) = 51679c0a3a6440ddcca12b4c5d6ebaa7c18a5935
diff --git a/security/apg/patches/patch-aa b/security/apg/patches/patch-aa
index 8b46741710f..9ac3603f3b9 100644
--- a/security/apg/patches/patch-aa
+++ b/security/apg/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2003/06/10 06:38:48 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2006/11/03 09:07:30 joerg Exp $
 
---- Makefile.orig	2002-09-13 10:10:49.000000000 +0200
+--- Makefile.orig	2003-08-07 15:40:30.000000000 +0000
 +++ Makefile
 @@ -1,12 +1,10 @@
  ##################################################################
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.2 2003/06/10 06:38:48 wiz Exp $
  
  ##################################################################
  # Libraries
-@@ -37,7 +35,6 @@ USE_SHA = APG_DONOTUSE_SHA
+@@ -39,7 +37,6 @@ USE_SHA = APG_DONOTUSE_SHA
  ##################################################################
  # Directories
  # Install dirs
@@ -23,3 +23,34 @@ $NetBSD: patch-aa,v 1.2 2003/06/10 06:38:48 wiz Exp $
  APG_BIN_DIR = /bin
  APG_MAN_DIR = /man/man1
  APGD_BIN_DIR = /sbin
+@@ -110,24 +107,12 @@ strip:
+ 	strip ${BFM_PROGNAME}
+ 
+ install:
+-	if test -x ./apg; then \
+-./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+-./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+-./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+-./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+-fi
+-	if test -x ./apgd; then \
+-./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
+-./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
+-./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
+-./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
+-fi
+-	if test -x ./apgbfm; then \
+-./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+-./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+-./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \
+-./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+-fi
++	${BSD_INSTALL_PROGRAM} apg ${DESTDIR}${PREFIX}/bin
++	${BSD_INSTALL_MAN} doc/man/apg.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
++	${BSD_INSTALL_PROGRAM} apgd ${DESTDIR}${PREFIX}/sbin
++	${BSD_INSTALL_MAN} doc/man/apgd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
++	${BSD_INSTALL_PROGRAM} apgbfm ${DESTDIR}${PREFIX}/bin
++	${BSD_INSTALL_MAN} doc/man/apgbfm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+ 
+ install-cygwin:
+ 	if test -x ./apg.exe; then \