Fix install rule. Switch to user-destdir. Should retire PR 51545.

PKGREVISION -> 10 because prior packages might have unintended mode 600
data files.

1 files changed, 16 insertions, 23 deletions

diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile
index 4e12e15d6f7..b66e0c84ef7 100644
--- a/databases/geneweb/Makefile
+++ b/databases/geneweb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2016/05/05 11:45:37 jaapb Exp $
+# $NetBSD: Makefile,v 1.44 2016/10/09 21:25:11 dholland Exp $
 #
 
 DISTNAME=	geneweb-5.01
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	databases
 EXTRACT_SUFX=	.tgz
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/geneweb/Src/ \
@@ -15,9 +15,9 @@ COMMENT=	GeneWeb is a genealogy database that runs as a web server
 # A macports packages is at:
 #  http://db.macports.org/port/show/903
 
-PKG_DESTDIR_SUPPORT=	destdir
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pax
 HAS_CONFIGURE=	YES
 
 # ocaml can compile in two modes; if the optimizing compiler
@@ -39,27 +39,22 @@ CONFLICTS+=	coreutils-[0-9]*
 # (not checked in 5.01)
 INSTALL_PROGRAM =  ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 
-# XXX How does this relate to do-install?
-INSTALLATION_DIRS=	bin libexec sbin
+INSTALLATION_DIRS=	bin libexec sbin share/examples/geneweb \
+			share/doc/geneweb share/geneweb/etc \
+			share/geneweb/gwtp_tmp share/geneweb/images \
+			share/geneweb/lang share/geneweb/setup
 
 post-build:
 		cd ${WRKSRC} && ${GMAKE} distrib
 
-# XXX do not use CP
-# XXX better permission fix
 # XXX maybe:
 #   gwc2 update_nldb
 # XXX doc should be in html
 # XXX LICENSE.txt should be installed
 
 do-install:
-		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/geneweb
-		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/geneweb
-		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/etc
-		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp
-		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/images
-		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/lang
-		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/setup
+		${CHMOD} -R go+rX ${WRKSRC}/distribution/gw
+		${CHMOD} 444 ${WRKSRC}/distribution/gw/etc/*
 		cd ${WRKSRC}/distribution/gw && \
 		${INSTALL_PROGRAM} gwd ${DESTDIR}${PREFIX}/libexec && \
 		${INSTALL_PROGRAM} consang ${DESTDIR}${PREFIX}/bin && \
@@ -69,20 +64,18 @@ do-install:
 		${INSTALL_PROGRAM} gwb2ged ${DESTDIR}${PREFIX}/bin && \
 		${INSTALL_PROGRAM} gwsetup ${DESTDIR}${PREFIX}/sbin && \
 		${INSTALL_PROGRAM} gwu ${DESTDIR}${PREFIX}/bin && \
-		${CP} -Rp doc/* ${DESTDIR}${PREFIX}/share/doc/geneweb && \
-		${CHMOD} 444 etc/* && \
-		${CP} -Rp etc ${DESTDIR}${PREFIX}/share/geneweb && \
-		${CP} -Rp gwtp_tmp ${DESTDIR}${PREFIX}/share/geneweb && \
-		${CP} -Rp images ${DESTDIR}${PREFIX}/share/geneweb && \
-		${CP} -Rp lang ${DESTDIR}${PREFIX}/share/geneweb && \
-		${CP} -Rp setup ${DESTDIR}${PREFIX}/share/geneweb && \
+		(cd doc && pax -rw -pp * ${DESTDIR}${PREFIX}/share/doc/geneweb) && \
+		pax -rw -pp etc ${DESTDIR}${PREFIX}/share/geneweb && \
+		pax -rw -pp gwtp_tmp ${DESTDIR}${PREFIX}/share/geneweb && \
+		pax -rw -pp images ${DESTDIR}${PREFIX}/share/geneweb && \
+		pax -rw -pp lang ${DESTDIR}${PREFIX}/share/geneweb && \
+		pax -rw -pp setup ${DESTDIR}${PREFIX}/share/geneweb && \
 		${INSTALL_DATA} a.gwf ${DESTDIR}${PREFIX}/share/examples/geneweb && \
 		${INSTALL_DATA} only.txt ${DESTDIR}${PREFIX}/share/examples/geneweb
 		${TOUCH} ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/passwd
 		${TOUCH} ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log
 		${CHMOD} 600 ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/passwd
 		${CHMOD} 600 ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log
-		${CHOWN} -R root:${ROOT_GROUP} ${DESTDIR}${PREFIX}/share/geneweb
 
 .include "../../lang/camlp5/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"