From 19e8571a9d0569e2a57357cc26c72ffd2199f900 Mon Sep 17 00:00:00 2001 From: jasper Date: Wed, 23 Dec 2009 22:04:18 +0000 Subject: [PATCH] - sync MASTER_SITES with mutt/Makefile.inc - use SUBST_CMD - set license version - regen PLIST and patches while here --- textproc/urlview/Makefile | 18 ++++++++---------- textproc/urlview/patches/patch-Makefile_in | 6 +++--- textproc/urlview/patches/patch-sample_urlview | 8 ++++---- textproc/urlview/patches/patch-urlview_c | 4 ++-- textproc/urlview/pkg/PLIST | 4 ++-- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile index 4568adcd795..eda9ee83c38 100644 --- a/textproc/urlview/Makefile +++ b/textproc/urlview/Makefile @@ -1,18 +1,16 @@ -# $OpenBSD: Makefile,v 1.13 2007/09/15 20:59:42 merdely Exp $ +# $OpenBSD: Makefile,v 1.14 2009/12/23 22:04:18 jasper Exp $ COMMENT= curses-based URL ripper DISTNAME= urlview-0.9 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= textproc -MASTER_SITES= ftp://ftp.mutt.org/mutt/contrib/ \ - ftp://ftp.cs.hmc.edu/pub/me/ \ - ftp://ftp.cs.tu-berlin.de/pub/net/mail/mutt/ \ - ftp://ftp.ilog.fr/pub/Mirrors/mutt/contrib/ \ - ftp://ftp.etri.re.kr/pub/mail/mutt/ \ - ftp://ftp.pnm.net/pub/unix/mutt/contrib/ +MASTER_SITES= ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/contrib/ \ + ftp://ftp.mutt.org/mutt/contrib/ \ + ftp://ftp.gbnet.net/pub/mutt-international/contrib/ \ + ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/contrib/ -# GPL +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -33,7 +31,7 @@ CONFIGURE_ENV= LIBS=-lcurses .endif pre-build: - @perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," ${WRKSRC}/urlview.c + ${SUBST_CMD} ${WRKSRC}/urlview.c @perl -pi -e "s,/etc,${SYSCONFDIR},g" ${WRKSRC}/urlview.man post-install: diff --git a/textproc/urlview/patches/patch-Makefile_in b/textproc/urlview/patches/patch-Makefile_in index 85f7afd48ea..5dcfed703fe 100644 --- a/textproc/urlview/patches/patch-Makefile_in +++ b/textproc/urlview/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2000/08/13 00:06:21 naddy Exp $ +$OpenBSD: patch-Makefile_in,v 1.2 2009/12/23 22:04:18 jasper Exp $ --- Makefile.in.orig Tue Jul 4 12:16:37 2000 -+++ Makefile.in Sat Aug 12 02:35:58 2000 -@@ -318,7 +318,7 @@ maintainer-clean-generic clean mostlycle ++++ Makefile.in Wed Dec 23 22:06:56 2009 +@@ -318,7 +318,7 @@ maintainer-clean-generic clean mostlyclean distclean m install-data-local: diff --git a/textproc/urlview/patches/patch-sample_urlview b/textproc/urlview/patches/patch-sample_urlview index 1383ab94245..a297bce7f67 100644 --- a/textproc/urlview/patches/patch-sample_urlview +++ b/textproc/urlview/patches/patch-sample_urlview @@ -1,7 +1,7 @@ -$OpenBSD: patch-sample_urlview,v 1.1.1.1 2000/08/13 00:06:21 naddy Exp $ ---- sample.urlview.orig Fri Aug 11 15:48:27 2000 -+++ sample.urlview Fri Aug 11 15:53:46 2000 -@@ -22,7 +22,7 @@ REGEXP (((http|https|ftp|gopher)|mailto) +$OpenBSD: patch-sample_urlview,v 1.2 2009/12/23 22:04:18 jasper Exp $ +--- sample.urlview.orig Tue Jul 4 12:14:30 2000 ++++ sample.urlview Wed Dec 23 22:06:56 2009 +@@ -22,7 +22,7 @@ REGEXP (((http|https|ftp|gopher)|mailto)[.:][^ >"\t]*| # Command to invoke for selected URL. Use lynx, netscape, or url_handler.sh # shell script. diff --git a/textproc/urlview/patches/patch-urlview_c b/textproc/urlview/patches/patch-urlview_c index ca1ac5f5a90..cd61adb53eb 100644 --- a/textproc/urlview/patches/patch-urlview_c +++ b/textproc/urlview/patches/patch-urlview_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-urlview_c,v 1.2 2006/01/29 14:46:14 sturm Exp $ +$OpenBSD: patch-urlview_c,v 1.3 2009/12/23 22:04:18 jasper Exp $ --- urlview.c.orig Tue Jul 4 12:14:30 2000 +++ urlview.c Sun Jan 29 15:41:28 2006 @@ -46,9 +46,11 @@ @@ -10,7 +10,7 @@ $OpenBSD: patch-urlview_c,v 1.2 2006/01/29 14:46:14 sturm Exp $ #define DEFAULT_REGEXP "(((https?|ftp|gopher)://|(mailto|file|news):)[^' \t<>\"]+|(www|web|w3)\\.[-a-z0-9.]+)[^' \t.,;<>\"\\):]" #define DEFAULT_COMMAND "url_handler.sh %s" -#define SYSTEM_INITFILE "/etc/urlview.conf" -+#define SYSTEM_INITFILE "%%SYSCONFDIR%%/urlview.conf" ++#define SYSTEM_INITFILE "${SYSCONFDIR}/urlview.conf" #define OFFSET 2 #define PAGELEN (LINES - 1 - OFFSET) diff --git a/textproc/urlview/pkg/PLIST b/textproc/urlview/pkg/PLIST index 19ab7ab5b7f..c89fd8e59ef 100644 --- a/textproc/urlview/pkg/PLIST +++ b/textproc/urlview/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.4 2004/09/23 06:57:40 espie Exp $ -bin/urlview +@comment $OpenBSD: PLIST,v 1.5 2009/12/23 22:04:18 jasper Exp $ +@bin bin/urlview @man man/man1/urlview.1 share/examples/urlview/ share/examples/urlview/sample.urlview