pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc DESTDIR support
details: https://anonhg.NetBSD.org/pkgsrc/rev/5d12d932cbc0
branches: trunk
changeset: 571422:5d12d932cbc0
user: joerg <joerg%pkgsrc.org@localhost>
date: Fri Feb 12 00:21:17 2010 +0000
description:
DESTDIR support
diffstat:
print/LPRng-core/Makefile | 20 +++++++++++++++-----
shells/es/Makefile | 6 +++++-
shells/es/distinfo | 4 ++--
shells/es/patches/patch-aa | 8 ++++----
shells/esh/Makefile | 20 ++++++++++----------
shells/rssh/Makefile | 6 ++++--
shells/rssh/distinfo | 4 ++--
shells/rssh/patches/patch-aa | 14 +++++++++++---
time/wmfishtime/Makefile | 6 +++++-
time/wmfishtime/distinfo | 4 ++--
time/wmfishtime/patches/patch-aa | 6 +++---
time/wmmoonclock/Makefile | 6 +++++-
time/wmmoonclock/distinfo | 4 ++--
time/wmmoonclock/patches/patch-aa | 6 +++---
14 files changed, 73 insertions(+), 41 deletions(-)
diffs (truncated from 329 to 300 lines):
diff -r e77238f13d6a -r 5d12d932cbc0 print/LPRng-core/Makefile
--- a/print/LPRng-core/Makefile Fri Feb 12 00:20:02 2010 +0000
+++ b/print/LPRng-core/Makefile Fri Feb 12 00:21:17 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/07/06 16:08:30 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2010/02/12 00:21:17 joerg Exp $
DISTNAME= LPRng-3.8.28
PKGNAME= LPRng-core-3.8.28
@@ -12,6 +12,8 @@
HOMEPAGE= http://www.lprng.com/
COMMENT= Enhanced Printer Spooler
+PKG_DESTDIR_SUPPORT= user-destdir
+
MAKE_JOBS_SAFE= no
CONFLICTS+= cups-[0-9]*
@@ -49,6 +51,12 @@
CONF_FILES+= ${EXAMPLESDIR}/lpd.perms ${PKG_SYSCONFDIR}/lpd/lpd.perms
CONF_FILES+= ${EXAMPLESDIR}/printcap ${PKG_SYSCONFDIR}/printcap
+SPECIAL_PERMS+= bin/lpq ${SETUID_ROOT_PERMS} \
+ bin/lpr ${SETUID_ROOT_PERMS} \
+ bin/lprm ${SETUID_ROOT_PERMS} \
+ bin/lpstat ${SETUID_ROOT_PERMS} \
+ sbin/lpc ${SETUID_ROOT_PERMS} \
+
pre-patch:
${MV} ${WRKSRC:Q}/man/lpd.conf.n ${WRKSRC:Q}/man/lpd.conf.n.in
@@ -65,10 +73,12 @@
${SED} -e s,@PREFIX@,${PREFIX:Q},g \
${FILESDIR:Q}/LPRng.sh > ${WRKDIR:Q}/LPRng.sh
+INSTALLATION_DIRS+= ${EXAMPLESDIR}
+INSTALL_MAKE_FLAGS+= SUID_ROOT_PERMS=555
+
post-install:
- ${INSTALL_DATA_DIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/lpd.conf ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/lpd.perms ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/printcap ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/lpd.conf ${DESTDIR}${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/lpd.perms ${DESTDIR}${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/printcap ${DESTDIR}${EXAMPLESDIR}
.include "../../mk/bsd.pkg.mk"
diff -r e77238f13d6a -r 5d12d932cbc0 shells/es/Makefile
--- a/shells/es/Makefile Fri Feb 12 00:20:02 2010 +0000
+++ b/shells/es/Makefile Fri Feb 12 00:21:17 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/12/02 08:32:25 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2010/02/12 00:23:34 joerg Exp $
DISTNAME= es-0.9-alpha1
PKGNAME= es-0.9a1
@@ -10,6 +10,8 @@
HOMEPAGE= http://hawkwind.cs.toronto.edu:8001/mlists/es.html
COMMENT= Extensible shell, derived from plan9's rc
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_TOOLS+= yacc
PKG_SHELL= bin/es
@@ -20,4 +22,6 @@
SUBST_FILES.path= esdebug
SUBST_SED.path= -e 's|^\#! /bin/es|\#! ${PREFIX:Q}/bin/es|'
+INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
+
.include "../../mk/bsd.pkg.mk"
diff -r e77238f13d6a -r 5d12d932cbc0 shells/es/distinfo
--- a/shells/es/distinfo Fri Feb 12 00:20:02 2010 +0000
+++ b/shells/es/distinfo Fri Feb 12 00:21:17 2010 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2008/09/19 20:02:23 joerg Exp $
+$NetBSD: distinfo,v 1.13 2010/02/12 00:23:34 joerg Exp $
SHA1 (es-0.9-alpha1.tar.gz) = 5027c9dade742c437b8e471a356d15883ebc4732
RMD160 (es-0.9-alpha1.tar.gz) = ca2307202ab6e65c49188e3228d1af6426a23952
Size (es-0.9-alpha1.tar.gz) = 125913 bytes
-SHA1 (patch-aa) = 0ecb437885e77c07ef9c6d677cefe9d0ae6b86d8
+SHA1 (patch-aa) = a6488aa2ca69332f0d22943befcd8d022ab01ef2
SHA1 (patch-ab) = bd58fbbf71d5c9dc76bdc380cb7b93ad3f5f1c72
SHA1 (patch-ac) = 978debd8079eedf7d09862e9946bfd9957c46732
SHA1 (patch-ad) = 63bf69c25dc9e610b9375685459a1fd05ea66e1e
diff -r e77238f13d6a -r 5d12d932cbc0 shells/es/patches/patch-aa
--- a/shells/es/patches/patch-aa Fri Feb 12 00:20:02 2010 +0000
+++ b/shells/es/patches/patch-aa Fri Feb 12 00:21:17 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2005/03/10 16:58:39 tv Exp $
+$NetBSD: patch-aa,v 1.6 2010/02/12 00:23:34 joerg Exp $
--- Makefile.orig 1995-05-30 07:14:14.000000000 -0400
+++ Makefile
@@ -20,9 +20,9 @@
+all: es
+
+install:
-+ ${BSD_INSTALL_PROGRAM} es $(PREFIX)/bin
-+ ${BSD_INSTALL_SCRIPT} esdebug $(PREFIX)/bin/esdebug
-+ ${BSD_INSTALL_MAN} es.1 $(PREFIX)/man/man1
++ ${BSD_INSTALL_PROGRAM} es ${DESTDIR}$(PREFIX)/bin
++ ${BSD_INSTALL_SCRIPT} esdebug ${DESTDIR}$(PREFIX)/bin/esdebug
++ ${BSD_INSTALL_MAN} es.1 ${DESTDIR}$(PREFIX)/man/man1
+
es : ${OFILES} initial.o
${CC} -o es ${LDFLAGS} ${OFILES} initial.o ${LIBS}
diff -r e77238f13d6a -r 5d12d932cbc0 shells/esh/Makefile
--- a/shells/esh/Makefile Fri Feb 12 00:20:02 2010 +0000
+++ b/shells/esh/Makefile Fri Feb 12 00:21:17 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/02/20 19:04:15 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/02/12 00:23:07 joerg Exp $
DISTNAME= esh-0.8
PKGREVISION= 2
@@ -8,25 +8,25 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Unix shell with Lisp-like syntax
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}/esh
PKG_SHELL= bin/esh
INFO_FILES= # PLIST
-INSTALLATION_DIRS= bin ${PKGINFODIR}
+INSTALLATION_DIRS= bin ${PKGINFODIR} share/doc/esh share/examples/esh \
+ share/emacs/site-lisp
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/esh ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/esh
+ ${INSTALL_PROGRAM} ${WRKSRC}/esh ${DESTDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/examples/*.esh \
- ${PREFIX}/share/examples/esh
- ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
+ ${DESTDIR}${PREFIX}/share/examples/esh
${INSTALL_DATA} ${WRKSRC}/emacs/esh-mode.el \
- ${PREFIX}/share/emacs/site-lisp
+ ${DESTDIR}${PREFIX}/share/emacs/site-lisp
cd ${WRKSRC}/doc; for f in *.info *.info-[0-9]*; do \
${TEST} ! -f "$$f" || \
- ${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR}; \
+ ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR}; \
done
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/esh
cd ${WRKSRC}/doc && ${INSTALL_DATA} esh.html esh_toc.html \
- ${PREFIX}/share/doc/esh/
+ ${DESTDIR}${PREFIX}/share/doc/esh/
.include "../../mk/bsd.pkg.mk"
diff -r e77238f13d6a -r 5d12d932cbc0 shells/rssh/Makefile
--- a/shells/rssh/Makefile Fri Feb 12 00:20:02 2010 +0000
+++ b/shells/rssh/Makefile Fri Feb 12 00:21:17 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:39 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/12 00:27:18 joerg Exp $
#
DISTNAME= rssh-2.3.2
@@ -9,6 +9,8 @@
HOMEPAGE= http://rssh.sourceforge.net/
COMMENT= Restricted shell allowing only scp and/or sftp
+PKG_DESTDIR_SUPPORT= user-destdir
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
@@ -47,6 +49,6 @@
.endif
post-install:
- ${INSTALL_DATA} ${WRKSRC}/rssh.conf ${EGDIR}/rssh.conf
+ ${INSTALL_DATA} ${WRKSRC}/rssh.conf ${DESTDIR}${EGDIR}/rssh.conf
.include "../../mk/bsd.pkg.mk"
diff -r e77238f13d6a -r 5d12d932cbc0 shells/rssh/distinfo
--- a/shells/rssh/distinfo Fri Feb 12 00:20:02 2010 +0000
+++ b/shells/rssh/distinfo Fri Feb 12 00:21:17 2010 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2006/01/14 00:52:33 seb Exp $
+$NetBSD: distinfo,v 1.4 2010/02/12 00:27:18 joerg Exp $
SHA1 (rssh-2.3.2.tar.gz) = bc7154f50dec1e46cb76b3e1c00e2b1179e50d3d
RMD160 (rssh-2.3.2.tar.gz) = bcdf7d111042bbf296d624943e3350d5273676ed
Size (rssh-2.3.2.tar.gz) = 113959 bytes
-SHA1 (patch-aa) = 0424bd8d705c8981cdd9076ba9a1d5eb59a192f3
+SHA1 (patch-aa) = c1be257e75bf4658606c0ff7cf7b42a02f1033f0
SHA1 (patch-ab) = 4ea3ca63d199e6fbfbc2e1db97f95700c203b593
diff -r e77238f13d6a -r 5d12d932cbc0 shells/rssh/patches/patch-aa
--- a/shells/rssh/patches/patch-aa Fri Feb 12 00:20:02 2010 +0000
+++ b/shells/rssh/patches/patch-aa Fri Feb 12 00:21:17 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/04/20 16:21:15 seb Exp $
+$NetBSD: patch-aa,v 1.2 2010/02/12 00:27:18 joerg Exp $
---- Makefile.in.orig 2004-06-19 08:31:32.000000000 +0200
+--- Makefile.in.orig 2006-01-07 02:24:57.000000000 +0000
+++ Makefile.in
-@@ -550,7 +550,7 @@ info-am:
+@@ -670,7 +670,7 @@ info-am:
install-data-am: install-man
@@ -11,3 +11,11 @@
install-libexecPROGRAMS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+@@ -728,7 +728,6 @@ uninstall-man: uninstall-man1 uninstall-
+ $(CC) -c $(DEFS) $(ourdefs) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $<
+
+ install-exec-hook:
+- chmod u+s $(libexecdir)/rssh_chroot_helper
+
+ rpm: dist
+ rpmbuild -ta --sign $(base).tar.gz
diff -r e77238f13d6a -r 5d12d932cbc0 time/wmfishtime/Makefile
--- a/time/wmfishtime/Makefile Fri Feb 12 00:20:02 2010 +0000
+++ b/time/wmfishtime/Makefile Fri Feb 12 00:21:17 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:53 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2010/02/12 00:28:02 joerg Exp $
#
DISTNAME= wmfishtime-1.24
@@ -10,8 +10,12 @@
HOMEPAGE= http://www.ne.jp/asahi/linux/timecop/
COMMENT= Dockable clock application with clock, date and fish
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_X11BASE= yes
+INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
+
.include "../../devel/libgetopt/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e77238f13d6a -r 5d12d932cbc0 time/wmfishtime/distinfo
--- a/time/wmfishtime/distinfo Fri Feb 12 00:20:02 2010 +0000
+++ b/time/wmfishtime/distinfo Fri Feb 12 00:21:17 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 19:14:56 wiz Exp $
+$NetBSD: distinfo,v 1.7 2010/02/12 00:28:02 joerg Exp $
SHA1 (wmfishtime-1.24.tar.gz) = f5c730102787bac48b19bb5418a70333cbe22c31
RMD160 (wmfishtime-1.24.tar.gz) = 9c705351ecbc28e15fd8e3b73712940fdb73baf1
Size (wmfishtime-1.24.tar.gz) = 21895 bytes
-SHA1 (patch-aa) = 8122c7a1213914145b3fd43956e6982dca1c1214
+SHA1 (patch-aa) = b4529e948b3534b7ee7c62571eeed63c073ec6e2
SHA1 (patch-ba) = cd739472544fe79dcc12b22fa0b1dbc0281ac7bd
SHA1 (patch-bb) = d35e6a640d89db0ea2ae60101cffb1957e836f58
diff -r e77238f13d6a -r 5d12d932cbc0 time/wmfishtime/patches/patch-aa
--- a/time/wmfishtime/patches/patch-aa Fri Feb 12 00:20:02 2010 +0000
+++ b/time/wmfishtime/patches/patch-aa Fri Feb 12 00:21:17 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2003/01/19 10:27:57 salo Exp $
+$NetBSD: patch-aa,v 1.5 2010/02/12 00:28:02 joerg Exp $
--- Makefile.orig Sat May 26 22:49:41 2001
+++ Makefile Sat Jan 19 05:48:48 2002
@@ -2,22 +2,22 @@
@@ -35,5 +35,5 @@
install:
- install $(INSTALL) wmfishtime $(PREFIX)/bin
- install $(INSTALL) wmfishtime.1 $(PREFIX)/man/man1
-+ $(BSD_INSTALL_PROGRAM) wmfishtime $(PREFIX)/bin
-+ $(BSD_INSTALL_MAN) wmfishtime.1 $(PREFIX)/man/man1
++ $(BSD_INSTALL_PROGRAM) wmfishtime ${DESTDIR}$(PREFIX)/bin
++ $(BSD_INSTALL_MAN) wmfishtime.1 ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1
diff -r e77238f13d6a -r 5d12d932cbc0 time/wmmoonclock/Makefile
--- a/time/wmmoonclock/Makefile Fri Feb 12 00:20:02 2010 +0000
+++ b/time/wmmoonclock/Makefile Fri Feb 12 00:21:17 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/09/19 06:46:52 tron Exp $
+# $NetBSD: Makefile,v 1.19 2010/02/12 00:28:36 joerg Exp $
DISTNAME= wmMoonClock-1.27
PKGREVISION= 1
@@ -9,6 +9,8 @@
# HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
COMMENT= Shows lunar ephemeris to fairly high accuracy
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}/${DISTNAME}/Src
USE_TOOLS+= gmake
USE_X11BASE= YES
@@ -21,6 +23,8 @@
EXTRA_LOCAL_LIBS= -lsocket
.endif
+INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
+
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/xextproto/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index