diff options
author | billf <billf@FreeBSD.org> | 1999-10-29 01:19:10 +0000 |
---|---|---|
committer | billf <billf@FreeBSD.org> | 1999-10-29 01:19:10 +0000 |
commit | ecf8e9043bb89f30feb6d9f6e54064daac58d7a1 (patch) | |
tree | 9cb57b960b0e5593df3feef19638a6eaa89f7ace /textproc | |
parent | 225d8d1bb852f9a884acc38d45332feef81f9a8e (diff) | |
download | FreeBSD-ports-ecf8e9043bb89f30feb6d9f6e54064daac58d7a1.zip FreeBSD-ports-ecf8e9043bb89f30feb6d9f6e54064daac58d7a1.tar.gz |
Upgrade to 3.1.3
Submitted by: Doug Barton <doug@gorean.org>
lots of others who missed PLIST stuff.
Diffstat (limited to 'textproc')
-rw-r--r-- | textproc/htdig/Makefile | 25 | ||||
-rw-r--r-- | textproc/htdig/distinfo | 3 | ||||
-rw-r--r-- | textproc/htdig/files/patch-ab | 86 | ||||
-rw-r--r-- | textproc/htdig/pkg-plist | 46 |
4 files changed, 52 insertions, 108 deletions
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile index 507a48c..02f55c7 100644 --- a/textproc/htdig/Makefile +++ b/textproc/htdig/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: htdig -# Version required: 3.1.2 +# Version required: 3.1.3 # Date created: 18 August 1998 # Whom: Bill Fumerola <billf@chc-chimes.com> # # $FreeBSD$ # -DISTNAME= htdig-3.1.2 +DISTNAME= htdig-3.1.3 CATEGORIES= textproc www MASTER_SITES= http://www.htdig.org/files/ \ ${MASTER_SITE_SUNSITE} \ @@ -16,6 +16,10 @@ MASTER_SITES= http://www.htdig.org/files/ \ ftp://ftp.htdig.org/pub/htdig/ MASTER_SITE_SUBDIR= apps/www/indexing +PATCH_SITES= http://www.htdig.org/files/contrib/other/ +PATCHFILES= htdig-3.1.3-urlparmbug.patch +PATCH_DIST_STRIP= -p1 + MAINTAINER= billf@FreeBSD.org Y2K= http://www.htdig.org/FAQ.html#q1.7 @@ -26,17 +30,20 @@ CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/www/cgi-bin \ --with-search-dir=${PREFIX}/www/data BUILD_TARGET= depends all -# XXX - Please see patches/patch-aa, as it modifies this -# file too. This is wrong, and one day I'll make sed do -# everything. - post-patch: - ${MV} ${WRKSRC}/CONFIG.in ${WRKSRC}/CONFIG.in.old - ${SED} -e 's#htdocs#data#g' \ + @ ${MV} ${WRKSRC}/CONFIG.in ${WRKSRC}/CONFIG.in.Dist + @ ${SED} -e 's#htdocs#data#g' \ + -e 's#/conf#/etc#' \ + -e 's#/common#/share/htdig#' \ + -e 's#/db#/share/htdig#' \ + ${WRKSRC}/CONFIG.in.Dist > ${WRKSRC}/CONFIG.in + + @ ${MV} ${WRKSRC}/CONFIG ${WRKSRC}/CONFIG.Dist + @ ${SED} -e 's#htdocs#data#g' \ -e 's#/conf#/etc#' \ -e 's#/common#/share/htdig#' \ -e 's#/db#/share/htdig#' \ - ${WRKSRC}/CONFIG.in.old > ${WRKSRC}/CONFIG.in + ${WRKSRC}/CONFIG.Dist > ${WRKSRC}/CONFIG .include <bsd.port.mk> diff --git a/textproc/htdig/distinfo b/textproc/htdig/distinfo index c9715fe..753b7be 100644 --- a/textproc/htdig/distinfo +++ b/textproc/htdig/distinfo @@ -1 +1,2 @@ -MD5 (htdig-3.1.2.tar.gz) = ddd0305d420e2d6025694d4e1448d5f7 +MD5 (htdig-3.1.3.tar.gz) = 02c8e8e04c01932111958d4cd7bdd674 +MD5 (htdig-3.1.3-urlparmbug.patch) = 3744a515fc90edbb7bd3cfe9d60d20d0 diff --git a/textproc/htdig/files/patch-ab b/textproc/htdig/files/patch-ab index 0205662..002b66e 100644 --- a/textproc/htdig/files/patch-ab +++ b/textproc/htdig/files/patch-ab @@ -1,65 +1,8 @@ -From girgen@elbas.partitur.se Fri Jul 2 10:46:50 1999 -Return-Path: <girgen@elbas.partitur.se> -Received: from elbas.partitur.se (www.cebox.se [193.219.246.222]) - by hub.freebsd.org (Postfix) with ESMTP - id 7618914F0E; Fri, 2 Jul 1999 10:46:48 -0700 (PDT) - (envelope-from girgen@elbas.partitur.se) -Received: (from girgen@localhost) - by elbas.partitur.se (8.9.3/8.9.2) id TAA98285; - Fri, 2 Jul 1999 19:46:46 +0200 (CEST) - (envelope-from girgen) -Message-Id: <199907021746.TAA98285@elbas.partitur.se> -Date: Fri, 2 Jul 1999 19:46:46 +0200 (CEST) -From: girgen@partitur.se -Sender: girgen@elbas.partitur.se -Reply-To: girgen@partitur.se -To: FreeBSD-gnats-submit@freebsd.org -Cc: billf@freebsd.org -Subject: htdig's db shall compile with -pthreads -X-Send-Pr-Version: 3.2 - ->Number: 12488 ->Category: ports ->Synopsis: textproc/htdig compiles with -lc_r, should be -pthreads ->Confidential: no ->Severity: non-critical ->Priority: low ->Responsible: billf ->State: open ->Quarter: ->Keywords: ->Date-Required: ->Class: change-request ->Submitter-Id: current-users ->Arrival-Date: Fri Jul 2 10:50:00 PDT 1999 ->Closed-Date: ->Last-Modified: Fri Jul 2 11:03:28 PDT 1999 ->Originator: Palle Girgensohn ->Release: FreeBSD 3.2-STABLE i386 ->Organization: -Partitur ->Environment: -FreeBSD 3.2-STABLE i386 - ELF - - ->Description: -the version of Berkeley DB (from www.sleepycat.com, I think), that -comes with the htdig source, shall be compiled with -pthreads, at -least on ELF (didn't check aout). - - - ->How-To-Repeat: -cd /usr/ports/textproc/htdig && make - - ->Fix: -Put this this patch in the patches dir as patch-ab: - ---- ../../../htdig.orig/work/htdig-3.1.1/db/dist/configure.in Wed Feb 17 06:03:41 1999 -+++ db/dist/configure.in Wed Feb 24 14:59:30 1999 -@@ -405,7 +405,7 @@ - dnl libraries for threaded applications +diff -ur ../htdig-3.1.3.Dist/db/dist/configure ./db/dist/configure +--- ../htdig-3.1.3.Dist/db/dist/configure Wed Sep 22 09:18:15 1999 ++++ ./db/dist/configure Tue Oct 26 18:06:57 1999 +@@ -3056,7 +3056,7 @@ + case "$host_os" in freebsd*) CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS" - LIBS="-lc_r";; @@ -67,10 +10,11 @@ Put this this patch in the patches dir as patch-ab: irix*) CPPFLAGS="-D_SGI_MP_SOURCE $CPPFLAGS";; osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; solaris*) CPPFLAGS="-D_REENTRANT $CPPFLAGS" ---- ../../../htdig.orig/work/htdig-3.1.1/db/dist/configure Wed Feb 17 06:03:41 1999 -+++ db/dist/configure Wed Feb 24 14:41:19 1999 -@@ -3056,7 +3056,7 @@ - +diff -ur ../htdig-3.1.3.Dist/db/dist/configure.in ./db/dist/configure.in +--- ../htdig-3.1.3.Dist/db/dist/configure.in Wed Sep 22 09:18:15 1999 ++++ ./db/dist/configure.in Tue Oct 26 18:06:46 1999 +@@ -405,7 +405,7 @@ + dnl libraries for threaded applications case "$host_os" in freebsd*) CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS" - LIBS="-lc_r";; @@ -78,13 +22,3 @@ Put this this patch in the patches dir as patch-ab: irix*) CPPFLAGS="-D_SGI_MP_SOURCE $CPPFLAGS";; osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; solaris*) CPPFLAGS="-D_REENTRANT $CPPFLAGS" - ->Release-Note: ->Audit-Trail: -Responsible-Changed-From-To: freebsd-ports->billf -Responsible-Changed-By: billf -Responsible-Changed-When: Fri Jul 2 11:03:17 PDT 1999 -Responsible-Changed-Why: -My port, my PR. ->Unformatted: - diff --git a/textproc/htdig/pkg-plist b/textproc/htdig/pkg-plist index 91d0061..562041b 100644 --- a/textproc/htdig/pkg-plist +++ b/textproc/htdig/pkg-plist @@ -1,48 +1,50 @@ -bin/rundig -bin/htfuzzy bin/htdig +bin/htfuzzy bin/htmerge bin/htnotify +bin/rundig etc/htdig.conf -share/htdig/footer.html share/htdig/bad_words -share/htdig/header.html -share/htdig/nomatch.html -share/htdig/syntax.html share/htdig/english.0 share/htdig/english.aff +share/htdig/footer.html +share/htdig/header.html +share/htdig/long.html +share/htdig/nomatch.html +share/htdig/short.html share/htdig/synonyms +share/htdig/syntax.html share/htdig/wrapper.html +www/cgi-bin/htsearch www/data/search.html www/icons/button1.gif -www/icons/button2.gif -www/icons/button3.gif -www/icons/button4.gif -www/icons/button5.gif -www/icons/button6.gif -www/icons/button7.gif -www/icons/button8.gif -www/icons/button9.gif -www/icons/buttonl.gif -www/icons/buttonr.gif -www/icons/button10.gif -www/icons/htdig.gif -www/icons/star.gif -www/icons/star_blank.gif www/icons/button1.png +www/icons/button10.gif +www/icons/button10.png +www/icons/button2.gif www/icons/button2.png +www/icons/button3.gif www/icons/button3.png +www/icons/button4.gif www/icons/button4.png +www/icons/button5.gif www/icons/button5.png +www/icons/button6.gif www/icons/button6.png +www/icons/button7.gif www/icons/button7.png +www/icons/button8.gif www/icons/button8.png +www/icons/button9.gif www/icons/button9.png +www/icons/buttonl.gif www/icons/buttonl.png +www/icons/buttonr.gif www/icons/buttonr.png -www/icons/button10.png +www/icons/htdig.gif www/icons/htdig.png +www/icons/star.gif www/icons/star.png +www/icons/star_blank.gif www/icons/star_blank.png -www/cgi-bin/htsearch @dirrm share/htdig |