Date: Sun, 17 Sep 2000 16:45:54 +0200 (CEST) From: Christian Weisgerber <naddy@mips.inka.de> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/21326: update www/surfraw to 1.0.1 Message-ID: <200009171445.e8HEjs695210@ganerc.mips.inka.de>
next in thread | raw e-mail | index | archive | help
>Number: 21326
>Category: ports
>Synopsis: update www/surfraw to 1.0.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Sep 17 07:50:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Christian Weisgerber
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
>Description:
I have appended a patch to update ports/www/surfraw to version
1.0.1.
Some comments:
- I have included both patches to Makefile.am (where I did the changes)
and to Makefile.in, since I don't think this port justifies a
dependency on automake.
- I have adopted OpenBSD's handling of configuration files for
surfraw.conf.
>How-To-Repeat:
>Fix:
Index: surfraw/Makefile
===================================================================
RCS file: /freebsd/ports/www/surfraw/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- surfraw/Makefile 2000/08/21 02:35:25 1.1
+++ surfraw/Makefile 2000/09/17 14:41:37
@@ -2,10 +2,10 @@
# Date created: 2000-08-03
# Whom: Christian Weisgerber <naddy@mips.inka.de>
#
-# $FreeBSD$
+# $FreeBSD: ports/www/surfraw/Makefile,v 1.1 2000/08/21 02:35:25 kris Exp $
PORTNAME= surfraw
-PORTVERSION= 0.5.7
+PORTVERSION= 1.0.1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= surfraw
@@ -14,19 +14,9 @@
GNU_CONFIGURE= yes
-ELVI= W altavista appwatch ask austlii cite cnn currency deja excite \
- fast freshmeat ftpsearch google ircsearch linuxdoc netbsd \
- newscientist pubmed raging rhyme slashdot sundocs sunsolve \
- thesaurus translate webster wetandwild xxx yahoo \
-
-do-install:
-.for i in ${ELVI}
- ${INSTALL_SCRIPT} ${WRKSRC}/elvi/${i} ${PREFIX}/bin
-.endfor
- ${INSTALL_SCRIPT} ${WRKSRC}/surfraw ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/surfraw-netscape-remote ${PREFIX}/bin
- ${MKDIR} ${PREFIX}/share/surfraw/
- ${INSTALL_DATA} ${WRKSRC}/elvi/surfraw_elvi.list ${PREFIX}/share/surfraw/
- ${INSTALL_DATA} ${WRKSRC}/surfraw.conf ${PREFIX}/etc/surfraw.conf.sample
+post-install:
+ ${MKDIR} ${PREFIX}/share/examples/surfraw
+ ${INSTALL_DATA} ${WRKSRC}/surfraw.conf ${PREFIX}/share/examples/surfraw
+ @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
Index: surfraw/files/md5
===================================================================
RCS file: /freebsd/ports/www/surfraw/files/md5,v
retrieving revision 1.1
diff -u -r1.1 md5
--- surfraw/files/md5 2000/08/21 02:35:25 1.1
+++ surfraw/files/md5 2000/09/17 14:41:37
@@ -1 +1 @@
-MD5 (surfraw-0.5.7.tar.gz) = d73c9f49be0b337b57ad4e29323a72fa
+MD5 (surfraw-1.0.1.tar.gz) = da4b780bf227f74cc39679b81b0503fc
Index: surfraw/patches/patch-ac
===================================================================
RCS file: patch-ac
diff -N patch-ac
--- /dev/null Thu Aug 17 14:16:17 2000
+++ patch-ac Sun Sep 17 14:41:37 2000
@@ -0,0 +1,10 @@
+--- Makefile.am.orig Thu Aug 24 20:43:26 2000
++++ Makefile.am Sun Sep 17 16:26:39 2000
+@@ -3,7 +3,6 @@
+ SUBDIRS = elvi
+
+ bin_SCRIPTS = surfraw surfraw-netscape-remote
+-sysconf_DATA = surfraw.conf
+ devel_extra = banner prebuild
+ EXTRA_DIST = surfraw.lsm.in surfraw.in surfraw.spec.in \
+ aclocal.m4 \
Index: surfraw/patches/patch-ad
===================================================================
RCS file: patch-ad
diff -N patch-ad
--- /dev/null Thu Aug 17 14:16:17 2000
+++ patch-ad Sun Sep 17 14:41:37 2000
@@ -0,0 +1,91 @@
+--- Makefile.in.orig Fri Aug 25 15:44:47 2000
++++ Makefile.in Sun Sep 17 16:26:48 2000
+@@ -70,7 +70,6 @@
+ SUBDIRS = elvi
+
+ bin_SCRIPTS = surfraw surfraw-netscape-remote
+-sysconf_DATA = surfraw.conf
+ devel_extra = banner prebuild
+ EXTRA_DIST = surfraw.lsm.in surfraw.in surfraw.spec.in aclocal.m4 $(devel_extra)
+
+@@ -80,8 +79,6 @@
+ surfraw-netscape-remote
+ SCRIPTS = $(bin_SCRIPTS)
+
+-DATA = $(sysconf_DATA)
+-
+ DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+ Makefile.in NEWS TODO aclocal.m4 config.guess config.sub configure \
+ configure.in install-sh missing mkinstalldirs \
+@@ -139,25 +136,6 @@
+ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ done
+
+-install-sysconfDATA: $(sysconf_DATA)
+- @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+- @list='$(sysconf_DATA)'; for p in $$list; do \
+- if test -f $(srcdir)/$$p; then \
+- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
+- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
+- else if test -f $$p; then \
+- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
+- $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
+- fi; fi; \
+- done
+-
+-uninstall-sysconfDATA:
+- @$(NORMAL_UNINSTALL)
+- list='$(sysconf_DATA)'; for p in $$list; do \
+- rm -f $(DESTDIR)$(sysconfdir)/$$p; \
+- done
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -313,7 +291,7 @@
+ check: check-recursive
+ installcheck-am:
+ installcheck: installcheck-recursive
+-install-exec-am: install-binSCRIPTS install-sysconfDATA
++install-exec-am: install-binSCRIPTS
+ install-exec: install-exec-recursive
+
+ install-data-am:
+@@ -322,15 +300,15 @@
+ 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-am: Makefile $(SCRIPTS)
+ all-redirect: all-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs: installdirs-recursive
+ installdirs-am:
+- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir)
++ $(mkinstalldirs) $(DESTDIR)$(bindir)
+
+
+ mostlyclean-generic:
+@@ -363,12 +341,11 @@
+ maintainer-clean: maintainer-clean-recursive
+ -rm -f config.status
+
+-.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-sysconfDATA \
+-install-sysconfDATA install-data-recursive uninstall-data-recursive \
+-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
+-uninstalldirs-recursive all-recursive check-recursive \
+-installcheck-recursive info-recursive dvi-recursive \
+-mostlyclean-recursive distclean-recursive clean-recursive \
++.PHONY: uninstall-binSCRIPTS install-binSCRIPTS install-data-recursive \
++uninstall-data-recursive install-exec-recursive \
++uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
++all-recursive check-recursive installcheck-recursive info-recursive \
++dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
Index: surfraw/patches/patch-ae
===================================================================
RCS file: patch-ae
diff -N patch-ae
--- /dev/null Thu Aug 17 14:16:17 2000
+++ patch-ae Sun Sep 17 14:41:37 2000
@@ -0,0 +1,11 @@
+--- elvi/Makefile.am.orig Sun Sep 17 14:45:18 2000
++++ elvi/Makefile.am Sun Sep 17 14:48:39 2000
+@@ -34,7 +34,7 @@
+ xxx \
+ yahoo
+
+-sysconf_DATA = surfraw_elvi.list
++pkgdata_DATA = surfraw_elvi.list
+
+ EXTRA_DIST = $(bin_SCRIPTS)
+
Index: surfraw/patches/patch-af
===================================================================
RCS file: patch-af
diff -N patch-af
--- /dev/null Thu Aug 17 14:16:17 2000
+++ patch-af Sun Sep 17 14:41:38 2000
@@ -0,0 +1,92 @@
+--- elvi/Makefile.in.orig Sun Sep 17 14:45:22 2000
++++ elvi/Makefile.in Sun Sep 17 14:50:10 2000
+@@ -70,14 +70,14 @@
+ bin_SCRIPTS = altavista appwatch ask austlii britannica cite cnn currency deja excite fast ftpsearch freshmeat jake google ircsearch linuxdoc netbsd newscientist pubmed raging rhyme slashdot sundocs stockquote sunsolve thesaurus translate W webster wetandwild xxx yahoo
+
+
+-sysconf_DATA = surfraw_elvi.list
++pkgdata_DATA = surfraw_elvi.list
+
+ EXTRA_DIST = $(bin_SCRIPTS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES =
+ SCRIPTS = $(bin_SCRIPTS)
+
+-DATA = $(sysconf_DATA)
++DATA = $(pkgdata_DATA)
+
+ DIST_COMMON = Makefile.am Makefile.in
+
+@@ -115,23 +115,23 @@
+ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ done
+
+-install-sysconfDATA: $(sysconf_DATA)
++install-pkgdataDATA: $(pkgdata_DATA)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+- @list='$(sysconf_DATA)'; for p in $$list; do \
++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
++ @list='$(pkgdata_DATA)'; for p in $$list; do \
+ if test -f $(srcdir)/$$p; then \
+- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
+- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
++ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
++ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
+ else if test -f $$p; then \
+- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
+- $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
++ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
++ $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
+ fi; fi; \
+ done
+
+-uninstall-sysconfDATA:
++uninstall-pkgdataDATA:
+ @$(NORMAL_UNINSTALL)
+- list='$(sysconf_DATA)'; for p in $$list; do \
+- rm -f $(DESTDIR)$(sysconfdir)/$$p; \
++ list='$(pkgdata_DATA)'; for p in $$list; do \
++ rm -f $(DESTDIR)$(pkgdatadir)/$$p; \
+ done
+ tags: TAGS
+ TAGS:
+@@ -160,23 +160,23 @@
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
+-install-exec-am: install-binSCRIPTS install-sysconfDATA
++install-exec-am: install-binSCRIPTS
+ install-exec: install-exec-am
+
+-install-data-am:
++install-data-am: install-pkgdataDATA
+ install-data: install-data-am
+
+ install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ install: install-am
+-uninstall-am: uninstall-binSCRIPTS uninstall-sysconfDATA
++uninstall-am: uninstall-binSCRIPTS uninstall-pkgdataDATA
+ uninstall: uninstall-am
+ all-am: Makefile $(SCRIPTS) $(DATA)
+ all-redirect: all-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs:
+- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir)
++ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir)
+
+
+ mostlyclean-generic:
+@@ -206,8 +206,8 @@
+
+ maintainer-clean: maintainer-clean-am
+
+-.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-sysconfDATA \
+-install-sysconfDATA tags distdir info-am info dvi-am dvi check check-am \
++.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-pkgdataDATA \
++install-pkgdataDATA tags distdir info-am info dvi-am dvi check check-am \
+ installcheck-am installcheck install-exec-am install-exec \
+ install-data-am install-data install-am install uninstall-am uninstall \
+ all-redirect all-am all installdirs mostlyclean-generic \
Index: surfraw/pkg/DEINSTALL
===================================================================
RCS file: DEINSTALL
diff -N DEINSTALL
--- /dev/null Thu Aug 17 14:16:17 2000
+++ DEINSTALL Sun Sep 17 14:41:38 2000
@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# De-installation setup of surfraw
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_FILE=${PREFIX}/etc/surfraw.conf
+
+# Function: tell the user what they need to do to delete the port completely
+#
+do_notice()
+{
+ echo
+ echo "+---------------"
+ echo "| To completely deinstall the $1 package you need to perform"
+ echo "| these steps as root:"
+ echo "|"
+ echo "| rm -f ${CONFIG_FILE}"
+ echo "|"
+ echo "| Do not do this if you plan on re-installing $1"
+ echo "| at some future time."
+ echo "+---------------"
+ echo
+}
+
+# Verify proper execution
+#
+if [ $# -ne 2 ]; then
+ echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2
+ exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+ DEINSTALL)
+ if [ -f ${CONFIG_FILE} ]; then
+ do_notice "$1"
+ fi
+ ;;
+ POST-DEINSTALL)
+ : nothing to post-deinstall for this port
+ ;;
+ *)
+ echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
Index: surfraw/pkg/INSTALL
===================================================================
RCS file: INSTALL
diff -N INSTALL
--- /dev/null Thu Aug 17 14:16:17 2000
+++ INSTALL Sun Sep 17 14:41:39 2000
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# Pre/post-installation setup of surfraw
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_FILE=${PREFIX}/etc/surfraw.conf
+SAMPLE_CONFIG_DIR=${PREFIX}/share/examples/surfraw
+
+# Function: tell the user what they need to do to use the port just installed
+#
+do_notice()
+{
+ echo
+ echo "+---------------"
+ echo "| The existing $1 configuration file, ${CONFIG_FILE},"
+ echo "| has NOT been changed. You may want to compare it to the"
+ echo "| current sample files in ${SAMPLE_CONFIG_DIR}"
+ echo "| and update your configuration as needed."
+ echo "+---------------"
+ echo
+}
+
+# Function: install configuration files
+#
+do_install()
+{
+ install -c -o root -g wheel ${SAMPLE_CONFIG_DIR}/surfraw.conf ${CONFIG_FILE}
+ echo
+ echo "+---------------"
+ echo "| The $1 configuration file, ${CONFIG_FILE},"
+ echo "| has been installed. Please view this file and change"
+ echo "| the configuration to meet your needs"
+ echo "+---------------"
+ echo
+}
+
+# Verify proper execution
+#
+if [ $# -ne 2 ]; then
+ echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+ exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+ PRE-INSTALL)
+ : nothing to pre-install for this port
+ ;;
+ POST-INSTALL)
+ if [ -f ${CONFIG_FILE} ]; then
+ do_notice "$1"
+ else
+ do_install "$1"
+ fi
+ ;;
+ *)
+ echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
Index: surfraw/pkg/PLIST
===================================================================
RCS file: /freebsd/ports/www/surfraw/pkg/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- surfraw/pkg/PLIST 2000/08/21 02:35:26 1.1
+++ surfraw/pkg/PLIST 2000/09/17 14:41:39
@@ -3,6 +3,7 @@
bin/appwatch
bin/ask
bin/austlii
+bin/britannica
bin/cite
bin/cnn
bin/currency
@@ -13,6 +14,7 @@
bin/ftpsearch
bin/google
bin/ircsearch
+bin/jake
bin/linuxdoc
bin/netbsd
bin/newscientist
@@ -20,6 +22,7 @@
bin/raging
bin/rhyme
bin/slashdot
+bin/stockquote
bin/sundocs
bin/sunsolve
bin/surfraw
@@ -30,6 +33,7 @@
bin/wetandwild
bin/xxx
bin/yahoo
-etc/surfraw.conf.sample
+share/examples/surfraw/surfraw.conf
share/surfraw/surfraw_elvi.list
+@dirrm share/examples/surfraw
@dirrm share/surfraw
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200009171445.e8HEjs695210>