pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc user-destdir support
details: https://anonhg.NetBSD.org/pkgsrc/rev/b320bdd2e499
branches: trunk
changeset: 395302:b320bdd2e499
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Jul 07 20:25:27 2009 +0000
description:
user-destdir support
diffstat:
textproc/unroff/Makefile | 22 ++++++++++------------
textproc/untex/Makefile | 8 +++++---
textproc/writer2latex/Makefile | 11 ++++++-----
textproc/xalan-j/Makefile | 14 +++++++-------
textproc/xerces-j/Makefile | 17 +++++++++--------
textproc/xhtml/Makefile | 11 +++++++----
textproc/xmlindent/Makefile | 7 ++++---
textproc/xmlstarlet/Makefile | 8 +++++---
textproc/xslide/Makefile | 13 +++++++------
time/dclock/Makefile | 6 +++++-
time/dclock/distinfo | 4 ++--
time/dclock/patches/patch-aa | 6 +++---
time/emiclock/Makefile | 9 ++++++---
time/emiclock/distinfo | 4 ++--
time/emiclock/patches/patch-ad | 21 +++++++++++++++------
15 files changed, 93 insertions(+), 68 deletions(-)
diffs (truncated from 453 to 300 lines):
diff -r d7db560c2d46 -r b320bdd2e499 textproc/unroff/Makefile
--- a/textproc/unroff/Makefile Tue Jul 07 20:24:51 2009 +0000
+++ b/textproc/unroff/Makefile Tue Jul 07 20:25:27 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/05/26 02:13:24 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2009/07/07 20:34:11 joerg Exp $
DISTNAME= unroff-1.0
PKGNAME= unroff-1.0.2
@@ -13,6 +13,8 @@
HOMEPAGE= http://www-rn.informatik.uni-bremen.de/software/unroff/
COMMENT= Programmable troff translator with backend for HTML
+PKG_DESTDIR_SUPPORT= user-destdir
+
DIST_SUBDIR= unroff
USE_TOOLS+= pax
@@ -26,18 +28,14 @@
LIBDIR= ${PREFIX}/share/unroff
+INSTALLATION_DIRS= bin ${LIBDIR}/doc ${LIBDIR}/misc ${PKGMANDIR}/man1
+
do-install:
- ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${LIBDIR}
- ${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1
- cd ${WRKSRC} && ${INSTALL_PROGRAM} src/unroff ${PREFIX}/bin/unroff
- cd ${WRKSRC} && pax -wr scm ${LIBDIR}
- ${INSTALL_DATA_DIR} ${LIBDIR}/doc
- cd ${WRKSRC} && ${INSTALL_DATA} doc/manual.ms ${LIBDIR}/doc
- ${INSTALL_DATA_DIR} ${LIBDIR}/misc
- cd ${WRKSRC} && ${INSTALL_DATA} doc/tmac.hyper misc/sample.unroff ${LIBDIR}/misc
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${LIBDIR}
- cd ${WRKSRC} && ${INSTALL_MAN} doc/*.1 ${PREFIX}/${PKGMANDIR}/man1
+ cd ${WRKSRC} && ${INSTALL_PROGRAM} src/unroff ${DESTDIR}${PREFIX}/bin/unroff
+ cd ${WRKSRC} && pax -wr scm ${DESTDIR}${LIBDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} doc/manual.ms ${DESTDIR}${LIBDIR}/doc
+ cd ${WRKSRC} && ${INSTALL_DATA} doc/tmac.hyper misc/sample.unroff ${DESTDIR}${LIBDIR}/misc
+ cd ${WRKSRC} && ${INSTALL_MAN} doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.include "../../lang/elk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d7db560c2d46 -r b320bdd2e499 textproc/untex/Makefile
--- a/textproc/untex/Makefile Tue Jul 07 20:24:51 2009 +0000
+++ b/textproc/untex/Makefile Tue Jul 07 20:25:27 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:14 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/07 20:31:58 joerg Exp $
#
DISTNAME= untex-1.3
@@ -8,12 +8,14 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Remove LaTeX commands
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
do-install:
- ${INSTALL_PROGRAM} ${WRKDIR}/untex ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKDIR}/untex.man ${PREFIX}/${PKGMANDIR}/man1/untex.1
+ ${INSTALL_PROGRAM} ${WRKDIR}/untex ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKDIR}/untex.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/untex.1
.include "../../mk/bsd.pkg.mk"
diff -r d7db560c2d46 -r b320bdd2e499 textproc/writer2latex/Makefile
--- a/textproc/writer2latex/Makefile Tue Jul 07 20:24:51 2009 +0000
+++ b/textproc/writer2latex/Makefile Tue Jul 07 20:25:27 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:30:52 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/07 20:31:33 joerg Exp $
#
DISTNAME= ${W2L}beta2
@@ -12,6 +12,8 @@
HOMEPAGE= http://www.hj-gym.dk/~hj/writer2latex/
COMMENT= Convert OpenOffice.org/StarOffice documents to LaTeX and other formats
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}/${W2L}
USE_JAVA2= yes
USE_JAVA= run
@@ -19,7 +21,7 @@
W2L= writer2latex04
W2LPATH= ${PREFIX}/share/${W2L}
-INSTALLATION_DIRS= bin
+INSTALLATION_DIRS= bin ${W2LPATH}
do-configure:
.for scr in w2l
@@ -34,9 +36,8 @@
${RM} -rf ${WRKSRC}/source
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/w2l ${PREFIX}/bin/w2l
- ${INSTALL_DATA_DIR} ${W2LPATH}
- ${CP} -R ${WRKSRC}/* ${W2LPATH}
+ ${INSTALL_SCRIPT} ${WRKSRC}/w2l ${DESTDIR}${PREFIX}/bin/w2l
+ ${CP} -R ${WRKSRC}/* ${DESTDIR}${W2LPATH}
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d7db560c2d46 -r b320bdd2e499 textproc/xalan-j/Makefile
--- a/textproc/xalan-j/Makefile Tue Jul 07 20:24:51 2009 +0000
+++ b/textproc/xalan-j/Makefile Tue Jul 07 20:25:27 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/05/26 02:13:24 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2009/07/07 20:30:31 joerg Exp $
#
# Note: we currently use the pre-built (-bin) distribution of Xalan-J,
# because although Xalan runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -21,13 +21,13 @@
NO_CONFIGURE= yes
NO_BUILD= yes
+INSTALLATION_DIRS= lib/java share/doc/java/xalan share/examples/java/xalan
+
do-install:
- ${INSTALL_DATA} ${WRKSRC}/xalan.jar ${PREFIX}/lib/java
- ${INSTALL_DATA} ${WRKSRC}/bsf.jar ${PREFIX}/lib/java
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xalan
- cd ${WRKSRC}/docs && pax -rw -pp . ${PREFIX}/share/doc/java/xalan
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/xalan
- cd ${WRKSRC}/samples && pax -rw -pp . ${PREFIX}/share/examples/java/xalan
+ ${INSTALL_DATA} ${WRKSRC}/xalan.jar ${DESTDIR}${PREFIX}/lib/java
+ ${INSTALL_DATA} ${WRKSRC}/bsf.jar ${DESTDIR}${PREFIX}/lib/java
+ cd ${WRKSRC}/docs && pax -rw -pp . ${DESTDIR}${PREFIX}/share/doc/java/xalan
+ cd ${WRKSRC}/samples && pax -rw -pp . ${DESTDIR}${PREFIX}/share/examples/java/xalan
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d7db560c2d46 -r b320bdd2e499 textproc/xerces-j/Makefile
--- a/textproc/xerces-j/Makefile Tue Jul 07 20:24:51 2009 +0000
+++ b/textproc/xerces-j/Makefile Tue Jul 07 20:25:27 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/05/26 02:13:24 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2009/07/07 20:29:41 joerg Exp $
#
# Note: we currently use the pre-built (-bin) distribution of Xerces-J,
# because although Xerces runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -14,6 +14,8 @@
HOMEPAGE= http://xerces.apache.org/xerces-j/
COMMENT= The Apache Project's validating XML parser with DOM and SAX support
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}/xerces-1_2_0
USE_JAVA= run
USE_TOOLS+= pax
@@ -23,14 +25,13 @@
post-extract:
chmod -R u+w,go-w ${WRKSRC}
+INSTALLATION_DIRS= lib/java share/doc/java/xerces share/examples/java/xerces
+
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/java
- ${INSTALL_DATA} ${WRKSRC}/xerces.jar ${PREFIX}/lib/java
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xerces
- cd ${WRKSRC}/docs && pax -rw -pp . ${PREFIX}/share/doc/java/xerces
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/xerces
- ${INSTALL_DATA} ${WRKSRC}/xercesSamples.jar ${PREFIX}/share/examples/java/xerces
- cd ${WRKSRC}/data && pax -rw -pp . ${PREFIX}/share/examples/java/xerces
+ ${INSTALL_DATA} ${WRKSRC}/xerces.jar ${DESTDIR}${PREFIX}/lib/java
+ cd ${WRKSRC}/docs && pax -rw -pp . ${DESTDIR}${PREFIX}/share/doc/java/xerces
+ ${INSTALL_DATA} ${WRKSRC}/xercesSamples.jar ${DESTDIR}${PREFIX}/share/examples/java/xerces
+ cd ${WRKSRC}/data && pax -rw -pp . ${DESTDIR}${PREFIX}/share/examples/java/xerces
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d7db560c2d46 -r b320bdd2e499 textproc/xhtml/Makefile
--- a/textproc/xhtml/Makefile Tue Jul 07 20:24:51 2009 +0000
+++ b/textproc/xhtml/Makefile Tue Jul 07 20:25:27 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/04/08 22:43:26 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/07 20:28:29 joerg Exp $
#
DISTNAME= xhtml1
@@ -12,6 +12,8 @@
HOMEPAGE= http://www.w3.org/MarkUp/
COMMENT= DTDs for the Extensible Hypertext Markup Language
+PKG_DESTDIR_SUPPORT= user-destdir
+
NO_BUILD= yes
USE_LANGUAGES= # empty
USE_TOOLS+= pax
@@ -20,11 +22,12 @@
SGML_CATALOGS= ${PREFIX}/share/xml/xhtml/1.0/xhtml.soc
XML_CATALOGS= ${PREFIX}/share/xml/xhtml/1.0/catalog
+INSTALLATION_DIRS= share/xml/xhtml/1.0
+
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/xml/xhtml/1.0
- cd ${WRKSRC}/DTD && pax -rwpppm . ${PREFIX}/share/xml/xhtml/1.0
+ cd ${WRKSRC}/DTD && pax -rwpppm . ${DESTDIR}${PREFIX}/share/xml/xhtml/1.0
${INSTALL_DATA} ${FILESDIR}/catalog10 \
- ${PREFIX}/share/xml/xhtml/1.0/catalog
+ ${DESTDIR}${PREFIX}/share/xml/xhtml/1.0/catalog
.include "../../textproc/xmlcatmgr/catalogs.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d7db560c2d46 -r b320bdd2e499 textproc/xmlindent/Makefile
--- a/textproc/xmlindent/Makefile Tue Jul 07 20:24:51 2009 +0000
+++ b/textproc/xmlindent/Makefile Tue Jul 07 20:25:27 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:14 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/07 20:27:05 joerg Exp $
#
DISTNAME= xmlindent-0.2.16
@@ -10,6 +10,7 @@
COMMENT= XML stream reformatter written in ANSI C
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= lex
@@ -18,7 +19,7 @@
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xmlindent ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/xmlindent.1 ${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_PROGRAM} ${WRKSRC}/xmlindent ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/xmlindent.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.include "../../mk/bsd.pkg.mk"
diff -r d7db560c2d46 -r b320bdd2e499 textproc/xmlstarlet/Makefile
--- a/textproc/xmlstarlet/Makefile Tue Jul 07 20:24:51 2009 +0000
+++ b/textproc/xmlstarlet/Makefile Tue Jul 07 20:25:27 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:52 reed Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/07 20:27:24 joerg Exp $
#
DISTNAME= xmlstarlet-1.0.1
@@ -10,6 +10,8 @@
HOMEPAGE= http://xmlstar.sourceforge.net/
COMMENT= Command line utilities for XML manipulation
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-libxml-prefix=${BUILDLINK_PREFIX.libxml2}
@@ -24,8 +26,8 @@
INSTALLATION_DIRS+= share/doc/xmlstarlet
post-install:
- ${INSTALL_DATA} ${WRKSRC}/doc/xmlstarlet-ug.pdf ${PREFIX}/share/doc/xmlstarlet
- ${INSTALL_DATA} ${WRKSRC}/doc/xmlstarlet.txt ${PREFIX}/share/doc/xmlstarlet
+ ${INSTALL_DATA} ${WRKSRC}/doc/xmlstarlet-ug.pdf ${DESTDIR}${PREFIX}/share/doc/xmlstarlet
+ ${INSTALL_DATA} ${WRKSRC}/doc/xmlstarlet.txt ${DESTDIR}${PREFIX}/share/doc/xmlstarlet
.include "../../textproc/libxml2/buildlink3.mk"
diff -r d7db560c2d46 -r b320bdd2e499 textproc/xslide/Makefile
--- a/textproc/xslide/Makefile Tue Jul 07 20:24:51 2009 +0000
+++ b/textproc/xslide/Makefile Tue Jul 07 20:25:27 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/10/11 09:31:58 uebayasi Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/07 20:26:10 joerg Exp $
#
DISTNAME= xslide-0.2.2
@@ -11,6 +11,7 @@
HOMEPAGE= http://xslide.sourceforge.net/
COMMENT= XSL major mode for emacs
+PKG_DESTDIR_SUPPORT= user-destdir
.include "../../editors/emacs/modules.mk"
@@ -33,10 +34,10 @@
done
do-install:
- ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/${PKGBASE}
- cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${EMACS_LISPPREFIX}/${PKGBASE}
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xslide
- ${INSTALL_DATA} ${WRKSRC}/README.TXT ${PREFIX}/share/doc/xslide
- ${INSTALL_DATA} ${WRKSRC}/dot_emacs ${PREFIX}/share/doc/xslide
+ ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/xslide
+ ${INSTALL_DATA} ${WRKSRC}/README.TXT ${DESTDIR}${PREFIX}/share/doc/xslide
+ ${INSTALL_DATA} ${WRKSRC}/dot_emacs ${DESTDIR}${PREFIX}/share/doc/xslide
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index