pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 PKG_DESTDIR_SUPPORT
details: https://anonhg.NetBSD.org/pkgsrc/rev/22c01acce525
branches: trunk
changeset: 568738:22c01acce525
user: abs <abs%pkgsrc.org@localhost>
date: Thu Dec 17 17:48:42 2009 +0000
description:
PKG_DESTDIR_SUPPORT
diffstat:
x11/wmfire/Makefile | 15 ++++++++-------
x11/wmfstatus/Makefile | 9 +++++----
x11/wmweather/Makefile | 3 ++-
x11/wmweather/distinfo | 4 ++--
x11/wmweather/patches/patch-aa | 20 ++++++++++++--------
x11/wxWindows-docs/Makefile | 10 ++++++----
6 files changed, 35 insertions(+), 26 deletions(-)
diffs (146 lines):
diff -r 4f7f03016662 -r 22c01acce525 x11/wmfire/Makefile
--- a/x11/wmfire/Makefile Thu Dec 17 17:40:29 2009 +0000
+++ b/x11/wmfire/Makefile Thu Dec 17 17:48:42 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/12/27 13:37:43 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2009/12/17 17:48:42 abs Exp $
#
DISTNAME= wmfire-0.0.3.9pre4
@@ -9,16 +9,17 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Displays generated fire according to system load
+PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
+INSTALLATION_DIRS+= share/doc/wmfire
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmfire
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmfire
- ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/wmfire
- ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/wmfire
- ${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/wmfire
- ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/wmfire
+ ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/wmfire
+ ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DESTDIR}${PREFIX}/share/doc/wmfire
+ ${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/wmfire
+ ${INSTALL_DATA} ${WRKSRC}/CREDITS ${DESTDIR}${PREFIX}/share/doc/wmfire
+ ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${PREFIX}/share/doc/wmfire
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
diff -r 4f7f03016662 -r 22c01acce525 x11/wmfstatus/Makefile
--- a/x11/wmfstatus/Makefile Thu Dec 17 17:40:29 2009 +0000
+++ b/x11/wmfstatus/Makefile Thu Dec 17 17:48:42 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/06/30 00:07:25 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2009/12/17 17:55:22 abs Exp $
DISTNAME= wmfstatus-0.4
PKGREVISION= 1
@@ -14,12 +14,13 @@
WRKSRC= ${WRKDIR}/${DISTNAME}/wmfstatus
INSTALLATION_DIRS= bin
+PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS+= share/doc/wmfstatus
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/wmfstatus ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmfstatus
+ ${INSTALL_PROGRAM} ${WRKSRC}/wmfstatus ${DESTDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README \
- ${WRKDIR}/${DISTNAME}/HINTS ${PREFIX}/share/doc/wmfstatus
+ ${WRKDIR}/${DISTNAME}/HINTS ${DESTDIR}${PREFIX}/share/doc/wmfstatus
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
diff -r 4f7f03016662 -r 22c01acce525 x11/wmweather/Makefile
--- a/x11/wmweather/Makefile Thu Dec 17 17:40:29 2009 +0000
+++ b/x11/wmweather/Makefile Thu Dec 17 17:48:42 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/05/30 02:03:36 zafer Exp $
+# $NetBSD: Makefile,v 1.33 2009/12/17 17:53:31 abs Exp $
#
DISTNAME= wmweather-2.4.2
@@ -14,6 +14,7 @@
GNU_CONFIGURE= yes
USE_TOOLS+= gmake xmessage:run
+PKG_DESTDIR_SUPPORT= user-destdir
CONFIGURE_ARGS+= --with-sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --with-xmessage=${TOOLS_PATH.xmessage}
diff -r 4f7f03016662 -r 22c01acce525 x11/wmweather/distinfo
--- a/x11/wmweather/distinfo Thu Dec 17 17:40:29 2009 +0000
+++ b/x11/wmweather/distinfo Thu Dec 17 17:48:42 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 17:36:21 wiz Exp $
+$NetBSD: distinfo,v 1.8 2009/12/17 17:53:31 abs Exp $
SHA1 (wmweather-2.4.2.tar.gz) = e5ea21644a18c3fc3d1b6f46b8f139164781fedd
RMD160 (wmweather-2.4.2.tar.gz) = 5216a75bcde8a8d459666f12d8feadadccc95fd9
Size (wmweather-2.4.2.tar.gz) = 77417 bytes
-SHA1 (patch-aa) = c0f42c142cd20efb0219417907547d5e2d82d5ea
+SHA1 (patch-aa) = 717f4e066efface19caeca420fd28d3f371700e6
diff -r 4f7f03016662 -r 22c01acce525 x11/wmweather/patches/patch-aa
--- a/x11/wmweather/patches/patch-aa Thu Dec 17 17:40:29 2009 +0000
+++ b/x11/wmweather/patches/patch-aa Thu Dec 17 17:48:42 2009 +0000
@@ -1,9 +1,14 @@
-$NetBSD: patch-aa,v 1.4 2003/11/08 06:21:14 xtraeme Exp $
+$NetBSD: patch-aa,v 1.5 2009/12/17 17:53:31 abs Exp $
---- Makefile.in.orig 2003-11-08 07:07:47.000000000 +0100
-+++ Makefile.in 2003-11-08 07:11:54.000000000 +0100
-@@ -29,9 +29,10 @@
- ${INSTALL} -d ${DESTDIR}${bindir} ${DESTDIR}${mandir}/man1 ${DESTDIR}${sysconfdir}
+--- Makefile.in.orig 2003-08-01 12:46:16.000000000 +0000
++++ Makefile.in
+@@ -2,5 +2,4 @@
+ # @configure_input@
+
+-DESTDIR =
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+@@ -30,7 +29,8 @@ install: wmweather wmweather.1
${INSTALL_PROGRAM} wmweather ${DESTDIR}${bindir}
${INSTALL_DATA} wmweather.1 ${DESTDIR}${mandir}/man1
- ${LN_S} wmweather ${DESTDIR}${bindir}/wmWeather
@@ -11,8 +16,7 @@
- test -e ${DESTDIR}${sysconfdir}/${sysconffile} || ${INSTALL_DATA} wmweather.conf ${DESTDIR}${sysconfdir}/${sysconffile}
+ ${LN_S} -f wmweather ${DESTDIR}${bindir}/wmWeather
+ ${LN_S} -f wmweather.1 ${DESTDIR}${mandir}/man1/wmWeather.1
-+ ${BSD_INSTALL_DATA_DIR} ${prefix}/share/examples/wmweather
-+ ${BSD_INSTALL_DATA} wmweather.conf ${prefix}/share/examples/wmweather/
++ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${prefix}/share/examples/wmweather
++ ${BSD_INSTALL_DATA} wmweather.conf ${DESTDIR}${prefix}/share/examples/wmweather/
uninstall:
- ${RM} ${DESTDIR}${bindir}/wmweather ${DESTDIR}${bindir}/wmWeather
diff -r 4f7f03016662 -r 22c01acce525 x11/wxWindows-docs/Makefile
--- a/x11/wxWindows-docs/Makefile Thu Dec 17 17:40:29 2009 +0000
+++ b/x11/wxWindows-docs/Makefile Thu Dec 17 17:48:42 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/04/12 21:54:35 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2009/12/17 17:58:16 abs Exp $
DISTNAME= wxHTML22
PKGNAME= wxWindows-docs-2.2
@@ -17,9 +17,11 @@
HTMLDIR= ${PREFIX}/share/doc/wx
+PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS+= share/doc/wx
+
do-install:
- ${INSTALL_DATA_DIR} ${HTMLDIR}
- ${INSTALL_DATA} ${WRKSRC}/* ${HTMLDIR}
- ${LN} -sf wxwin.htm ${HTMLDIR}/index.html
+ ${INSTALL_DATA} ${WRKSRC}/* ${DESTDIR}${HTMLDIR}
+ ${LN} -sf wxwin.htm ${DESTDIR}${HTMLDIR}/index.html
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index