diff options
Diffstat (limited to 'shells/rc')
| -rw-r--r-- | shells/rc/Makefile | 4 | ||||
| -rw-r--r-- | shells/rc/distinfo | 4 | ||||
| -rw-r--r-- | shells/rc/patches/patch-aa | 19 | ||||
| -rw-r--r-- | shells/rc/patches/patch-ab | 21 |
4 files changed, 46 insertions, 2 deletions
diff --git a/shells/rc/Makefile b/shells/rc/Makefile index ccff6d249e7..1f0892596ab 100644 --- a/shells/rc/Makefile +++ b/shells/rc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2009/12/02 09:30:49 snj Exp $ +# $NetBSD: Makefile,v 1.25 2010/02/04 05:23:27 dholland Exp $ DISTNAME= rc-1.7 CATEGORIES= shells plan9 @@ -8,6 +8,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://plan9.bell-labs.com/sys/doc/rc.html COMMENT= Unix incarnation of the plan9 shell +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-history diff --git a/shells/rc/distinfo b/shells/rc/distinfo index 92cfcdc2b2d..389f7a14e94 100644 --- a/shells/rc/distinfo +++ b/shells/rc/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.5 2008/04/06 00:14:28 christos Exp $ +$NetBSD: distinfo,v 1.6 2010/02/04 05:23:27 dholland Exp $ SHA1 (rc-1.7.tar.gz) = 7a7511f7ef54f1883aa73e572b0a66e476421829 RMD160 (rc-1.7.tar.gz) = e8a657db93136dfd40062b45b4e4ea73cbfe8fc3 Size (rc-1.7.tar.gz) = 158449 bytes +SHA1 (patch-aa) = 3d8f054748b8f411f48ef47383fde87402d45c08 +SHA1 (patch-ab) = d3e8974908f085c49e8b339a7e3bab7e9c1cba3f diff --git a/shells/rc/patches/patch-aa b/shells/rc/patches/patch-aa new file mode 100644 index 00000000000..c036da314ff --- /dev/null +++ b/shells/rc/patches/patch-aa @@ -0,0 +1,19 @@ +$NetBSD: patch-aa,v 1.11 2010/02/04 05:23:27 dholland Exp $ + +DESTDIR support. + +--- Makefile.am~ 2001-10-29 09:59:29.000000000 +0000 ++++ Makefile.am +@@ -68,8 +68,8 @@ trip: rc tripping + + install-exec-hook: + if AMC_HISTORY +- $(INSTALL_PROGRAM) history $(bindir)/- ;\ +- rm -f $(bindir)/--; $(LN) $(bindir)/- $(bindir)/-- ;\ +- rm -f $(bindir)/-p; $(LN) $(bindir)/- $(bindir)/-p ;\ +- rm -f $(bindir)/--p; $(LN) $(bindir)/- $(bindir)/--p ++ $(INSTALL_PROGRAM) history ${DESTDIR}$(bindir)/- ;\ ++ rm -f ${DESTDIR}$(bindir)/--; $(LN) ${DESTDIR}$(bindir)/- ${DESTDIR}$(bindir)/-- ;\ ++ rm -f ${DESTDIR}$(bindir)/-p; $(LN) ${DESTDIR}$(bindir)/- ${DESTDIR}$(bindir)/-p ;\ ++ rm -f ${DESTDIR}$(bindir)/--p; $(LN) ${DESTDIR}$(bindir)/- ${DESTDIR}$(bindir)/--p + endif diff --git a/shells/rc/patches/patch-ab b/shells/rc/patches/patch-ab new file mode 100644 index 00000000000..160306f955a --- /dev/null +++ b/shells/rc/patches/patch-ab @@ -0,0 +1,21 @@ +$NetBSD: patch-ab,v 1.5 2010/02/04 05:23:27 dholland Exp $ + +DESTDIR support. + +--- Makefile.in~ 2002-06-19 15:12:04.000000000 +0000 ++++ Makefile.in +@@ -533,10 +533,10 @@ trip: rc tripping + ./rc -p < $(srcdir)/trip.rc + + install-exec-hook: +-@AMC_HISTORY_TRUE@ $(INSTALL_PROGRAM) history $(bindir)/- ;\ +-@AMC_HISTORY_TRUE@ rm -f $(bindir)/--; $(LN) $(bindir)/- $(bindir)/-- ;\ +-@AMC_HISTORY_TRUE@ rm -f $(bindir)/-p; $(LN) $(bindir)/- $(bindir)/-p ;\ +-@AMC_HISTORY_TRUE@ rm -f $(bindir)/--p; $(LN) $(bindir)/- $(bindir)/--p ++@AMC_HISTORY_TRUE@ $(INSTALL_PROGRAM) history ${DESTDIR}$(bindir)/- ;\ ++@AMC_HISTORY_TRUE@ rm -f ${DESTDIR}$(bindir)/--; $(LN) ${DESTDIR}$(bindir)/- ${DESTDIR}$(bindir)/-- ;\ ++@AMC_HISTORY_TRUE@ rm -f ${DESTDIR}$(bindir)/-p; $(LN) ${DESTDIR}$(bindir)/- ${DESTDIR}$(bindir)/-p ;\ ++@AMC_HISTORY_TRUE@ rm -f ${DESTDIR}$(bindir)/--p; $(LN) ${DESTDIR}$(bindir)/- ${DESTDIR}$(bindir)/--p + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. |