Sun Oct 9 21:25:11 2016 UTC ()
Fix install rule. Switch to user-destdir. Should retire PR 51545.
PKGREVISION -> 10 because prior packages might have unintended mode 600
data files.


(dholland)
diff -r1.43 -r1.44 pkgsrc/databases/geneweb/Makefile
cvs diff -r1.43 -r1.44 pkgsrc/databases/geneweb/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/geneweb/Makefile 2016/05/05 11:45:37 1.43
+++ pkgsrc/databases/geneweb/Makefile 2016/10/09 21:25:11 1.44
@@ -1,89 +1,82 @@ @@ -1,89 +1,82 @@
1# $NetBSD: Makefile,v 1.43 2016/05/05 11:45:37 jaapb Exp $ 1# $NetBSD: Makefile,v 1.44 2016/10/09 21:25:11 dholland Exp $
2# 2#
3 3
4DISTNAME= geneweb-5.01 4DISTNAME= geneweb-5.01
5PKGREVISION= 9 5PKGREVISION= 10
6CATEGORIES= databases 6CATEGORIES= databases
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/cristal/geneweb/Src/ \ 8MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/cristal/geneweb/Src/ \
9 http://www.sartorelli.gen.nz/GeneWeb/Src/ 9 http://www.sartorelli.gen.nz/GeneWeb/Src/
10 10
11MAINTAINER= gdt@NetBSD.org 11MAINTAINER= gdt@NetBSD.org
12HOMEPAGE= http://www.geneweb.org/ 12HOMEPAGE= http://www.geneweb.org/
13COMMENT= GeneWeb is a genealogy database that runs as a web server 13COMMENT= GeneWeb is a genealogy database that runs as a web server
14 14
15# A macports packages is at: 15# A macports packages is at:
16# http://db.macports.org/port/show/903 16# http://db.macports.org/port/show/903
17 17
18PKG_DESTDIR_SUPPORT= destdir 18PKG_DESTDIR_SUPPORT= user-destdir
19 19
20USE_TOOLS+= gmake 20USE_TOOLS+= gmake pax
21HAS_CONFIGURE= YES 21HAS_CONFIGURE= YES
22 22
23# ocaml can compile in two modes; if the optimizing compiler 23# ocaml can compile in two modes; if the optimizing compiler
24# is not present (limited support across architectures), ask 24# is not present (limited support across architectures), ask
25# the geneweb build system to build non-optimized versions. 25# the geneweb build system to build non-optimized versions.
26.if !exists(${LOCALBASE}/bin/ocamlc.opt) 26.if !exists(${LOCALBASE}/bin/ocamlc.opt)
27BUILD_TARGET= out 27BUILD_TARGET= out
28.endif 28.endif
29 29
30RCD_SCRIPTS= geneweb 30RCD_SCRIPTS= geneweb
31 31
32.include "../../mk/bsd.prefs.mk" 32.include "../../mk/bsd.prefs.mk"
33 33
34# sysutils/coreutils installs a 'gwc' program, so conflict with it 34# sysutils/coreutils installs a 'gwc' program, so conflict with it
35CONFLICTS+= coreutils-[0-9]* 35CONFLICTS+= coreutils-[0-9]*
36 36
37# Stripped OCAML binaries don't seem to work any more. 37# Stripped OCAML binaries don't seem to work any more.
38# Installing unstripped binaries until this is fixed. 38# Installing unstripped binaries until this is fixed.
39# (not checked in 5.01) 39# (not checked in 5.01)
40INSTALL_PROGRAM = ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} 40INSTALL_PROGRAM = ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
41 41
42# XXX How does this relate to do-install? 42INSTALLATION_DIRS= bin libexec sbin share/examples/geneweb \
43INSTALLATION_DIRS= bin libexec sbin 43 share/doc/geneweb share/geneweb/etc \
 44 share/geneweb/gwtp_tmp share/geneweb/images \
 45 share/geneweb/lang share/geneweb/setup
44 46
45post-build: 47post-build:
46 cd ${WRKSRC} && ${GMAKE} distrib 48 cd ${WRKSRC} && ${GMAKE} distrib
47 49
48# XXX do not use CP 
49# XXX better permission fix 
50# XXX maybe: 50# XXX maybe:
51# gwc2 update_nldb 51# gwc2 update_nldb
52# XXX doc should be in html 52# XXX doc should be in html
53# XXX LICENSE.txt should be installed 53# XXX LICENSE.txt should be installed
54 54
55do-install: 55do-install:
56 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/geneweb 56 ${CHMOD} -R go+rX ${WRKSRC}/distribution/gw
57 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/geneweb 57 ${CHMOD} 444 ${WRKSRC}/distribution/gw/etc/*
58 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/etc 
59 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp 
60 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/images 
61 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/lang 
62 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/geneweb/setup 
63 cd ${WRKSRC}/distribution/gw && \ 58 cd ${WRKSRC}/distribution/gw && \
64 ${INSTALL_PROGRAM} gwd ${DESTDIR}${PREFIX}/libexec && \ 59 ${INSTALL_PROGRAM} gwd ${DESTDIR}${PREFIX}/libexec && \
65 ${INSTALL_PROGRAM} consang ${DESTDIR}${PREFIX}/bin && \ 60 ${INSTALL_PROGRAM} consang ${DESTDIR}${PREFIX}/bin && \
66 ${INSTALL_PROGRAM} gwc ${DESTDIR}${PREFIX}/bin && \ 61 ${INSTALL_PROGRAM} gwc ${DESTDIR}${PREFIX}/bin && \
67 ${INSTALL_PROGRAM} gwtp_tmp/gwtp ${DESTDIR}${PREFIX}/bin && \ 62 ${INSTALL_PROGRAM} gwtp_tmp/gwtp ${DESTDIR}${PREFIX}/bin && \
68 ${INSTALL_PROGRAM} ged2gwb ${DESTDIR}${PREFIX}/bin && \ 63 ${INSTALL_PROGRAM} ged2gwb ${DESTDIR}${PREFIX}/bin && \
69 ${INSTALL_PROGRAM} gwb2ged ${DESTDIR}${PREFIX}/bin && \ 64 ${INSTALL_PROGRAM} gwb2ged ${DESTDIR}${PREFIX}/bin && \
70 ${INSTALL_PROGRAM} gwsetup ${DESTDIR}${PREFIX}/sbin && \ 65 ${INSTALL_PROGRAM} gwsetup ${DESTDIR}${PREFIX}/sbin && \
71 ${INSTALL_PROGRAM} gwu ${DESTDIR}${PREFIX}/bin && \ 66 ${INSTALL_PROGRAM} gwu ${DESTDIR}${PREFIX}/bin && \
72 ${CP} -Rp doc/* ${DESTDIR}${PREFIX}/share/doc/geneweb && \ 67 (cd doc && pax -rw -pp * ${DESTDIR}${PREFIX}/share/doc/geneweb) && \
73 ${CHMOD} 444 etc/* && \ 68 pax -rw -pp etc ${DESTDIR}${PREFIX}/share/geneweb && \
74 ${CP} -Rp etc ${DESTDIR}${PREFIX}/share/geneweb && \ 69 pax -rw -pp gwtp_tmp ${DESTDIR}${PREFIX}/share/geneweb && \
75 ${CP} -Rp gwtp_tmp ${DESTDIR}${PREFIX}/share/geneweb && \ 70 pax -rw -pp images ${DESTDIR}${PREFIX}/share/geneweb && \
76 ${CP} -Rp images ${DESTDIR}${PREFIX}/share/geneweb && \ 71 pax -rw -pp lang ${DESTDIR}${PREFIX}/share/geneweb && \
77 ${CP} -Rp lang ${DESTDIR}${PREFIX}/share/geneweb && \ 72 pax -rw -pp setup ${DESTDIR}${PREFIX}/share/geneweb && \
78 ${CP} -Rp setup ${DESTDIR}${PREFIX}/share/geneweb && \ 
79 ${INSTALL_DATA} a.gwf ${DESTDIR}${PREFIX}/share/examples/geneweb && \ 73 ${INSTALL_DATA} a.gwf ${DESTDIR}${PREFIX}/share/examples/geneweb && \
80 ${INSTALL_DATA} only.txt ${DESTDIR}${PREFIX}/share/examples/geneweb 74 ${INSTALL_DATA} only.txt ${DESTDIR}${PREFIX}/share/examples/geneweb
81 ${TOUCH} ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/passwd 75 ${TOUCH} ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/passwd
82 ${TOUCH} ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log 76 ${TOUCH} ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log
83 ${CHMOD} 600 ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/passwd 77 ${CHMOD} 600 ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/passwd
84 ${CHMOD} 600 ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log 78 ${CHMOD} 600 ${DESTDIR}${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log
85 ${CHOWN} -R root:${ROOT_GROUP} ${DESTDIR}${PREFIX}/share/geneweb 
86 79
87.include "../../lang/camlp5/buildlink3.mk" 80.include "../../lang/camlp5/buildlink3.mk"
88.include "../../lang/ocaml/buildlink3.mk" 81.include "../../lang/ocaml/buildlink3.mk"
89.include "../../mk/bsd.pkg.mk" 82.include "../../mk/bsd.pkg.mk"