ports/55711: [patch] unbreak www/gn and make it respect CC

Mon Aug 18 20:40:18 UTC 2003

>Number:         55711
>Category:       ports
>Synopsis:       [patch] unbreak www/gn and make it respect CC
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 18 13:40:14 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Simon Barner
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD zi025.glhnet.mhn.de 4.8-STABLE FreeBSD 4.8-STABLE #0: Thu Aug 7 04:04:01 CEST 2003 toor at zi025.glhnet.mhn.de:/usr/src/sys/compile/KISTE i386

>Description:
This port is currently marked broken and scheduled for removal on Nov 07.

This port fixes the compilation problem (please review
patch-waisgn::waisgn.c whether my patch is ok, since I am sure).

It also makes the port respect the CC environment variable.

Please also apply my PR for net/wais when you tackle this one, since it
fixes the usage of CC and CFLAGS for that port, too (the PR did not
arrive yet, so I cannot provide the id).

>How-To-Repeat:
>Fix:

Remove all the old patch files and use the following ones instead:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	./patch-Makefile
#	./patch-waisgn::waisgn.c
#	./patch-config.h
#	./patch-gn::Makefile
#	./patch-mkcache::Makefile
#	./patch-waisgn::Makefile
#
echo x - ./patch-Makefile
sed 's/^X//' >./patch-Makefile << 'END-of-./patch-Makefile'
X--- Makefile.orig	Mon Aug 18 21:37:40 2003
X+++ Makefile	Mon Aug 18 21:38:03 2003
X@@ -2,7 +2,7 @@
X #	Configurable Part.
X #
X #	Choice of Compiler.
X-CC	= cc
X+#CC	= cc
X #CC 	= gcc
X #
X #	Where to put the programs
X@@ -18,7 +18,7 @@
X # For Linux use
X # INCLUDES= -I.. -I../gn  -I/usr/include/bsd
X 
X-CFLAGS 	=  $(INCLUDES)    # -DSYSV
X+CFLAGS 	+=  $(INCLUDES)
X # Uncomment -DSYSV above for SYSV systems
X 
X #
X@@ -53,17 +53,17 @@
X 	@echo "Making gn"
X 	(cd gn; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" LIBS="$(LIBS)" \
X 		INSTALL="$(INSTALL_STRIP)" BINDIR="$(SERVBINDIR)" )
X-	
X+
X gn/sgn:	config.h 
X 	@echo "Making sgn"
X 	(cd gn; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" LIBS="$(LIBS)" \
X 		INSTALL="$(INSTALL_STRIP)" BINDIR="$(SERVBINDIR)" sgn )
X-	
X+
X mkcache/mkcache: config.h
X 	@echo "Making mkcache"
X 	(cd mkcache; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" LIBS="$(LIBS)" \
X 		INSTALL="$(INSTALL)" BINDIR="$(BINDIR)" )
X-	
X+
X waisgn/waisgn: config.h
X 	@echo "Making waisgn"
X 	@if [ -d waisgn/ir ] ; then \
END-of-./patch-Makefile
echo x - ./patch-waisgn::waisgn.c
sed 's/^X//' >./patch-waisgn::waisgn.c << 'END-of-./patch-waisgn::waisgn.c'
X--- waisgn/waisgn.c.orig	Sun Mar 12 00:59:40 1995
X+++ waisgn/waisgn.c	Mon Aug 18 21:37:40 2003
X@@ -56,7 +56,7 @@
X 	gntitle[MAXLEN],
X 	port[SMALLLEN];
X 
X-static FILE	*dfp = stderr;
X+static FILE	*dfp; /* = stderr; */
X 
X #ifndef FREEWAIS_03
X /* These aren't used by waisgn, but old WAIS libs want them */
X@@ -80,7 +80,9 @@
X 
X 	int	i = 1,
X 		argsneeded = NUMARGS;
X	
X+	dfp = stderr;
X+
X 	if ( LOG_DEBUG) {
X 		debug = TRUE;
X 		if ( (dfp = fopen( LOG_DEBUG_FILE, "w")) == (FILE *) NULL ) {
END-of-./patch-waisgn::waisgn.c
echo x - ./patch-config.h
sed 's/^X//' >./patch-config.h << 'END-of-./patch-config.h'
X--- config.h.orig	Sun Aug 20 22:00:32 1995
X+++ config.h	Mon Aug 18 21:37:40 2003
X@@ -13,12 +13,12 @@
X  */
X 
X 
X-#define ROOT_DIR	"/your/root/data/dir"
X+#define ROOT_DIR	"/usr/local/gnroot"
X /*
X  * Enter the complete path of your root data directory here.
X  */
X 
X-#define SUN_OS4
X+#define OTHER
X /*
X    Pick one of the following Operating System types which describes
X    your system and replace the SUN_OS4 value above
X@@ -66,7 +66,7 @@
X  */
X 
X 
X-#define MIME_TYPE_FILE  "/path/to/src/mkcache/gn_mime.types"
X+#define MIME_TYPE_FILE  "/usr/local/etc/gn_mime.types"
X /*
X  * This file contains information permitting mkcache to translate 
X  * ascertain the MIME "Content-type" from the suffix of a file name
X@@ -128,7 +128,7 @@
X  * If you wish to run at a different port than 70, edit this line.
X  */
X 
X-#define DECOMPRESS	"/usr/local/bin/zcat"
X+#define DECOMPRESS	"/usr/bin/zcat"
X /*
X  * This is the program which does "on the fly" decompression
X  */
END-of-./patch-config.h
echo x - ./patch-gn::Makefile
sed 's/^X//' >./patch-gn::Makefile << 'END-of-./patch-gn::Makefile'
X--- gn/Makefile.orig	Sun Mar 12 00:55:59 1995
X+++ gn/Makefile	Mon Aug 18 21:37:40 2003
X@@ -24,7 +24,7 @@
X 
X clean:
X 	@rm -f *.o *~ gn sgn
X-	
X+
X gn.o:		gn.h chkcache.h ../config.h
X sgn.o:		gn.h gn.c chkcache.h ../config.h
X pselect.o:	gn.h ../config.h
END-of-./patch-gn::Makefile
echo x - ./patch-mkcache::Makefile
sed 's/^X//' >./patch-mkcache::Makefile << 'END-of-./patch-mkcache::Makefile'
X--- mkcache/Makefile.orig	Tue Jan 25 18:42:16 1994
X+++ mkcache/Makefile	Mon Aug 18 21:37:40 2003
X@@ -8,7 +8,7 @@
X 
X clean:
X 	@rm -f *.o *~  mkcache
X-	
X+
X mkcache.o: 		mkcache.h ../config.h
X init.o: 		mkcache.h ../config.h
X content.o: 		mkcache.h ../config.h
END-of-./patch-mkcache::Makefile
echo x - ./patch-waisgn::Makefile
sed 's/^X//' >./patch-waisgn::Makefile << 'END-of-./patch-waisgn::Makefile'
X--- waisgn/Makefile.orig	Thu Feb 10 15:55:03 1994
X+++ waisgn/Makefile	Mon Aug 18 21:37:40 2003
X@@ -9,6 +9,6 @@
X 
X clean:
X 	@rm -f *.o *~ waisgn
X-	
X+
X waisgn.o:	waisgn.h ../config.h
X ../gn/www.o:	../gn/www.c ../gn/gn.h
END-of-./patch-waisgn::Makefile
exit

>Release-Note:
>Audit-Trail:
>Unformatted: