[pkgsrc/trunk]: pkgsrc Fix DESTDIR.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Fix DESTDIR.
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:59:21 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/024007c163ff
branches:  trunk
changeset: 540790:024007c163ff
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Apr 07 17:14:20 2008 +0000

description:
Fix DESTDIR.

diffstat:

 chat/iip/Makefile             |  5 ++---
 chat/ircu/Makefile            |  6 ++----
 comms/gkermit/Makefile        |  7 +++----
 devel/gflib/Makefile          |  4 +++-
 emulators/gnuboy-sdl/Makefile |  6 +++---
 games/gogui/Makefile          |  7 +++----
 mail/ifile-procmail/Makefile  |  6 +++---
 multimedia/ggrab/Makefile     |  5 +++--
 8 files changed, 22 insertions(+), 24 deletions(-)

diffs (181 lines):

diff -r a695f38a403a -r 024007c163ff chat/iip/Makefile
--- a/chat/iip/Makefile Mon Apr 07 17:13:08 2008 +0000
+++ b/chat/iip/Makefile Mon Apr 07 17:14:20 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/03/03 02:19:51 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/07 17:22:11 joerg Exp $
 #
 
 DISTNAME=              iip-1.1.0
@@ -18,11 +18,10 @@
 MAKE_FLAGS+=           LDFLAGS=${LDFLAGS:M*:Q}
 MAKE_FLAGS+=           CFLAGS=${CFLAGS:M*:Q}\ ${CPPFLAGS:M*:Q}\ -I.
 
-INSTALLATION_DIRS=     bin
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/examples/iip
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/src/isproxy ${DESTDIR}${PREFIX}/bin/
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/iip
        ${INSTALL_DATA} ${WRKSRC}/src/node.ref \
                ${DESTDIR}${PREFIX}/share/examples/iip/
        ${INSTALL_DATA} ${WRKSRC}/doc/isproxy.1 \
diff -r a695f38a403a -r 024007c163ff chat/ircu/Makefile
--- a/chat/ircu/Makefile        Mon Apr 07 17:13:08 2008 +0000
+++ b/chat/ircu/Makefile        Mon Apr 07 17:14:20 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2008/03/24 18:40:18 adrianp Exp $
+# $NetBSD: Makefile,v 1.33 2008/04/07 17:22:48 joerg Exp $
 #
 
 DISTNAME=      ircu2.10.12.12
@@ -59,11 +59,9 @@
 PKG_GECOS.${IRCD_USER}=        IRC server user
 PKG_SHELL.${IRCD_USER}=        ${SH}
 
-INSTALLATION_DIRS=     ${PKGMANDIR}/man8 sbin
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man8 sbin ${DOCDIR} ${EGDIR}
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
        ${INSTALL_PROGRAM} ${WRKSRC}/ircd/ircd ${DESTDIR}${PREFIX}/sbin
        ${INSTALL_PROGRAM} ${WRKSRC}/ircd/umkpasswd ${DESTDIR}${PREFIX}/bin
        ${INSTALL_PROGRAM} ${WRKSRC}/ircd/convert-conf \
diff -r a695f38a403a -r 024007c163ff comms/gkermit/Makefile
--- a/comms/gkermit/Makefile    Mon Apr 07 17:13:08 2008 +0000
+++ b/comms/gkermit/Makefile    Mon Apr 07 17:14:20 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/03/03 05:33:32 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2008/04/07 17:15:48 joerg Exp $
 #
 
 DISTNAME=      gku100
@@ -23,13 +23,12 @@
 
 CFLAGS+=       -DERRNO_H
 
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/doc/gkermit
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/gkermit ${DESTDIR}${PREFIX}/bin/gkermit
        ${INSTALL_MAN} ${WRKSRC}/gkermit.nr \
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gkermit.1
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/gkermit
-       ${INSTALL_DATA} ${DESTDIR}${WRKSRC}/README ${PREFIX}/share/doc/gkermit
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/gkermit
 
 .include "../../mk/bsd.pkg.mk"
diff -r a695f38a403a -r 024007c163ff devel/gflib/Makefile
--- a/devel/gflib/Makefile      Mon Apr 07 17:13:08 2008 +0000
+++ b/devel/gflib/Makefile      Mon Apr 07 17:14:20 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/03/03 17:45:35 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/07 17:14:20 joerg Exp $
 #
 
 DISTNAME=      gflib
@@ -17,6 +17,8 @@
 
 BUILD_TARGET=  w16
 
+INSTALLATION_DIRS=     bin
+
 do-install:
        for f in gf_div gf_mult parity_test rs_decode_file              \
                        rs_encode_file xor; do                          \
diff -r a695f38a403a -r 024007c163ff emulators/gnuboy-sdl/Makefile
--- a/emulators/gnuboy-sdl/Makefile     Mon Apr 07 17:13:08 2008 +0000
+++ b/emulators/gnuboy-sdl/Makefile     Mon Apr 07 17:14:20 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/03/03 19:21:38 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/07 17:17:00 joerg Exp $
 
 DISTNAME=      gnuboy-1.0.3
 PKGNAME=       ${DISTNAME:S/-/-sdl-/}
@@ -15,11 +15,11 @@
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-sdl
 
+INSTALLATION_DIRS=     bin share/doc/gnuboy-sdl share/examples/gnuboy-sdl
+
 .include "../../devel/SDL/buildlink3.mk"
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/gnuboy-sdl
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/gnuboy-sdl
        ${INSTALL_PROGRAM} ${WRKSRC}/sdlgnuboy \
                ${DESTDIR}${PREFIX}/bin/gnuboy-sdl
        ${INSTALL_DATA} ${WRKSRC}/etc/sample.rc \
diff -r a695f38a403a -r 024007c163ff games/gogui/Makefile
--- a/games/gogui/Makefile      Mon Apr 07 17:13:08 2008 +0000
+++ b/games/gogui/Makefile      Mon Apr 07 17:14:20 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/04 11:02:24 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/07 17:18:39 joerg Exp $
 #
 
 DISTNAME=              gogui-0.9.3
@@ -26,8 +26,7 @@
 
 LIBDIR=                        ${PREFIX}/share/gogui/lib
 DOCDIR=                        ${PREFIX}/share/doc/gogui
-MY_MANDIR=             ${PREFIX}/${PKGMANDIR}
-INSTALLATION_DIRS=     bin ${LIBDIR} ${DOCDIR} ${MY_MANDIR}
+INSTALLATION_DIRS=     bin ${LIBDIR} ${DOCDIR} ${PKGMANDIR}/man1
 
 do-build:
 .for p in gmptogtp gogui gtpadapter gtpdisplay gtpdummy gtpregress     \
@@ -42,7 +41,7 @@
        cd ${WRKSRC}/doc/manual/html && ${INSTALL_DATA} *.html *.png \
                ${DESTDIR}${DOCDIR}/.
        cd ${WRKSRC}/doc/manual/man && ${INSTALL_MAN} *.1 \
-               ${DESTDIR}${MY_MANDIR}/man1/.
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a695f38a403a -r 024007c163ff mail/ifile-procmail/Makefile
--- a/mail/ifile-procmail/Makefile      Mon Apr 07 17:13:08 2008 +0000
+++ b/mail/ifile-procmail/Makefile      Mon Apr 07 17:14:20 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/03/04 17:57:18 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/07 17:21:39 joerg Exp $
 #
 
 DISTNAME=      ifile.procmail-0.3
@@ -25,9 +25,9 @@
 
 NO_BUILD=      YES
 
+INSTALLATION_DIRS=     bin share/doc/ifile share/examples/ifile
+
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/ifile
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/ifile
        for f in `${LS} ${WRKSRC}/bin` ; do \
                ${INSTALL_SCRIPT} ${WRKSRC}/bin/$$f ${DESTDIR}${PREFIX}/bin ; \
        done
diff -r a695f38a403a -r 024007c163ff multimedia/ggrab/Makefile
--- a/multimedia/ggrab/Makefile Mon Apr 07 17:13:08 2008 +0000
+++ b/multimedia/ggrab/Makefile Mon Apr 07 17:14:20 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/03/04 19:32:30 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/07 17:14:53 joerg Exp $
 #
 
 DISTNAME=              ${PKGNAME}-linux
@@ -19,10 +19,11 @@
 RCD_SCRIPTS=           sserver
 DOCDIR=                        ${PREFIX}/share/doc/${PKGBASE}
 
+INSTALLATION_DIRS=     bin ${DOCDIR}
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/ggrab ${DESTDIR}${PREFIX}/bin
        ${INSTALL_PROGRAM} ${WRKSRC}/sserver ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}/
 
 .include "../../mk/pthread.buildlink3.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/graphics/inkscape Changes 0.46:
Next by Date: [pkgsrc/trunk]: pkgsrc/math/meschach Fix installation.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/graphics/inkscape Changes 0.46:
Next by Thread: [pkgsrc/trunk]: pkgsrc/math/meschach Fix installation.
Indexes:
Home | Main Index | Thread Index | Old Index