summaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-03-06 17:43:41 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-03-06 17:43:41 +0000
commitf6927e8ec3a81d2feb3cbb82ffe1d34ae1272277 (patch)
tree88b7cafd3cd76f70c2c3eb4c329373dfc802c792 /shells
parentSupport stage (diff)
Support stage
Notes
Notes: svn path=/head/; revision=347286
Diffstat (limited to 'shells')
-rw-r--r--shells/rc/Makefile16
-rw-r--r--shells/rc/files/patch-Makefile.in17
-rw-r--r--shells/rc/pkg-plist2
3 files changed, 23 insertions, 12 deletions
diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index 6e92106084d9..42c001850957 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -8,24 +8,16 @@ MASTER_SITES= ftp://rc.quanstro.net/pub/ \
ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/
MAINTAINER= quanstro@quanstro.net
-COMMENT= A unix incarnation of the plan9 shell
+COMMENT= Unix incarnation of the plan9 shell
USE_BZIP2= YES
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-history
-MAN1= history.1 rc.1
-
OPTIONS_DEFINE= READLINE
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MREADLINE}
-USES+= readline
-CONFIGURE_ARGS+= --with-readline
-.else
-MAKE_ARGS+= CFLAGS="$(CFLAGS) -static"
-.endif
+READLINE_USES+= readline
+READLINE_CONFIGURE_WITH+= --with-readline
+READLINE_MAKE_ARGS_OFF+= CFLAGS="$(CFLAGS) -static"
.include <bsd.port.mk>
diff --git a/shells/rc/files/patch-Makefile.in b/shells/rc/files/patch-Makefile.in
new file mode 100644
index 000000000000..b8a6b661b37f
--- /dev/null
+++ b/shells/rc/files/patch-Makefile.in
@@ -0,0 +1,17 @@
+--- ./Makefile.in.orig 2003-07-17 14:24:25.000000000 +0200
++++ ./Makefile.in 2014-03-06 18:42:44.943985391 +0100
+@@ -716,10 +716,10 @@
+ ./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.
+ .NOEXPORT:
diff --git a/shells/rc/pkg-plist b/shells/rc/pkg-plist
index 01950bd106d0..e173e7923016 100644
--- a/shells/rc/pkg-plist
+++ b/shells/rc/pkg-plist
@@ -3,3 +3,5 @@ bin/-
bin/--
bin/-p
bin/--p
+man/man1/history.1.gz
+man/man1/rc.1.gz