pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc PKG_DESTDIR_SUPPORT



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd85cf355e62
branches:  trunk
changeset: 568754:bd85cf355e62
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Dec 17 19:58:19 2009 +0000

description:
PKG_DESTDIR_SUPPORT

diffstat:

 audio/mp3asm/Makefile            |   8 +++--
 audio/mpegaudio/Makefile         |   9 ++++--
 audio/mpegaudio/distinfo         |   6 ++--
 audio/mpegaudio/patches/patch-aa |  12 ++++----
 audio/mpegaudio/patches/patch-ab |   6 ++--
 audio/mserv-devel/Makefile       |  13 +++++----
 cad/felt/Makefile                |  19 +++++++------
 cad/felt/distinfo                |  37 ++++++++++++++------------
 cad/felt/patches/patch-aa        |   6 ++--
 cad/felt/patches/patch-ab        |   8 ++--
 cad/felt/patches/patch-ac        |   6 ++--
 cad/felt/patches/patch-ad        |   4 +-
 cad/felt/patches/patch-ae        |   4 +-
 cad/felt/patches/patch-af        |   4 +-
 cad/felt/patches/patch-ag        |   4 +-
 cad/felt/patches/patch-ah        |   4 +-
 cad/felt/patches/patch-ai        |   4 +-
 cad/felt/patches/patch-aj        |   4 +-
 cad/felt/patches/patch-ak        |   4 +-
 cad/felt/patches/patch-al        |   4 +-
 cad/felt/patches/patch-am        |   4 +-
 cad/felt/patches/patch-an        |   4 +-
 cad/felt/patches/patch-ao        |   6 ++--
 cad/felt/patches/patch-ap        |   6 ++--
 cad/felt/patches/patch-aq        |  16 +++++++++++
 cad/felt/patches/patch-ar        |  15 +++++++++++
 cad/felt/patches/patch-as        |  16 +++++++++++
 chat/anope/Makefile              |  30 +++++++++++----------
 chat/anope/distinfo              |   9 +++++-
 chat/anope/patches/patch-aa      |  54 ++++++++++++++++++++++++++++++++++-----
 chat/anope/patches/patch-ab      |  40 +++++++++++++++++++++++++++++
 chat/anope/patches/patch-ac      |  13 +++++++++
 chat/anope/patches/patch-ad      |  13 +++++++++
 chat/anope/patches/patch-ae      |  13 +++++++++
 chat/anope/patches/patch-af      |  20 ++++++++++++++
 chat/sirc/Makefile               |  18 ++++++------
 36 files changed, 322 insertions(+), 121 deletions(-)

diffs (truncated from 815 to 300 lines):

diff -r dcdae59e3760 -r bd85cf355e62 audio/mp3asm/Makefile
--- a/audio/mp3asm/Makefile     Thu Dec 17 19:45:27 2009 +0000
+++ b/audio/mp3asm/Makefile     Thu Dec 17 19:58:19 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:49 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2009/12/17 19:58:36 abs Exp $
 #
 
 DISTNAME=      mp3asm-0.1.3-1
@@ -14,14 +14,16 @@
 WRKSRC=                ${WRKDIR}/mp3asm-0.1
 GNU_CONFIGURE= yes
 
+INSTALLATION_DIRS+= share/doc/mp3asm
+PKG_DESTDIR_SUPPORT=user-destdir
+
 post-patch:
        ${SED} "s/getprogname/_getprogname/g" ${WRKSRC}/src/mp3asm.c            \
                > ${WRKSRC}/src/mp3asm.c.done
        ${MV} ${WRKSRC}/src/mp3asm.c.done ${WRKSRC}/src/mp3asm.c
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mp3asm
-       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mp3asm
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mp3asm
 
 .include "../../devel/sysexits/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r dcdae59e3760 -r bd85cf355e62 audio/mpegaudio/Makefile
--- a/audio/mpegaudio/Makefile  Thu Dec 17 19:45:27 2009 +0000
+++ b/audio/mpegaudio/Makefile  Thu Dec 17 19:58:19 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:47 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2009/12/17 20:00:48 abs Exp $
 
 DISTNAME=      mpegaudio
 PKGNAME=       mpegaudio-3.9
@@ -9,8 +9,11 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       MPEG/audio Layer 1 and Layer 2 encoder/decoder package
 
+PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS+=  bin ${PKGMANDIR}/man1
+
 post-install:
-       ${INSTALL_MAN} ${FILESDIR}/mpeg_musicin.1 ${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_MAN} ${FILESDIR}/mpeg_musicout.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${FILESDIR}/mpeg_musicin.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${FILESDIR}/mpeg_musicout.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff -r dcdae59e3760 -r bd85cf355e62 audio/mpegaudio/distinfo
--- a/audio/mpegaudio/distinfo  Thu Dec 17 19:45:27 2009 +0000
+++ b/audio/mpegaudio/distinfo  Thu Dec 17 19:58:19 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2006/06/09 15:08:08 minskim Exp $
+$NetBSD: distinfo,v 1.4 2009/12/17 20:00:48 abs Exp $
 
 SHA1 (mpegaudio.tar.Z) = 75a801c4aff290b4e0c7cdb2b07991c630955fbf
 RMD160 (mpegaudio.tar.Z) = 3e40fa6629e0bb88046ac882bbfcc263925f7006
 Size (mpegaudio.tar.Z) = 144707 bytes
-SHA1 (patch-aa) = 7b61fd9effe57086d2d2f669fd5b5235a8854e03
-SHA1 (patch-ab) = 67758b144d384aea66509e508e79112a052b8369
+SHA1 (patch-aa) = ce73eab14c962f143997b73e19a00e3d3e585ec7
+SHA1 (patch-ab) = c901c8b0b0af5232ed4759970b320988bcfe1266
 SHA1 (patch-ac) = 389d7973e317362d5927be96ab3222f011410b40
 SHA1 (patch-ad) = f81fb4c7557d9fe96d9164c0df4367389df6b2e4
 SHA1 (patch-ae) = 65bc956b1cc3a97ca3569c3943760d41b63f10e8
diff -r dcdae59e3760 -r bd85cf355e62 audio/mpegaudio/patches/patch-aa
--- a/audio/mpegaudio/patches/patch-aa  Thu Dec 17 19:45:27 2009 +0000
+++ b/audio/mpegaudio/patches/patch-aa  Thu Dec 17 19:58:19 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/12 00:54:04 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2009/12/17 20:00:48 abs Exp $
 
---- Makefile.orig      Wed Jan  5 02:47:50 1994
+--- Makefile.orig      1994-01-05 01:47:50.000000000 +0000
 +++ Makefile
 @@ -1,10 +1,21 @@
  ALL : musicin musicout
@@ -23,8 +23,8 @@
 +      rm -f *.core *.o musicin musicout
 +
 +install:
-+      ${BSD_INSTALL_PROGRAM} musicin ${PREFIX}/bin/mpeg_musicin
-+      ${BSD_INSTALL_PROGRAM} musicout ${PREFIX}/bin/mpeg_musicout
-+      ${BSD_INSTALL_DATA_DIR} ${PREFIX}/lib/mpegaudio/tables
-+      ${BSD_INSTALL_DATA} tables/* ${PREFIX}/lib/mpegaudio/tables/
++      ${BSD_INSTALL_PROGRAM} musicin ${DESTDIR}${PREFIX}/bin/mpeg_musicin
++      ${BSD_INSTALL_PROGRAM} musicout ${DESTDIR}${PREFIX}/bin/mpeg_musicout
++      ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/mpegaudio/tables
++      ${BSD_INSTALL_DATA} tables/* ${DESTDIR}${PREFIX}/lib/mpegaudio/tables/
 +      
diff -r dcdae59e3760 -r bd85cf355e62 audio/mpegaudio/patches/patch-ab
--- a/audio/mpegaudio/patches/patch-ab  Thu Dec 17 19:45:27 2009 +0000
+++ b/audio/mpegaudio/patches/patch-ab  Thu Dec 17 19:58:19 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/12 00:54:04 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2009/12/17 20:00:48 abs Exp $
 
---- common.h.orig      Wed Jan  5 02:42:00 1994
+--- common.h.orig      1994-01-05 01:42:00.000000000 +0000
 +++ common.h
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ common.h
  #endif
  
  #ifdef  UNIX
diff -r dcdae59e3760 -r bd85cf355e62 audio/mserv-devel/Makefile
--- a/audio/mserv-devel/Makefile        Thu Dec 17 19:45:27 2009 +0000
+++ b/audio/mserv-devel/Makefile        Thu Dec 17 19:58:19 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/08/10 11:32:40 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2009/12/17 19:58:19 abs Exp $
 #
 
 DISTNAME=      mserv-0.39a
@@ -19,20 +19,21 @@
                        webclient/margin.cgi webclient/mserv.cgi
 USE_TOOLS+=            perl:run pkg-config
 
+INSTALLATION_DIRS+= share/doc/mserv share/mserv/webclient
+PKG_DESTDIR_SUPPORT= user-destdir
+
 post-configure:
        ${MV} ${WRKSRC}/mserv/soundcard.h ${WRKSRC}/mserv/mservsoundcard.h
 
 post-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/support/mservedit ${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mserv
+       ${INSTALL_SCRIPT} ${WRKSRC}/support/mservedit ${DESTDIR}${PREFIX}/bin
        ${INSTALL_DATA} \
                ${WRKSRC}/INSTALL \
                ${WRKSRC}/LICENSE \
-               ${PREFIX}/share/doc/mserv
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/mserv/webclient
+               ${DESTDIR}${PREFIX}/share/doc/mserv
        ${INSTALL_DATA} \
                ${WRKSRC}/webclient/* \
-               ${PREFIX}/share/mserv/webclient
+               ${DESTDIR}${PREFIX}/share/mserv/webclient
 
 .include "../../audio/libshout/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r dcdae59e3760 -r bd85cf355e62 cad/felt/Makefile
--- a/cad/felt/Makefile Thu Dec 17 19:45:27 2009 +0000
+++ b/cad/felt/Makefile Thu Dec 17 19:58:19 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/05/20 00:58:06 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2009/12/17 20:31:37 abs Exp $
 
 DISTNAME=              felt-3.05.src
 PKGNAME=               felt-3.05
@@ -15,26 +15,27 @@
 
 WRKSRC=                        ${WRKDIR}/FElt-3.05
 USE_X11BASE=           yes
+USE_TOOLS+=            gzcat
 XAW_TYPE?=             3d
 
 MAKE_ENV+=             CCOPTS=${CFLAGS:M*:Q}
 MAKE_ENV+=             LDOPTS=${LDFLAGS:M*:Q}
 MAKE_ENV+=             SH=${SH:Q}
 
-USE_GNU_READLINE=      # uses remove_history() and history_list()
+USE_GNU_READLINE=      YES # uses remove_history() and history_list()
 
-INSTALLATION_DIRS=     lib/X11/app-defaults share/doc/felt share/examples/felt
+INSTALLATION_DIRS+=    lib/X11/app-defaults share/doc/felt share/examples/felt
+INSTALLATION_DIRS+=    share/examples/felt share/doc/felt
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 post-extract:
-       @${GZCAT} ${DISTDIR}/felt-3.05.ps.gz > ${WRKSRC}/felt.ps
+       ${GZCAT} ${DISTDIR}/felt-3.05.ps.gz > ${WRKSRC}/felt.ps
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/felt
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/felt
-       ${INSTALL_DATA} ${WRKSRC}/felt.ps ${PREFIX}/share/doc/felt
+       ${INSTALL_DATA} ${WRKSRC}/felt.ps ${DESTDIR}${PREFIX}/share/doc/felt
        cd ${WRKSRC} && ${INSTALL_DATA} FAQ FAQ.html README README.old  \
-               COPYING CHANGELOG TODO ${PREFIX}/share/doc/felt
-       ${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/felt
+               COPYING CHANGELOG TODO ${DESTDIR}${PREFIX}/share/doc/felt
+       ${INSTALL_DATA} ${WRKSRC}/examples/* ${DESTDIR}${PREFIX}/share/examples/felt
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
diff -r dcdae59e3760 -r bd85cf355e62 cad/felt/distinfo
--- a/cad/felt/distinfo Thu Dec 17 19:45:27 2009 +0000
+++ b/cad/felt/distinfo Thu Dec 17 19:58:19 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2008/08/02 19:59:21 dholland Exp $
+$NetBSD: distinfo,v 1.15 2009/12/17 20:31:37 abs Exp $
 
 SHA1 (felt-3.05.src.tar.gz) = da3e1ced626cc1c65a570d3e6e242252c039c28b
 RMD160 (felt-3.05.src.tar.gz) = 0d2a363a6ef09f3b3a0e2be186c4c051ac1ea19a
@@ -6,19 +6,22 @@
 SHA1 (felt-3.05.ps.gz) = 10fbac9927fe20cec3884d989204fe1a92d61784
 RMD160 (felt-3.05.ps.gz) = b8bd2a4a83a951455403c2f2f17db6db697035a1
 Size (felt-3.05.ps.gz) = 626985 bytes
-SHA1 (patch-aa) = fbf4c14dec40fc1e5aa5009625c6465bc8d763ab
-SHA1 (patch-ab) = 60feea9b0b0af2b71b2a8780227eccbd223b12c5
-SHA1 (patch-ac) = 4bbdbf6c4fd597cbdaa355c5da9d6a46d649b66e
-SHA1 (patch-ad) = b39e8556168d434dc156915e5f33b1eaf5745144
-SHA1 (patch-ae) = 96d50e03a7996ed5a57e4d17846608029552a7ea
-SHA1 (patch-af) = 3be12b2c927219420424bdd8fd67cc12739aba99
-SHA1 (patch-ag) = 4c6f78e5869aab7a1d20c4086fc3cd0dc8edbe2d
-SHA1 (patch-ah) = 97b61774130ed3a0fb4c053776ed1cbd7dc42c38
-SHA1 (patch-ai) = b6c2d940d4ca9fc18439bdda0aa0a436a20787a9
-SHA1 (patch-aj) = 81a1abf01df1818a3779153fb68dcb50ded195f9
-SHA1 (patch-ak) = 58591211dd9a04983613be83b1e479ef9ea833a7
-SHA1 (patch-al) = 1918af0d648ae4f00a720f5402524980588467c8
-SHA1 (patch-am) = cee82a628575135bf8cc45c4737ab679b5cffe72
-SHA1 (patch-an) = 00a2196b96bfe0823ba58bb444576131df398682
-SHA1 (patch-ao) = 749e6edcb0061e39371ef4be668b4523c3e4dd89
-SHA1 (patch-ap) = bef0795860964285c41f7845362f4fef63726191
+SHA1 (patch-aa) = 040259f3b9835409f2d98f0cde12667142da2160
+SHA1 (patch-ab) = 0db67c162ea81b7b7650ae1d62f0e89235067b53
+SHA1 (patch-ac) = 04b93dbb663ca5f04cb78956c3dbb77bc68a7b8f
+SHA1 (patch-ad) = c41c74393782fd65f871097e9fc51aae1dacf643
+SHA1 (patch-ae) = 482fbf439ebc23b41294b7c903f921e6e285cd55
+SHA1 (patch-af) = efe9378b488d1425ea284ec29c838359aa8f6a9b
+SHA1 (patch-ag) = 392eb3d708ab4b2004586d3203ec64a778dce886
+SHA1 (patch-ah) = d48f55d8cc9c3b6d1bc75b56e4f8023e42e6d37e
+SHA1 (patch-ai) = 00d557b31d2b912de9f952a4f76f2742e98dca1a
+SHA1 (patch-aj) = 9104b418485bdd9f56c699ac4be9ed64422d19d2
+SHA1 (patch-ak) = 0ad726e6992a822ffcf32367f06305ac6ea818cc
+SHA1 (patch-al) = 3267802ff6467ffc37cb4de564b005bf1ceb91ac
+SHA1 (patch-am) = de488591d0d7abace294ccb9a9aa6914b2b9fd4d
+SHA1 (patch-an) = 70195df18c833e46d354e9f2a0212e2bf03e68d2
+SHA1 (patch-ao) = 23106adc13a2ea06f94be807a188c8320f4fde8a
+SHA1 (patch-ap) = 69650c94ca86ec069049a4fc58553534f26ea4bf
+SHA1 (patch-aq) = 2265c8e39c1a9bf2cb4f423fabf1dd6128d16210
+SHA1 (patch-ar) = 3915c952bc526d10acd5245b33835c2f76002e93
+SHA1 (patch-as) = 76dd3f51b62eac4d3e2ca6bbf8d579bdad84a3d2
diff -r dcdae59e3760 -r bd85cf355e62 cad/felt/patches/patch-aa
--- a/cad/felt/patches/patch-aa Thu Dec 17 19:45:27 2009 +0000
+++ b/cad/felt/patches/patch-aa Thu Dec 17 19:58:19 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2002/09/21 06:31:43 jlam Exp $
+$NetBSD: patch-aa,v 1.8 2009/12/17 20:31:37 abs Exp $
 
---- etc/Makefile.conf.orig     Sat Mar  4 20:37:06 2000
-+++ etc/Makefile.conf  Tue May 22 12:21:18 2001
+--- etc/Makefile.conf.orig     2000-03-05 01:37:06.000000000 +0000
++++ etc/Makefile.conf
 @@ -1,26 +1,26 @@
 -AR            = ar
 -CC            = gcc
diff -r dcdae59e3760 -r bd85cf355e62 cad/felt/patches/patch-ab
--- a/cad/felt/patches/patch-ab Thu Dec 17 19:45:27 2009 +0000
+++ b/cad/felt/patches/patch-ab Thu Dec 17 19:58:19 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2001/08/23 04:26:52 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2009/12/17 20:31:37 abs Exp $
 
---- src/Velvet/Makefile.orig   Mon Feb 21 17:44:51 2000
+--- src/Velvet/Makefile.orig   2000-02-21 22:44:51.000000000 +0000
 +++ src/Velvet/Makefile
 @@ -18,7 +18,7 @@
  CFLAGS        = $(CCOPTS) -I$(X11INC) -I$(TOPDIR)/include
@@ -11,9 +11,9 @@
  #       /usr/X11R6/lib/libXaw3d.a /usr/X11R6/lib/libXmu.so.6.0 \
  #       /usr/X11R6/lib/libXt.so.6.0 /usr/X11R6/lib/libSM.so.6.0 \
  #       /usr/X11R6/lib/libICE.so.6.0 /usr/X11R6/lib/libXext.so.6.0 \
-@@ -40,4 +40,4 @@
+@@ -40,4 +40,4 @@ include $(TOPDIR)/etc/Makefile.bin
  
  velvet.o:     velvet.ad.h interface.h
  
 -install::;    @$(INSTALL) -m 0644 Velvet.ad $(X11DEF) 2> /dev/null || true
-+install::;    @$(INSTALL) -m 0644 Velvet.ad $(X11DEF)/Velvet 2> /dev/null || true
++install::;    @$(INSTALL) -m 0644 Velvet.ad $(DESTDIR)$(X11DEF)/Velvet 2> /dev/null || true
diff -r dcdae59e3760 -r bd85cf355e62 cad/felt/patches/patch-ac
--- a/cad/felt/patches/patch-ac Thu Dec 17 19:45:27 2009 +0000
+++ b/cad/felt/patches/patch-ac Thu Dec 17 19:58:19 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2004/01/29 11:11:15 agc Exp $
+$NetBSD: patch-ac,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- src/Patchwork/oogl.h       2004/01/29 10:29:34     1.1
-+++ src/Patchwork/oogl.h       2004/01/29 11:08:02
+--- src/Patchwork/oogl.h.orig  2000-02-21 22:44:31.000000000 +0000
++++ src/Patchwork/oogl.h
 @@ -2,370 +2,369 @@
  symbols.h
  **************************************************************************/
diff -r dcdae59e3760 -r bd85cf355e62 cad/felt/patches/patch-ad
--- a/cad/felt/patches/patch-ad Thu Dec 17 19:45:27 2009 +0000
+++ b/cad/felt/patches/patch-ad Thu Dec 17 19:58:19 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2005/04/30 17:26:43 minskim Exp $
+$NetBSD: patch-ad,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- include/allocate.h.orig    Mon Feb 21 16:44:25 2000
+--- include/allocate.h.orig    2000-02-21 22:44:25.000000000 +0000
 +++ include/allocate.h
 @@ -25,7 +25,7 @@



Home | Main Index | Thread Index | Old Index