summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorjlam <jlam>2001-04-11 11:17:54 +0000
committerjlam <jlam>2001-04-11 11:17:54 +0000
commit6c60dff50178ee25656be49440f8f6342ce885b7 (patch)
treeeddb499c83ee7187666f8280e80ad656c7a1e647 /www
parent981d116485d5cac8b586bfe03e90ba6a26bb81d5 (diff)
downloadpkgsrc-6c60dff50178ee25656be49440f8f6342ce885b7.tar.gz
Update surfraw to 1.0.3. Changes from version 1.0.2:
New elvi: amazon Add `scaleplus' elvi to elvi/Makefile.am Minor documentation bug fixes
Diffstat (limited to 'www')
-rw-r--r--www/surfraw/Makefile16
-rw-r--r--www/surfraw/files/md54
-rw-r--r--www/surfraw/files/patch-sum4
-rw-r--r--www/surfraw/patches/patch-aa24
-rw-r--r--www/surfraw/pkg/DEINSTALL17
-rw-r--r--www/surfraw/pkg/INSTALL16
-rw-r--r--www/surfraw/pkg/PLIST4
7 files changed, 52 insertions, 33 deletions
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index a13a6911f6e..ad11c12f8f0 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 17:22:39 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/04/11 11:17:54 jlam Exp $
#
-DISTNAME= surfraw-1.0.2
+DISTNAME= surfraw-1.0.3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=surfraw/}
@@ -13,8 +13,20 @@ CONFLICTS+= surfaw-*
GNU_CONFIGURE= # defined
+DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
+INSTALL_FILE= ${WRKDIR}/INSTALL
+
DOCDIR= ${PREFIX}/share/doc/surfraw
+pre-install:
+ ${SED} -e "s|@CAT@|${CAT}|g" \
+ -e "s|@RM@|${RM}|g" \
+ ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
+ ${SED} -e "s|@CAT@|${CAT}|g" \
+ -e "s|@CHMOD@|${CHMOD}|g" \
+ -e "s|@CP@|${CP}|g" \
+ ${PKGDIR}/INSTALL > ${INSTALL_FILE}
+
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
diff --git a/www/surfraw/files/md5 b/www/surfraw/files/md5
index d085b74f15a..9b8cb77345d 100644
--- a/www/surfraw/files/md5
+++ b/www/surfraw/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/10/31 13:10:18 jlam Exp $
+$NetBSD: md5,v 1.5 2001/04/11 11:17:55 jlam Exp $
-MD5 (surfraw-1.0.2.tar.gz) = 6049287649e4791ff45ca68a7a173972
+SHA1 (surfraw-1.0.3.tar.gz) = c98cb9aed84098e475f598b196fb2699da04574e
diff --git a/www/surfraw/files/patch-sum b/www/surfraw/files/patch-sum
index 2eb3b79edf4..7204d9052fb 100644
--- a/www/surfraw/files/patch-sum
+++ b/www/surfraw/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1 2000/10/31 13:48:38 jlam Exp $
+$NetBSD: patch-sum,v 1.2 2001/04/11 11:17:55 jlam Exp $
-MD5 (patch-aa) = 8fd99e88614e0721da02b5eddaa120cb
+SHA1 (patch-aa) = 2a3d06f8de7364444aac446746124119282bb00b
diff --git a/www/surfraw/patches/patch-aa b/www/surfraw/patches/patch-aa
index 35b2c03dba9..368f302ffd2 100644
--- a/www/surfraw/patches/patch-aa
+++ b/www/surfraw/patches/patch-aa
@@ -1,22 +1,16 @@
-$NetBSD: patch-aa,v 1.1 2000/10/31 13:48:38 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2001/04/11 11:17:55 jlam Exp $
---- Makefile.in.orig Tue Sep 26 15:54:35 2000
-+++ Makefile.in
-@@ -313,7 +313,7 @@
- check: check-recursive
- installcheck-am:
+--- Makefile.in.orig Fri Jan 12 21:39:41 2001
++++ Makefile.in Wed Apr 11 06:49:15 2001
+@@ -282,9 +282,9 @@
installcheck: installcheck-recursive
+ all-am: Makefile $(SCRIPTS) $(DATA)
+
-install-exec-am: install-binSCRIPTS install-sysconfDATA
+install-exec-am: install-binSCRIPTS
- install-exec: install-exec-recursive
- install-data-am:
-@@ -322,7 +322,7 @@
- install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- install: install-recursive
-uninstall-am: uninstall-binSCRIPTS uninstall-sysconfDATA
+uninstall-am: uninstall-binSCRIPTS
- uninstall: uninstall-recursive
- all-am: Makefile $(SCRIPTS) $(DATA)
- all-redirect: all-recursive
+
+ install-exec: install-exec-recursive install-exec-am
+ @$(NORMAL_INSTALL)
diff --git a/www/surfraw/pkg/DEINSTALL b/www/surfraw/pkg/DEINSTALL
index c0a16db1c8c..8895ee15a66 100644
--- a/www/surfraw/pkg/DEINSTALL
+++ b/www/surfraw/pkg/DEINSTALL
@@ -1,10 +1,13 @@
#!/bin/sh
#
-# $NetBSD: DEINSTALL,v 1.2 2000/12/06 07:55:14 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.3 2001/04/11 11:17:55 jlam Exp $
PKGNAME=$1
STAGE=$2
+CAT="@CAT@"
+RM="@RM@"
+
SAMPLECONFDIR=${PKG_PREFIX}/etc
CONFDIR=${PKG_PREFIX}/etc
CONFFILES="surfraw.conf"
@@ -20,10 +23,11 @@ DEINSTALL)
SAMPLEFILE=${SAMPLECONFDIR}/${file}.dist
if diff -q ${FILE} ${SAMPLEFILE} >/dev/null
then
- rm -f ${FILE}
+ ${RM} -f ${FILE}
fi
done
;;
+
POST-DEINSTALL)
modified_files=''
for file in ${CONFFILES}
@@ -36,21 +40,22 @@ POST-DEINSTALL)
done
if [ -n "${modified_files}" ]
then
- cat << EOF
+ ${CAT} << EOF
===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove the
-following files:
+If you won't be using ${PKGNAME} any longer, you may want to remove
+the following files:
EOF
for file in ${modified_files}
do
echo " ${file}"
done
- cat << EOF
+ ${CAT} << EOF
===========================================================================
EOF
fi
;;
+
*)
echo "Unexpected argument: ${STAGE}"
exit 1
diff --git a/www/surfraw/pkg/INSTALL b/www/surfraw/pkg/INSTALL
index a7784e6961f..37af7b7843e 100644
--- a/www/surfraw/pkg/INSTALL
+++ b/www/surfraw/pkg/INSTALL
@@ -1,10 +1,14 @@
#! /bin/sh
#
-# $NetBSD: INSTALL,v 1.2 2000/12/06 07:55:14 jlam Exp $
+# $NetBSD: INSTALL,v 1.3 2001/04/11 11:17:55 jlam Exp $
PKGNAME=$1
STAGE=$2
+CAT="@CAT@"
+CHMOD="@CHMOD@"
+CP="@CP@"
+
SAMPLECONFDIR=${PKG_PREFIX}/etc
CONFDIR=${PKG_PREFIX}/etc
CONFFILES="surfraw.conf"
@@ -12,6 +16,7 @@ CONFFILES="surfraw.conf"
case ${STAGE} in
PRE-INSTALL)
;;
+
POST-INSTALL)
echo "Installing configuration files:"
@@ -24,11 +29,11 @@ POST-INSTALL)
echo " ${FILE} already exists"
else
echo " ${FILE}"
- cp ${SAMPLEFILE} ${FILE}
- chmod 644 ${FILE}
+ ${CP} ${SAMPLEFILE} ${FILE}
+ ${CHMOD} 644 ${FILE}
fi
done
- cat << EOF
+ ${CAT} << EOF
===========================================================================
Some files you might need to customize include the following:
@@ -38,10 +43,11 @@ EOF
FILE=${CONFDIR}/${file}
echo " ${FILE}"
done
- cat << EOF
+ ${CAT} << EOF
===========================================================================
EOF
;;
+
*)
echo "Unexpected argument: ${STAGE}"
exit 1
diff --git a/www/surfraw/pkg/PLIST b/www/surfraw/pkg/PLIST
index eacb7225fe8..e9897aaba12 100644
--- a/www/surfraw/pkg/PLIST
+++ b/www/surfraw/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2000/10/31 13:48:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/04/11 11:17:55 jlam Exp $
bin/W
bin/altavista
+bin/amazon
bin/appwatch
bin/ask
bin/austlii
@@ -22,6 +23,7 @@ bin/newscientist
bin/pubmed
bin/raging
bin/rhyme
+bin/scaleplus
bin/slashdot
bin/stockquote
bin/sundocs