summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2010-02-12 00:21:17 +0000
committerjoerg <joerg@pkgsrc.org>2010-02-12 00:21:17 +0000
commit061e88eb855d2241cde697bcd9e5af55a242e8ca (patch)
treee4123f8c4395eef438ed43df814720a578f93396
parentdf5a8303dae37eb2059058de44e9bd9a7e6b2802 (diff)
downloadpkgsrc-061e88eb855d2241cde697bcd9e5af55a242e8ca.tar.gz
DESTDIR support
Diffstat
-rw-r--r--print/LPRng-core/Makefile20
-rw-r--r--shells/es/Makefile6
-rw-r--r--shells/es/distinfo4
-rw-r--r--shells/es/patches/patch-aa8
-rw-r--r--shells/esh/Makefile20
-rw-r--r--shells/rssh/Makefile6
-rw-r--r--shells/rssh/distinfo4
-rw-r--r--shells/rssh/patches/patch-aa14
-rw-r--r--time/wmfishtime/Makefile6
-rw-r--r--time/wmfishtime/distinfo4
-rw-r--r--time/wmfishtime/patches/patch-aa6
-rw-r--r--time/wmmoonclock/Makefile6
-rw-r--r--time/wmmoonclock/distinfo4
-rw-r--r--time/wmmoonclock/patches/patch-aa6
14 files changed, 73 insertions, 41 deletions
diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile
index 057cce34ae0..71053c98e3a 100644
--- a/print/LPRng-core/Makefile
+++ b/print/LPRng-core/Makefile
@@ -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 @@ MAINTAINER= pkgsrc-users@NetBSD.org
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.conf ${PKG_SYSCONFDIR}/lpd/lpd.conf
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 @@ pre-install:
${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 --git a/shells/es/Makefile b/shells/es/Makefile
index 07b23045076..31ec8b72600 100644
--- a/shells/es/Makefile
+++ b/shells/es/Makefile
@@ -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 @@ MAINTAINER= pkgsrc-users@NetBSD.org
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_MESSAGE.path= Fixing path to es in scripts.
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 --git a/shells/es/distinfo b/shells/es/distinfo
index c052e1206f5..761a9795647 100644
--- a/shells/es/distinfo
+++ b/shells/es/distinfo
@@ -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 --git a/shells/es/patches/patch-aa b/shells/es/patches/patch-aa
index cef0bacee8a..025c4f01d65 100644
--- a/shells/es/patches/patch-aa
+++ b/shells/es/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.5 2005/03/10 16:58:39 tv Exp $
+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 --git a/shells/esh/Makefile b/shells/esh/Makefile
index 6a17369d13e..1b0d2bd4199 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -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 @@ MASTER_SITES= ${MASTER_SITE_BACKUP}
MAINTAINER= pkgsrc-users@NetBSD.org
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 --git a/shells/rssh/Makefile b/shells/rssh/Makefile
index 1c546d54755..f48b4556eb5 100644
--- a/shells/rssh/Makefile
+++ b/shells/rssh/Makefile
@@ -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 @@ MAINTAINER= pkgsrc-users@NetBSD.org
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 @@ CONFIGURE_ARGS+= --with-rsync=${RSSH_RSYNC_PATH:Q}
.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 --git a/shells/rssh/distinfo b/shells/rssh/distinfo
index 8e73500c1ca..0827a65b6d3 100644
--- a/shells/rssh/distinfo
+++ b/shells/rssh/distinfo
@@ -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 --git a/shells/rssh/patches/patch-aa b/shells/rssh/patches/patch-aa
index c18da0851f8..2837b9db648 100644
--- a/shells/rssh/patches/patch-aa
+++ b/shells/rssh/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/20 16:21:15 seb Exp $
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 --git a/time/wmfishtime/Makefile b/time/wmfishtime/Makefile
index b8fa343b278..8178545384a 100644
--- a/time/wmfishtime/Makefile
+++ b/time/wmfishtime/Makefile
@@ -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 @@ MAINTAINER= pkgsrc-users@NetBSD.org
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 --git a/time/wmfishtime/distinfo b/time/wmfishtime/distinfo
index 6074417550b..2c1d41536fb 100644
--- a/time/wmfishtime/distinfo
+++ b/time/wmfishtime/distinfo
@@ -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 --git a/time/wmfishtime/patches/patch-aa b/time/wmfishtime/patches/patch-aa
index 66ae9d675a1..0037e02a9bf 100644
--- a/time/wmfishtime/patches/patch-aa
+++ b/time/wmfishtime/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.4 2003/01/19 10:27:57 salo Exp $
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 --git a/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile
index 0485e1fa1be..0e4e201b847 100644
--- a/time/wmmoonclock/Makefile
+++ b/time/wmmoonclock/Makefile
@@ -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 @@ MAINTAINER= pkgsrc-users@NetBSD.org
# 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 @@ MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q}
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"
diff --git a/time/wmmoonclock/distinfo b/time/wmmoonclock/distinfo
index 05225ebafc9..8c1a2e7368b 100644
--- a/time/wmmoonclock/distinfo
+++ b/time/wmmoonclock/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 19:14:56 wiz Exp $
+$NetBSD: distinfo,v 1.6 2010/02/12 00:28:36 joerg Exp $
SHA1 (wmMoonClock-1.27.tar.gz) = bbc27a11ff99505fe4b872019f214f305cee6c5b
RMD160 (wmMoonClock-1.27.tar.gz) = adf74a0fff42a5e3d7823c7fabf71c95f47057e4
Size (wmMoonClock-1.27.tar.gz) = 155197 bytes
-SHA1 (patch-aa) = 6b9d2459c7b92bee200c06f543a85ce429b8cd7b
+SHA1 (patch-aa) = e6e38e186b6525c96e81c141d5ea75ce242b9e7a
diff --git a/time/wmmoonclock/patches/patch-aa b/time/wmmoonclock/patches/patch-aa
index ac43a5c47eb..061c21412b2 100644
--- a/time/wmmoonclock/patches/patch-aa
+++ b/time/wmmoonclock/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/10/27 13:40:30 bouyer Exp $
+$NetBSD: patch-aa,v 1.4 2010/02/12 00:28:36 joerg Exp $
--- Makefile.orig Tue Mar 23 03:20:32 1999
+++ Makefile Thu Oct 17 00:31:50 2002
@@ -25,5 +25,5 @@ $NetBSD: patch-aa,v 1.3 2002/10/27 13:40:30 bouyer Exp $
- install -s -m 0755 wmMoonClock $(DESTDIR)/bin
- install -m 0644 wmMoonClock.1 $(DESTDIR)/man/man1
-
-+ $(BSD_INSTALL_PROGRAM) wmMoonClock $(DESTDIR)/bin
-+ $(BSD_INSTALL_DATA) wmMoonClock.1 $(DESTDIR)/man/man1
++ $(BSD_INSTALL_PROGRAM) wmMoonClock $(DESTDIR)${PREFIX}/bin
++ $(BSD_INSTALL_DATA) wmMoonClock.1 $(DESTDIR)${PREFIX}/${PKGMANDIR}/man1
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 10:44:48 +0000