www/87826: Fix patch ac file to resolve hard coded lib path.
todd at thisisa.com
todd at thisisa.com
Sat Oct 22 00:00:27 PDT 2005
>Number: 87826
>Category: www
>Synopsis: Fix patch ac file to resolve hard coded lib path.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-www
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 22 07:00:25 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Todd
>Release: FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD yes.thisisa.net 4.11-STABLE FreeBSD 4.11-STABLE #18: Wed Sep 14 21:09:41 MST 2005 root at yes.thisisa.net:/usr/obj/usr/src/sys/YES i386
>Description:
Fix of a needed LOCALBASE in patch file.
>How-To-Repeat:
>Fix:
# 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:
#
# /usr/ports/www/http-analyze/
# /usr/ports/www/http-analyze/Makefile
# /usr/ports/www/http-analyze/distinfo
# /usr/ports/www/http-analyze/pkg-descr
# /usr/ports/www/http-analyze/pkg-plist
# /usr/ports/www/http-analyze/files
# /usr/ports/www/http-analyze/files/patch-ab
# /usr/ports/www/http-analyze/files/patch-ac
# /usr/ports/www/http-analyze/files/patch-Makefile
#
echo c - /usr/ports/www/http-analyze/
mkdir -p /usr/ports/www/http-analyze/ > /dev/null 2>&1
echo x - /usr/ports/www/http-analyze/Makefile
sed 's/^X//' >/usr/ports/www/http-analyze/Makefile << 'END-of-/usr/ports/www/http-analyze/Makefile'
X# New ports collection makefile for: http-analyze
X# Date created: Fri Jul 11 06:11:41 CEST 1997
X# Whom: Andreas Klemm <andreas at klemm.gtn.com>
X#
X# $FreeBSD: ports/www/http-analyze/Makefile,v 1.25 2004/06/11 08:37:02 pav Exp $
X
XPORTNAME= http-analyze
XPORTVERSION= 2.01
XPORTREVISION= 5
XCATEGORIES= www
XMASTER_SITES= ftp://ftp.mayn.de/pub/unix/network/www/
XDISTNAME= ${PORTNAME}${PORTVERSION}
XEXTRACT_SUFX= -src.tar.gz
X
XMAINTAINER= tmortensen at gmail.com
XCOMMENT= A fast Log-Analyzer for web servers
X
XPATCH_DEPENDS= gif2png:${PORTSDIR}/graphics/gif2png
XLIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
X
XMAN1= http-analyze.1
X
Xpost-patch:
X @${ECHO_MSG} "Converting GIFs to PNG format"
X @${FIND} "${WRKSRC}/files/btn" -name "*.gif" -type f \
X -exec gif2png -d -O {} \;
X
X.include <bsd.port.mk>
END-of-/usr/ports/www/http-analyze/Makefile
echo x - /usr/ports/www/http-analyze/distinfo
sed 's/^X//' >/usr/ports/www/http-analyze/distinfo << 'END-of-/usr/ports/www/http-analyze/distinfo'
XMD5 (http-analyze2.01-src.tar.gz) = d17abdc0e1d43fbb2563ff2c9eb127f7
XSIZE (http-analyze2.01-src.tar.gz) = 483648
END-of-/usr/ports/www/http-analyze/distinfo
echo x - /usr/ports/www/http-analyze/pkg-descr
sed 's/^X//' >/usr/ports/www/http-analyze/pkg-descr << 'END-of-/usr/ports/www/http-analyze/pkg-descr'
Xhttp-analyze analyzes the logfile of a web server and creates
Xa summary of the server's access load and the efficiency of
Xcaching mechanisms in
X
X o tabular
X o graphical
X o and three-dimensional form.
X
Xhttp-analyze recognizes logfiles in Common Logfile Format and has
Xbeen highly optimized for processing huge logfiles in short
Xupdate-intervals.
X
XWWW: http://www.http-analyze.org
END-of-/usr/ports/www/http-analyze/pkg-descr
echo x - /usr/ports/www/http-analyze/pkg-plist
sed 's/^X//' >/usr/ports/www/http-analyze/pkg-plist << 'END-of-/usr/ports/www/http-analyze/pkg-plist'
Xbin/ha-setup
Xbin/http-analyze
Xlib/http-analyze/3Dlogo.wrl.gz
Xlib/http-analyze/3Dprolog.wrl
Xlib/http-analyze/3DshelfMotion.wav
Xlib/http-analyze/TLD
Xlib/http-analyze/btn/RAG_sb.png
Xlib/http-analyze/btn/RAG_sw.png
Xlib/http-analyze/btn/agents_off.png
Xlib/http-analyze/btn/agents_on.png
Xlib/http-analyze/btn/avload_off.png
Xlib/http-analyze/btn/avload_on.png
Xlib/http-analyze/btn/cntry_off.png
Xlib/http-analyze/btn/cntry_on.png
Xlib/http-analyze/btn/days_off.png
Xlib/http-analyze/btn/days_on.png
Xlib/http-analyze/btn/files_off.png
Xlib/http-analyze/btn/files_on.png
Xlib/http-analyze/btn/globe.jpg
Xlib/http-analyze/btn/ha2.0_sm.png
Xlib/http-analyze/btn/netstore_sb.png
Xlib/http-analyze/btn/netstore_sw.png
Xlib/http-analyze/btn/refers_off.png
Xlib/http-analyze/btn/refers_on.png
Xlib/http-analyze/btn/rfiles_off.png
Xlib/http-analyze/btn/rfiles_on.png
Xlib/http-analyze/btn/rsites_off.png
Xlib/http-analyze/btn/rsites_on.png
Xlib/http-analyze/btn/sites_off.png
Xlib/http-analyze/btn/sites_on.png
Xlib/http-analyze/btn/topdom_off.png
Xlib/http-analyze/btn/topdom_on.png
Xlib/http-analyze/btn/topref_off.png
Xlib/http-analyze/btn/topref_on.png
Xlib/http-analyze/btn/topuag_off.png
Xlib/http-analyze/btn/topuag_on.png
Xlib/http-analyze/btn/topurl_off.png
Xlib/http-analyze/btn/topurl_on.png
Xlib/http-analyze/btn/totals_off.png
Xlib/http-analyze/btn/totals_on.png
Xlib/http-analyze/btn/year_off.png
Xlib/http-analyze/btn/year_on.png
Xlib/http-analyze/bugreport.html
Xlib/http-analyze/rotate-httpd
Xlib/http-analyze/sample.conf
X%%PORTDOCS%%%%DOCSDIR%%/http-analyze.pdf
X%%PORTDOCS%%%%DOCSDIR%%/http-analyze.ps
X at dirrm lib/http-analyze/btn
X at dirrm lib/http-analyze
X%%PORTDOCS%%@dirrm %%DOCSDIR%%
END-of-/usr/ports/www/http-analyze/pkg-plist
echo c - /usr/ports/www/http-analyze/files
mkdir -p /usr/ports/www/http-analyze/files > /dev/null 2>&1
echo x - /usr/ports/www/http-analyze/files/patch-ab
sed 's/^X//' >/usr/ports/www/http-analyze/files/patch-ab << 'END-of-/usr/ports/www/http-analyze/files/patch-ab'
X--- config.h.orig Thu Apr 2 15:53:41 1998
X+++ config.h Sat Apr 18 11:31:36 1998
X@@ -167,7 +167,7 @@
X # define HA_LIBDIR "/usr/local/lib/http-analyze"
X #endif
X
X-#define REGID_FILE HA_LIBDIR "/REGID"
X-#define BUTTON_DIR HA_LIBDIR "/btn"
X+#define REGID_FILE "!!REGID_FILE!!"
X+#define BUTTON_DIR "!!BUTTON_DIR!!"
X
X /* End of user configuration section. */
END-of-/usr/ports/www/http-analyze/files/patch-ab
echo x - /usr/ports/www/http-analyze/files/patch-ac
sed 's/^X//' >/usr/ports/www/http-analyze/files/patch-ac << 'END-of-/usr/ports/www/http-analyze/files/patch-ac'
X--- images.c.orig Sun May 31 15:06:53 1998
X+++ images.c Sat May 29 18:08:54 2004
X@@ -196,7 +196,7 @@
X basey+(rangey/2), "No hits for this month!", black);
X gdImageInterlace(im, 1); /* make it interlaced */
X if ((out = fopen(name, "wb")) != NULL) {
X- gdImageGif(im, out);
X+ gdImagePng(im, out);
X (void) fclose(out);
X }
X gdImageDestroy(im);
X@@ -286,7 +286,7 @@
X
X gdImageInterlace(im, 1); /* make it interlaced */
X if ((out = fopen(name, "wb")) != NULL) {
X- gdImageGif(im, out);
X+ gdImagePng(im, out);
X (void) fclose(out);
X }
X gdImageDestroy(im);
X@@ -441,7 +441,7 @@
X
X gdImageInterlace(im, 1); /* make it interlaced */
X if ((out = fopen(name, "wb")) != NULL) {
X- gdImageGif(im, out);
X+ gdImagePng(im, out);
X (void) fclose(out);
X }
X gdImageDestroy(im);
X@@ -529,7 +529,7 @@
X
X gdImageInterlace(im, 1); /* make it interlaced */
X if ((out = fopen(name, "wb")) != NULL) {
X- gdImageGif(im, out);
X+ gdImagePng(im, out);
X (void) fclose(out);
X }
X gdImageDestroy(im);
X@@ -666,7 +666,7 @@
X gdImageInterlace(im, 1); /* make it interlaced */
X gdImageInterlace(im, 1); /* make it interlaced */
X if ((out = fopen(name, "wb")) != NULL) {
X- gdImageGif(im, out);
X+ gdImagePng(im, out);
X (void) fclose(out);
X }
X gdImageDestroy(im);
X@@ -752,7 +752,7 @@
X
X gdImageInterlace(im, 1); /* make it interlaced */
X if ((out = fopen(name, "wb")) != NULL) {
X- gdImageGif(im, out);
X+ gdImagePng(im, out);
X (void) fclose(out);
X }
X gdImageDestroy(im);
X@@ -988,7 +988,7 @@
X
X gdImageInterlace(im, 1); /* make it interlaced */
X if ((out = fopen(name, "wb")) != NULL) {
X- gdImageGif(im, out);
X+ gdImagePng(im, out);
X (void) fclose(out);
X }
X gdImageDestroy(im);
X@@ -996,37 +996,37 @@
X }
X
X ICON_TAB icon_tab[] = {
X- { "btn/sq_green.gif", 0, 204, 0 },
X- { "btn/sq_blue.gif", 0, 0, 255 },
X- { "btn/sq_red.gif", 255, 0, 0 },
X- { "btn/sq_orange.gif", 222, 102, 0 },
X- { "btn/sq_yellow.gif", 242, 242, 0 },
X- { "btn/sq_magenta.gif", 153, 0, 255 },
X- { "btn/sq_grey.gif", 204, 204, 204 }
X+ { "btn/sq_green.png", 0, 204, 0 },
X+ { "btn/sq_blue.png", 0, 0, 255 },
X+ { "btn/sq_red.png", 255, 0, 0 },
X+ { "btn/sq_orange.png", 222, 102, 0 },
X+ { "btn/sq_yellow.png", 242, 242, 0 },
X+ { "btn/sq_magenta.png", 153, 0, 255 },
X+ { "btn/sq_grey.png", 204, 204, 204 }
X };
X
X BTN_TAB buttons[] = { /* various images */
X- { "btn/netstore_sw.gif", "Netstore", 0, 0 },
X- { "btn/netstore_sb.gif", "Netstore", 0, 0 },
X- { "btn/RAG_sw.gif", NULL, 0, 0 },
X- { "btn/RAG_sb.gif", NULL, 0, 0 },
X- { "btn/year_off.gif", "summary", 0, 0 },
X- { "btn/totals_off.gif", "totals", 0, 0 },
X- { "btn/days_off.gif", "days", 0, 0 },
X+ { "btn/netstore_sw.png", "Netstore", 0, 0 },
X+ { "btn/netstore_sb.png", "Netstore", 0, 0 },
X+ { "btn/RAG_sw.png", NULL, 0, 0 },
X+ { "btn/RAG_sb.png", NULL, 0, 0 },
X+ { "btn/year_off.png", "summary", 0, 0 },
X+ { "btn/totals_off.png", "totals", 0, 0 },
X+ { "btn/days_off.png", "days", 0, 0 },
X { NULL, NULL, 0, 0 },
X { NULL, NULL, 0, 0 },
X- { "btn/avload_off.gif", "avload", 0, 0 },
X- { "btn/topurl_off.gif", "topurl", 0, 0 },
X- { "btn/topdom_off.gif", "topdom", 0, 0 },
X- { "btn/topuag_off.gif", "topuag", 0, 0 },
X- { "btn/topref_off.gif", "topref", 0, 0 },
X- { "btn/cntry_off.gif", "country", 0, 0 },
X- { "btn/files_off.gif", "files", 0, 0 },
X- { "btn/rfiles_off.gif", "rfiles", 0, 0 },
X- { "btn/sites_off.gif", "sites", 0, 0 },
X- { "btn/rsites_off.gif", "rsites", 0, 0 },
X- { "btn/agents_off.gif", "agents", 0, 0 },
X- { "btn/refers_off.gif", "refers", 0, 0 }
X+ { "btn/avload_off.png", "avload", 0, 0 },
X+ { "btn/topurl_off.png", "topurl", 0, 0 },
X+ { "btn/topdom_off.png", "topdom", 0, 0 },
X+ { "btn/topuag_off.png", "topuag", 0, 0 },
X+ { "btn/topref_off.png", "topref", 0, 0 },
X+ { "btn/cntry_off.png", "country", 0, 0 },
X+ { "btn/files_off.png", "files", 0, 0 },
X+ { "btn/rfiles_off.png", "rfiles", 0, 0 },
X+ { "btn/sites_off.png", "sites", 0, 0 },
X+ { "btn/rsites_off.png", "rsites", 0, 0 },
X+ { "btn/agents_off.png", "agents", 0, 0 },
X+ { "btn/refers_off.png", "refers", 0, 0 }
X };
X
X static void mkIcon(char * const fname, ICON_TAB * const tp) {
X@@ -1037,7 +1037,7 @@
X (void) gdImageColorAllocate(im, tp->color[0], tp->color[1], tp->color[2]);
X gdImageInterlace(im, 1);
X if ((out=fopen(fname, "wb")) != NULL) {
X- gdImageGif(im, out);
X+ gdImagePng(im, out);
X (void) fclose(out);
X }
X gdImageDestroy(im);
X@@ -1071,7 +1071,7 @@
X if (!buttons[idx].name)
X continue;
X if ((fp = fopen(buttons[idx].name, "rb")) != NULL) {
X- ip = gdImageCreateFromGif(fp);
X+ ip = gdImageCreateFromPng(fp);
X (void) fclose(fp);
X buttons[idx].wid = gdImageSX(ip);
X buttons[idx].ht = gdImageSY(ip);
END-of-/usr/ports/www/http-analyze/files/patch-ac
echo x - /usr/ports/www/http-analyze/files/patch-Makefile
sed 's/^X//' >/usr/ports/www/http-analyze/files/patch-Makefile << 'END-of-/usr/ports/www/http-analyze/files/patch-Makefile'
X--- Makefile.orig Sun May 31 15:06:53 1998
X+++ Makefile Sat Aug 30 01:07:19 2003
X@@ -28,9 +28,9 @@
X # SVR4 /usr/share/man/cat1 - 1
X # Linux /usr/local/man/man1 - man
X #
X-LOCALLIB = /usr/local/lib
X-LOCALBIN = /usr/local/bin
X-LOCALMAN = /usr/local/man/cat1
X+LOCALLIB = $(PREFIX)/lib
X+LOCALBIN = $(PREFIX)/bin
X+LOCALMAN = $(PREFIX)/man/man1
X
X # Program to use for compressing the manpage.
X # If set to 'true', no compression is applied.
X@@ -41,12 +41,12 @@
X # Extension of the source to be installed as manpage.
X # if it is set to '1', the pre-formatted format is used,
X # if it is set to 'man', the source format is used.
X-#EXTENSION = man
X-EXTENSION = 1
X+EXTENSION = man
X+#EXTENSION = 1
X
X # Location of the GD library and include files.
X-GDLIB = /usr/local/lib/libgd.a
X-GDINC = /usr/local/include
X+GDLIB = ${LOCALBASE}/lib/libgd.a
X+GDINC = ${LOCALBASE}/include
X
X #
X # Platform selection
X@@ -74,9 +74,9 @@
X # If you prefer optimization of the generated code, uncomment the
X # next line and comment out the -g definition.
X #
X-#CC = cc
X+CC ?= cc
X #OPTIM = -O2
X-OPTIM = -g
X+#OPTIM = -g
X
X # Remove NDEBUG to include various assertion checks in the program.
X #COMDEFS = -DTIME_STATS -DNDEBUG
X@@ -88,6 +88,10 @@
X # for the NETWARE platform.
X #
X
X+# FreeBSD
X+DEFINES = -DBSD -DHA_LIBDIR="$(LOCALLIB)/http-analyze"
X+PLATFORM =
X+
X # IRIX
X #
X #DEFINES = -DIRIX $(COMDEFS)
X@@ -139,10 +143,10 @@
X #DEFINES = -DNETWARE $(COMDEFS)
X #PLATFORM =
X
X-CFLAGS = $(OPTIM) $(PLATFORM) $(DEFINES)
X+CFLAGS += $(OPTIM) $(PLATFORM) $(DEFINES)
X LDFLAGS =
X LINT = lint -Dunix -Xa -u
X-LIBS = -lm
X+LIBS = -lm -L$(LOCALLIB) -lpng
X NROFF = nroff
X NRFLAGS = -u1 -man
X
X@@ -212,10 +216,12 @@
X cp http-analyze.$(EXTENSION) $(LOCALMAN)/http-analyze.1
X chmod 755 $(LOCALBIN)/http-analyze $(LOCALBIN)/ha-setup
X chmod 444 $(LOCALMAN)/http-analyze.1
X- chown bin.bin $(LOCALBIN)/http-analyze $(LOCALBIN)/ha-setup
X- $(COMPRESS) $(LOCALMAN)/http-analyze.1
X+ chown bin:bin $(LOCALBIN)/http-analyze $(LOCALBIN)/ha-setup
X+ -mkdir -p $(PREFIX)/share/doc/http-analyze
X+ cp http-analyze.pdf http-analyze.ps $(PREFIX)/share/doc/http-analyze
X -mkdir -p $(LOCALLIB)/http-analyze/btn
X- cp files/3D* files/TLD files/bugreport.html sample.conf $(LOCALLIB)/http-analyze/
X+ cp files/3D* files/TLD files/bugreport.html rotate-httpd sample.conf \
X+ $(LOCALLIB)/http-analyze/
X cp files/btn/* $(LOCALLIB)/http-analyze/btn/
X @echo "\nNow run 'ha-setup' to configure http-analyze for your server (Unix only).\n"
X
END-of-/usr/ports/www/http-analyze/files/patch-Makefile
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-www
mailing list