Date: Sun, 26 Sep 2004 21:15:25 +0100 From: "Schmidts" <elixr@corpdial.co.za> To: <FreeBSD-gnats-submit@freebsd.org>, "Sergio Mangialardi" <sergio@softshark.org> Cc: ports@FreeBSD.org Subject: Re:Please would you remove my email address from your mailing list Message-ID: <029a01c4a40e$8dbe8fb0$5f48ef9b@SCHMIDT> References: <20040926104943.98460.qmail@softshark.home>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi Please would you remove my email address from your mailing list. Thank you Bernadette ----- Original Message ----- From: "Sergio Mangialardi" <sergio@softshark.org> To: <FreeBSD-gnats-submit@freebsd.org> Cc: <ports@FreeBSD.org> Sent: Sunday, September 26, 2004 11:49 AM Subject: [PATCH] www/swish++: update to 6.0.2 and unbreak > > >Submitter-Id: current-users > >Originator: Sergio Mangialardi > >Organization: > >Confidential: no > >Synopsis: [PATCH] www/swish++: update to 6.0.2 and unbreak > >Severity: serious > >Priority: low > >Category: ports > >Class: change-request > >Release: FreeBSD 5.2.1-RELEASE-p9 i386 > >Environment: > System: FreeBSD ainu.softshark.home 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #10: Sun Jul 4 01:51:04 CEST > >Description: > - Update to 6.0.2 and unbreak build with gcc 3.4 > > Added file(s): > - files/patch-scripts::searchd.in > - files/patch-scripts::searchmonitor.in > > Removed file(s): > - files/patch-searchd.in > - files/patch-searchmonitor.in > > Generated with FreeBSD Port Tools 0.63 > >How-To-Repeat: > >Fix: > > --- swish++-6.0.2.patch begins here --- > diff -ruN --exclude=CVS /usr/ports/www/swish++.old/Makefile /usr/ports/www/swish++/Makefile > --- /usr/ports/www/swish++.old/Makefile Sun Sep 26 05:18:26 2004 > +++ /usr/ports/www/swish++/Makefile Sun Sep 26 12:34:46 2004 > @@ -7,8 +7,7 @@ > # > > PORTNAME= swish++ > -PORTVERSION= 5.15.3 > -PORTREVISION= 1 > +PORTVERSION= 6.0.2 > CATEGORIES= www textproc > MASTER_SITES= http://homepage.mac.com/pauljlucas/software/ > > @@ -31,13 +30,9 @@ > > .include <bsd.port.pre.mk> > > -.if ${OSVERSION} >= 502126 > -BROKEN= "Does not compile on FreeBSD >= 5.x" > -.endif > - > post-patch: > @${REINPLACE_CMD} -e '/^#error/d' ${WRKSRC}/config.h > -.for file in searchd searchmonitor > +.for file in scripts/searchd scripts/searchmonitor > @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/${file}.in > .endfor > > diff -ruN --exclude=CVS /usr/ports/www/swish++.old/distinfo /usr/ports/www/swish++/distinfo > --- /usr/ports/www/swish++.old/distinfo Thu Jan 29 17:12:32 2004 > +++ /usr/ports/www/swish++/distinfo Sun Sep 26 12:30:14 2004 > @@ -1,2 +1,2 @@ > -MD5 (swish++-5.15.3.tar.gz) = 5d480381946c4ee6764c449083360282 > -SIZE (swish++-5.15.3.tar.gz) = 279128 > +MD5 (swish++-6.0.2.tar.gz) = 237397b0efb0305d162153b49cb8b2a9 > +SIZE (swish++-6.0.2.tar.gz) = 292617 > diff -ruN --exclude=CVS /usr/ports/www/swish++.old/files/patch-GNUmakefile /usr/ports/www/swish++/files/patch-GNUmakefile > --- /usr/ports/www/swish++.old/files/patch-GNUmakefile Thu Apr 17 11:19:00 2003 > +++ /usr/ports/www/swish++/files/patch-GNUmakefile Sun Sep 26 12:30:14 2004 > @@ -1,7 +1,7 @@ > ---- GNUmakefile.orig Tue Mar 11 03:33:13 2003 > -+++ GNUmakefile Tue Apr 15 13:42:35 2003 > -@@ -229,7 +229,7 @@ > - cd $(I_BIN) && $(STRIP) $(CPP_TARGET) > +--- GNUmakefile.orig Sun Sep 26 10:03:26 2004 > ++++ GNUmakefile Sun Sep 26 10:03:42 2004 > +@@ -236,7 +236,7 @@ > + @$(MAKE) -C scripts $@ > > install_lib: $(I_LIB) > - $(INSTALL) $(I_OWNER) $(I_GROUP) $(I_MODE) $(LIB_TARGET) $(I_LIB) > diff -ruN --exclude=CVS /usr/ports/www/swish++.old/files/patch-config::config.mk /usr/ports/www/swish++/files/patch-config::config.mk > --- /usr/ports/www/swish++.old/files/patch-config::config.mk Thu Apr 17 11:19:00 2003 > +++ /usr/ports/www/swish++/files/patch-config::config.mk Sun Sep 26 12:30:14 2004 > @@ -1,17 +1,17 @@ > ---- config/config.mk.orig Tue Dec 24 15:59:08 2002 > -+++ config/config.mk Tue Apr 15 13:40:16 2003 > -@@ -33,8 +33,8 @@ > +--- config/config.mk.orig Sun Sep 26 10:05:32 2004 > ++++ config/config.mk Sun Sep 26 10:09:28 2004 > +@@ -34,8 +34,8 @@ > # > ############################################################################ ### > > --#FREE_BSD:= -DFreeBSD > --LINUX:= -DLinux -D_BSD_SOURCE > -+FREE_BSD:= -DFreeBSD > -+#LINUX:= -DLinux -D_BSD_SOURCE > - #MAC_OS_X:= -DMacOSX > - #SOLARIS:= -DSolaris > - #WIN32:= -DWIN32 > -@@ -112,7 +112,7 @@ > +-#FREE_BSD:=1 > +-LINUX:=1 > ++FREE_BSD:=1 > ++#LINUX:=1 > + #MAC_OS_X:=1 > + #SOLARIS:=1 > + #WIN32:=1 > +@@ -118,7 +118,7 @@ > ifdef SEARCH_DAEMON > > ifdef FREE_BSD > @@ -20,7 +20,7 @@ > else > PTHREAD_LINK:= -lpthread > endif > -@@ -149,7 +149,7 @@ > +@@ -159,7 +159,7 @@ > # The command to remove files recursively and ignore errors; > # usually "rm -fr" for Unix or "erase" for Windows. > > @@ -28,8 +28,8 @@ > +#PERL:= /usr/local/bin/perl > # The full path to the Perl 5 executable; usually "/bin/perl" or > # "/usr/local/bin/perl" for Unix or "\Perl\bin\perl" for > - # Windows. You need this only if you intend on using > -@@ -176,14 +176,14 @@ > + # Windows. > +@@ -185,14 +185,14 @@ > # > ############################################################################ ### > > @@ -46,7 +46,7 @@ > # The optimization level. Many compilers allow a digit after the > # O to specify the level of optimization; if so, set yours to the > # highest number your compiler allows without eliciting problems > -@@ -227,7 +227,7 @@ > +@@ -254,7 +254,7 @@ > INSTALL:= $(ROOT)/install-sh > # Install command; usually "$(ROOT)/install-sh". > > diff -ruN --exclude=CVS /usr/ports/www/swish++.old/files/patch-scripts::searchd.in /usr/ports/www/swish++/files/patch-scripts::searchd.in > --- /usr/ports/www/swish++.old/files/patch-scripts::searchd.in Thu Jan 1 01:00:00 1970 > +++ /usr/ports/www/swish++/files/patch-scripts::searchd.in Sun Sep 26 12:30:14 2004 > @@ -0,0 +1,11 @@ > +--- scripts/searchd.in.orig Sun Sep 26 10:11:44 2004 > ++++ scripts/searchd.in Sun Sep 26 10:12:28 2004 > +@@ -29,7 +29,7 @@ > + SEARCH="search" > + SEARCH_PATH="%%I_BIN%%/$SEARCH" > + SEARCHMONITOR="%%I_BIN%%/searchmonitor" > +-CONF_FILE="/etc/swish++.conf" > ++CONF_FILE="%%PREFIX%%/etc/swish++.conf" > + PID_FILE_DEFAULT="/var/run/search.pid" > + > + ## > diff -ruN --exclude=CVS /usr/ports/www/swish++.old/files/patch-scripts::searchmonitor.in /usr/ports/www/swish++/files/patch-scripts::searchmonitor.in > --- /usr/ports/www/swish++.old/files/patch-scripts::searchmonitor.in Thu Jan 1 01:00:00 1970 > +++ /usr/ports/www/swish++/files/patch-scripts::searchmonitor.in Sun Sep 26 12:30:14 2004 > @@ -0,0 +1,11 @@ > +--- scripts/searchmonitor.in.orig Sun Sep 26 10:14:05 2004 > ++++ scripts/searchmonitor.in Sun Sep 26 10:15:03 2004 > +@@ -63,7 +63,7 @@ > + CONF_FILE="swish++.conf" > + if [ ! -f "$CONF_FILE" ] > + then > +- CONF_FILE="/etc/$CONF_FILE" > ++ CONF_FILE="%%PREFIX%%/etc/$CONF_FILE" > + [ -f "$CONF_FILE" ] || > + { echo "$ME: no configuration file found" >&2; exit 3; } > + fi > diff -ruN --exclude=CVS /usr/ports/www/swish++.old/files/patch-searchd.in /usr/ports/www/swish++/files/patch-searchd.in > --- /usr/ports/www/swish++.old/files/patch-searchd.in Sun Jan 13 05:19:27 2002 > +++ /usr/ports/www/swish++/files/patch-searchd.in Thu Jan 1 01:00:00 1970 > @@ -1,11 +0,0 @@ > ---- searchd.in.orig Sun Jan 13 12:00:35 2002 > -+++ searchd.in Sun Jan 13 12:00:53 2002 > -@@ -27,7 +27,7 @@ > - SEARCH="search" > - SEARCH_PATH="%%I_BIN%%/$SEARCH" > - SEARCHMONITOR="%%I_BIN%%/searchmonitor" > --CONF_FILE="/etc/swish++.conf" > -+CONF_FILE="%%PREFIX%%/etc/swish++.conf" > - PID_FILE_DEFAULT="/var/run/search.pid" > - > - ## > diff -ruN --exclude=CVS /usr/ports/www/swish++.old/files/patch-searchmonitor.in /usr/ports/www/swish++/files/patch-searchmonitor.in > --- /usr/ports/www/swish++.old/files/patch-searchmonitor.in Sun Jan 13 05:19:27 2002 > +++ /usr/ports/www/swish++/files/patch-searchmonitor.in Thu Jan 1 01:00:00 1970 > @@ -1,11 +0,0 @@ > ---- searchmonitor.in.orig Sun Jan 13 12:01:32 2002 > -+++ searchmonitor.in Sun Jan 13 12:01:47 2002 > -@@ -63,7 +63,7 @@ > - CONF_FILE="swish++.conf" > - if [ ! -f "$CONF_FILE" ] > - then > -- CONF_FILE="/etc/$CONF_FILE" > -+ CONF_FILE="%%PREFIX%%/etc/$CONF_FILE" > - [ -f "$CONF_FILE" ] || > - { echo "$ME: no configuration file found" >&2; exit 3; } > - fi > diff -ruN --exclude=CVS /usr/ports/www/swish++.old/pkg-plist /usr/ports/www/swish++/pkg-plist > --- /usr/ports/www/swish++.old/pkg-plist Fri Oct 24 14:05:02 2003 > +++ /usr/ports/www/swish++/pkg-plist Sun Sep 26 12:30:14 2004 > @@ -3,8 +3,9 @@ > bin/index > bin/search > bin/searchc > +bin/searchd > bin/searchmonitor > bin/splitmail > -etc/swish++.conf > etc/rc.d/swish++.sh > +etc/swish++.conf > %%SITE_PERL%%/WWW.pm > --- swish++-6.0.2.patch ends here --- > > _______________________________________________ > freebsd-ports@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-ports > To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?029a01c4a40e$8dbe8fb0$5f48ef9b>