summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authoragc <agc>1998-03-08 01:28:31 +0000
committeragc <agc>1998-03-08 01:28:31 +0000
commit826ec47589d59c8570c25b5e3c4af8029bff1f71 (patch)
tree0ac6d56b293e7ddfdf5b7f82d8d74633d9a66a4f /devel
parent7327bcf01056bbf233297cfba8278ec1bb460ad0 (diff)
downloadpkgsrc-826ec47589d59c8570c25b5e3c4af8029bff1f71.tar.gz
Fix a typo in the panel/Makefile.in file (INSTALL_PREFIX lacked a
trailing '@') - pointed out by Rob Windsor. Move configure script mods to patch-ab, and coalesce them.
Diffstat (limited to 'devel')
-rw-r--r--devel/ncurses/patches/patch-aa36
-rw-r--r--devel/ncurses/patches/patch-ab23
2 files changed, 34 insertions, 25 deletions
diff --git a/devel/ncurses/patches/patch-aa b/devel/ncurses/patches/patch-aa
index 34ee1fa6740..6f248db9cd0 100644
--- a/devel/ncurses/patches/patch-aa
+++ b/devel/ncurses/patches/patch-aa
@@ -102,28 +102,14 @@
termsort.c: $(srcdir)/MKtermsort.sh
sh -c "$(srcdir)/MKtermsort.sh $(AWK) $(srcdir)/../include/Caps" >$@
---- configure.orig Sun Dec 1 02:08:35 1996
-+++ configure Fri Jan 9 13:51:38 1998
-@@ -1283,12 +1283,7 @@
- do
- nc_test=`echo $nc_name | sed -e 's/*//'`
- if test "x$nc_test" = "x$nc_name" ; then
-- case "$nc_name" in
-- *.gz) nc_form=gzip; nc_name=`basename $nc_name .gz`;;
-- *.Z) nc_form=compress; nc_name=`basename $nc_name .Z`;;
-- *.0) nc_form=BSDI; nc_format=yes;;
-- *) nc_form=cat;;
-- esac
-+ nc_form=cat
- break
- fi
- done
-@@ -1392,7 +1387,7 @@
- BSDI)
- cat >>man/edit_man.sh <<NC_EOF
- # BSDI installs only .0 suffixes in the cat directories
-- target="\`echo \$target|sed -e 's/\.[1-9]\+.\?/.0/'\`"
-+ target="\`echo \$target|sed -e 's/\.[1-9]\(\.gz|\.Z\)\{0,1\}/.0\1/'\`"
- NC_EOF
- ;;
- esac
+--- panel/Makefile.in 1998/03/06 22:13:13 1.1
++++ panel/Makefile.in 1998/03/06 22:13:29
+@@ -35,7 +35,7 @@
+ THIS = Makefile
+
+ MODEL = @DFT_LWR_MODEL@
+-INSTALL_PREFIX = @INSTALL_PREFIX
++INSTALL_PREFIX = @INSTALL_PREFIX@
+ srcdir = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
diff --git a/devel/ncurses/patches/patch-ab b/devel/ncurses/patches/patch-ab
index 2c36a2ac523..a27a88610ed 100644
--- a/devel/ncurses/patches/patch-ab
+++ b/devel/ncurses/patches/patch-ab
@@ -16,3 +16,26 @@
do
nc_dir=`eval echo $nc_symbol`
if test -f $nc_dir/curses.h ; then
+@@ -1283,12 +1283,7 @@
+ do
+ nc_test=`echo $nc_name | sed -e 's/*//'`
+ if test "x$nc_test" = "x$nc_name" ; then
+- case "$nc_name" in
+- *.gz) nc_form=gzip; nc_name=`basename $nc_name .gz`;;
+- *.Z) nc_form=compress; nc_name=`basename $nc_name .Z`;;
+- *.0) nc_form=BSDI; nc_format=yes;;
+- *) nc_form=cat;;
+- esac
++ nc_form=cat
+ break
+ fi
+ done
+@@ -1392,7 +1387,7 @@
+ BSDI)
+ cat >>man/edit_man.sh <<NC_EOF
+ # BSDI installs only .0 suffixes in the cat directories
+- target="\`echo \$target|sed -e 's/\.[1-9]\+.\?/.0/'\`"
++ target="\`echo \$target|sed -e 's/\.[1-9]\(\.gz|\.Z\)\{0,1\}/.0\1/'\`"
+ NC_EOF
+ ;;
+ esac