Attachment 18885 Details for Bug 33744 – file.diff

[patch] file.diff

file.diff (text/plain), 11.85 KB, created by Oliver Lehmann on 2002-01-10 00:50:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Lehmann

Created: 2002-01-10 00:50:03 UTC

Size: 11.85 KB

patch

obsolete

>diff -ruN analog.old/Makefile /usr/ports/www/analog/Makefile
>--- analog.old/Makefile	Wed Jan  9 21:09:36 2002
>+++ /usr/ports/www/analog/Makefile	Wed Jan  9 23:54:54 2002
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	analog
>-PORTVERSION=	5.03
>+PORTVERSION=	5.1
> CATEGORIES=	www
> MASTER_SITES=	http://www.analog.cx/ \
> 		http://www.monash.edu.au/mirror/analog/ \
>@@ -23,6 +23,10 @@
> 		jpeg.9:${PORTSDIR}/graphics/jpeg \
> 		png.5:${PORTSDIR}/graphics/png
> 
>+LIMGDIR?=	www/data/images
>+IMGDIR=		${PREFIX}/${LIMGDIR}
>+PLIST_SUB=	IMGDIR=${LIMGDIR}
>+
> MAN1=		analog.1
> ALL_TARGET=	analog
> 
>@@ -30,8 +34,8 @@
> 
> do-install:
> 	${MKDIR} ${PREFIX}/share/analog/lang
>-	${MKDIR} ${PREFIX}/share/analog/images
>-	${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/share/analog/images
>+	${MKDIR} ${IMGDIR}
>+	${INSTALL_DATA} ${WRKSRC}/images/* ${IMGDIR}
> 	${INSTALL_DATA} ${WRKSRC}/lang/* ${PREFIX}/share/analog/lang
> 	${INSTALL_PROGRAM} ${WRKSRC}/analog ${PREFIX}/bin
> .if !exists(${PREFIX}/etc/analog.cfg)
>diff -ruN analog.old/distinfo /usr/ports/www/analog/distinfo
>--- analog.old/distinfo	Wed Jan  9 21:09:36 2002
>+++ /usr/ports/www/analog/distinfo	Wed Jan  9 23:55:28 2002
>@@ -1 +1 @@
>-MD5 (analog-5.03.tar.gz) = 6a7b77615419e9a8ee1b78e90b88df34
>+MD5 (analog-5.1.tar.gz) = 5e84eaca93a2de5c305e0da0e20e9e42
>diff -ruN analog.old/files/patch-aa /usr/ports/www/analog/files/patch-aa
>--- analog.old/files/patch-aa	Wed Jan  9 21:09:36 2002
>+++ /usr/ports/www/analog/files/patch-aa	Wed Jan  9 23:54:54 2002
>@@ -1,45 +1,39 @@
>---- src/Makefile.orig	Tue May  1 03:38:33 2001
>-+++ src/Makefile	Fri May  4 05:15:57 2001
>-@@ -1,12 +1,14 @@
>- # Makefile for analog 5.0
>+--- src/Makefile.orig	Wed Jan  9 21:16:22 2002
>++++ src/Makefile	Wed Jan  9 21:18:38 2002
>+@@ -1,14 +1,20 @@
>+ # Makefile for analog 5.1
>  # Please read docs/Readme.html, or http://www.analog.cx/
> -CC = gcc           # which compiler to use: eg cc, acc, gcc. NB Different
> +CC ?= gcc           # which compiler to use: eg cc, acc, gcc. NB Different
>  #                    compilers need different CFLAGS, e.g., -O instead of -O2.
>+ MAKE = make        # which "make" to use
> -CFLAGS = -O2    # options, e.g. for optimisation or ANSI compilation.
>-+LOCALBASE?=/usr/local
> +CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/gd
> +#CFLAGS = -O2    # options, e.g. for optimisation or ANSI compilation.
>  #                 HP/UX cc needs CFLAGS = -Aa (HP/UX 9) or -Ae (HP/UX 10)
>+ #                 BeOS needs CFLAGS = -O2 -Wl,-L/boot/home/config/lib
>  #                 BS2000/OSD needs CFLAGS = -XLLML -XLLMK
>  #                 NeXTSTEP needs CFLAGS = -O2 -pipe -no-precomp 
> -DEFS =          # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
>++DEFS = -DLOGFILE=\"/var/log/httpd-access.log\" \
>++       -DIMAGEDIR=\"/images/\" \
>++       -DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\" \
>++       -DLANGDIR=\"${PREFIX}/share/analog/lang/\" \
>++       -DCONFIGDIR=\"$(PREFIX)/share/analog/\"
> +#DEFS =          # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
>  #                 ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ...
>  #                 ... -DEBCDIC -DUSE_PLAIN_SETJMP -DHAVE_GD -DHAVE_PCRE ...
>  #                 ... -DNEED_STRCMP -DNEED_MEMMOVE -DNEED_STRTOUL ...
>-@@ -19,10 +21,23 @@
>- #                 64-bit Solaris needs -DHAVE_ADDR_T
>- #                 DYNIX/ptx needs -D_SOCKET_VERSION=11
>- #                 MPE/iX needs -D_POSIX_SOURCE -D_SOCKET_SOURCE
>-+DEFS =	-DLOGFILE=\"/var/log/httpd-access.log\" \
>-+	-DIMAGEDIR=\"/images/\" \
>-+	-DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\" \
>-+	-DLANGDIR=\"${PREFIX}/share/analog/lang/\" \
>-+	-DCONFIGDIR=\"$(PREFIX)/share/analog/\"
>-+	
>- #
>+@@ -25,6 +31,12 @@
>  OS = UNIX         # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS
>  #                   RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390
>--LIBS = -lm  # extra libraries needed; almost all platforms (but not OS X)
>-+LIBS = -lm
>+ LIBS = -lm  # extra libraries needed; most platforms (but not OS X or BeOS)
> +
> +.if !defined(WITHOUT_GD)
>-+DEFS+=	-DHAVE_GD
>-+LIBS+=  -L${LOCALBASE}/lib -lgd -lpng -ljpeg -lz 
>++DEFS+= -DHAVE_GD
>++LIBS+=  -L${LOCALBASE}/lib -lgd -lpng -ljpeg -lz
> +.endif
> +
>-+# extra libraries needed; almost all platforms (but not OS X)
>  #               need -lm LAST
>  #             if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz
>  #             if you defined HAVE_PCRE above you also need -lpcre
>diff -ruN analog.old/files/patch-ab /usr/ports/www/analog/files/patch-ab
>--- analog.old/files/patch-ab	Wed Jan  9 21:09:36 2002
>+++ /usr/ports/www/analog/files/patch-ab	Wed Jan  9 23:54:54 2002
>@@ -1,6 +1,6 @@
>---- src/tree.c.orig	Thu May  3 19:31:50 2001
>-+++ src/tree.c	Thu May  3 19:32:22 2001
>-@@ -803,8 +803,16 @@
>+--- src/tree.c.orig	Wed Jan  9 21:20:12 2002
>++++ src/tree.c	Wed Jan  9 21:20:24 2002
>+@@ -886,8 +886,16 @@
>      }
>      else if (strstr(whole, "Linux") != NULL || strstr(whole, "linux") != NULL)
>        *name = "Unix:Linux";
>diff -ruN analog.old/files/patch-ac /usr/ports/www/analog/files/patch-ac
>--- analog.old/files/patch-ac	Wed Jan  9 21:09:36 2002
>+++ /usr/ports/www/analog/files/patch-ac	Wed Jan  9 23:54:54 2002
>@@ -1,9 +1,9 @@
>---- analog.cfg.orig	Thu May  3 19:27:47 2001
>-+++ analog.cfg	Thu May  3 19:27:15 2001
>-@@ -9,7 +9,8 @@
>- # There is a much more extensive configuration file in examples/big.cfg
>+--- analog.cfg.orig	Wed Jan  9 21:21:05 2002
>++++ analog.cfg	Wed Jan  9 21:21:22 2002
>+@@ -10,7 +10,8 @@
>  #
>- # If you need a LOGFORMAT command it must go here, above the LOGFILE commands.
>+ # If you need a LOGFORMAT command (most people don't -- try it without first!),
>+ # it must go here, above the LOGFILE commands.
> -LOGFILE logfile.log
> +LOGFORMAT COMBINED
> +LOGFILE /var/log/httpd-access.log
>diff -ruN analog.old/pkg-plist /usr/ports/www/analog/pkg-plist
>--- analog.old/pkg-plist	Wed Jan  9 21:09:36 2002
>+++ /usr/ports/www/analog/pkg-plist	Wed Jan  9 23:54:54 2002
>@@ -14,7 +14,9 @@
> share/analog/lang/bgmdom.tab
> share/analog/lang/br.lng
> share/analog/lang/bra.lng
>+share/analog/lang/bradesc.txt
> share/analog/lang/bradom.tab
>+share/analog/lang/brdesc.txt
> share/analog/lang/brdom.tab
> share/analog/lang/cat.lng
> share/analog/lang/cata.lng
>@@ -205,120 +207,119 @@
> %%PORTDOCS%%share/doc/analog/wasnew4.html
> %%PORTDOCS%%share/doc/analog/webworks.html
> %%PORTDOCS%%share/doc/analog/whatsnew.html
>-www/data/images/analogo.gif
>-www/data/images/analogo.png
>-www/data/images/bara1.gif
>-www/data/images/bara1.png
>-www/data/images/bara16.gif
>-www/data/images/bara16.png
>-www/data/images/bara2.gif
>-www/data/images/bara2.png
>-www/data/images/bara32.gif
>-www/data/images/bara32.png
>-www/data/images/bara4.gif
>-www/data/images/bara4.png
>-www/data/images/bara8.gif
>-www/data/images/bara8.png
>-www/data/images/barb1.gif
>-www/data/images/barb1.png
>-www/data/images/barb16.gif
>-www/data/images/barb16.png
>-www/data/images/barb2.gif
>-www/data/images/barb2.png
>-www/data/images/barb32.gif
>-www/data/images/barb32.png
>-www/data/images/barb4.gif
>-www/data/images/barb4.png
>-www/data/images/barb8.gif
>-www/data/images/barb8.png
>-www/data/images/barc1.gif
>-www/data/images/barc1.png
>-www/data/images/barc16.gif
>-www/data/images/barc16.png
>-www/data/images/barc2.gif
>-www/data/images/barc2.png
>-www/data/images/barc32.gif
>-www/data/images/barc32.png
>-www/data/images/barc4.gif
>-www/data/images/barc4.png
>-www/data/images/barc8.gif
>-www/data/images/barc8.png
>-www/data/images/bard1.gif
>-www/data/images/bard1.png
>-www/data/images/bard16.gif
>-www/data/images/bard16.png
>-www/data/images/bard2.gif
>-www/data/images/bard2.png
>-www/data/images/bard32.gif
>-www/data/images/bard32.png
>-www/data/images/bard4.gif
>-www/data/images/bard4.png
>-www/data/images/bard8.gif
>-www/data/images/bard8.png
>-www/data/images/bare1.gif
>-www/data/images/bare1.png
>-www/data/images/bare16.gif
>-www/data/images/bare16.png
>-www/data/images/bare2.gif
>-www/data/images/bare2.png
>-www/data/images/bare32.gif
>-www/data/images/bare32.png
>-www/data/images/bare4.gif
>-www/data/images/bare4.png
>-www/data/images/bare8.gif
>-www/data/images/bare8.png
>-www/data/images/barf1.gif
>-www/data/images/barf1.png
>-www/data/images/barf16.gif
>-www/data/images/barf16.png
>-www/data/images/barf2.gif
>-www/data/images/barf2.png
>-www/data/images/barf32.gif
>-www/data/images/barf32.png
>-www/data/images/barf4.gif
>-www/data/images/barf4.png
>-www/data/images/barf8.gif
>-www/data/images/barf8.png
>-www/data/images/barg1.gif
>-www/data/images/barg1.png
>-www/data/images/barg16.gif
>-www/data/images/barg16.png
>-www/data/images/barg2.gif
>-www/data/images/barg2.png
>-www/data/images/barg32.gif
>-www/data/images/barg32.png
>-www/data/images/barg4.gif
>-www/data/images/barg4.png
>-www/data/images/barg8.gif
>-www/data/images/barg8.png
>-www/data/images/barh1.gif
>-www/data/images/barh1.png
>-www/data/images/barh16.gif
>-www/data/images/barh16.png
>-www/data/images/barh2.gif
>-www/data/images/barh2.png
>-www/data/images/barh32.gif
>-www/data/images/barh32.png
>-www/data/images/barh4.gif
>-www/data/images/barh4.png
>-www/data/images/barh8.gif
>-www/data/images/barh8.png
>-www/data/images/html2.gif
>-www/data/images/html2.png
>-www/data/images/sq0.png
>-www/data/images/sq1.png
>-www/data/images/sq2.png
>-www/data/images/sq3.png
>-www/data/images/sq4.png
>-www/data/images/sq5.png
>-www/data/images/sq6.png
>-www/data/images/sq7.png
>-www/data/images/sq8.png
>-www/data/images/sq9.png
>-www/data/images/sqg.png
>+%%IMGDIR%%/analogo.gif
>+%%IMGDIR%%/analogo.png
>+%%IMGDIR%%/bara1.gif
>+%%IMGDIR%%/bara1.png
>+%%IMGDIR%%/bara16.gif
>+%%IMGDIR%%/bara16.png
>+%%IMGDIR%%/bara2.gif
>+%%IMGDIR%%/bara2.png
>+%%IMGDIR%%/bara32.gif
>+%%IMGDIR%%/bara32.png
>+%%IMGDIR%%/bara4.gif
>+%%IMGDIR%%/bara4.png
>+%%IMGDIR%%/bara8.gif
>+%%IMGDIR%%/bara8.png
>+%%IMGDIR%%/barb1.gif
>+%%IMGDIR%%/barb1.png
>+%%IMGDIR%%/barb16.gif
>+%%IMGDIR%%/barb16.png
>+%%IMGDIR%%/barb2.gif
>+%%IMGDIR%%/barb2.png
>+%%IMGDIR%%/barb32.gif
>+%%IMGDIR%%/barb32.png
>+%%IMGDIR%%/barb4.gif
>+%%IMGDIR%%/barb4.png
>+%%IMGDIR%%/barb8.gif
>+%%IMGDIR%%/barb8.png
>+%%IMGDIR%%/barc1.gif
>+%%IMGDIR%%/barc1.png
>+%%IMGDIR%%/barc16.gif
>+%%IMGDIR%%/barc16.png
>+%%IMGDIR%%/barc2.gif
>+%%IMGDIR%%/barc2.png
>+%%IMGDIR%%/barc32.gif
>+%%IMGDIR%%/barc32.png
>+%%IMGDIR%%/barc4.gif
>+%%IMGDIR%%/barc4.png
>+%%IMGDIR%%/barc8.gif
>+%%IMGDIR%%/barc8.png
>+%%IMGDIR%%/bard1.gif
>+%%IMGDIR%%/bard1.png
>+%%IMGDIR%%/bard16.gif
>+%%IMGDIR%%/bard16.png
>+%%IMGDIR%%/bard2.gif
>+%%IMGDIR%%/bard2.png
>+%%IMGDIR%%/bard32.gif
>+%%IMGDIR%%/bard32.png
>+%%IMGDIR%%/bard4.gif
>+%%IMGDIR%%/bard4.png
>+%%IMGDIR%%/bard8.gif
>+%%IMGDIR%%/bard8.png
>+%%IMGDIR%%/bare1.gif
>+%%IMGDIR%%/bare1.png
>+%%IMGDIR%%/bare16.gif
>+%%IMGDIR%%/bare16.png
>+%%IMGDIR%%/bare2.gif
>+%%IMGDIR%%/bare2.png
>+%%IMGDIR%%/bare32.gif
>+%%IMGDIR%%/bare32.png
>+%%IMGDIR%%/bare4.gif
>+%%IMGDIR%%/bare4.png
>+%%IMGDIR%%/bare8.gif
>+%%IMGDIR%%/bare8.png
>+%%IMGDIR%%/barf1.gif
>+%%IMGDIR%%/barf1.png
>+%%IMGDIR%%/barf16.gif
>+%%IMGDIR%%/barf16.png
>+%%IMGDIR%%/barf2.gif
>+%%IMGDIR%%/barf2.png
>+%%IMGDIR%%/barf32.gif
>+%%IMGDIR%%/barf32.png
>+%%IMGDIR%%/barf4.gif
>+%%IMGDIR%%/barf4.png
>+%%IMGDIR%%/barf8.gif
>+%%IMGDIR%%/barf8.png
>+%%IMGDIR%%/barg1.gif
>+%%IMGDIR%%/barg1.png
>+%%IMGDIR%%/barg16.gif
>+%%IMGDIR%%/barg16.png
>+%%IMGDIR%%/barg2.gif
>+%%IMGDIR%%/barg2.png
>+%%IMGDIR%%/barg32.gif
>+%%IMGDIR%%/barg32.png
>+%%IMGDIR%%/barg4.gif
>+%%IMGDIR%%/barg4.png
>+%%IMGDIR%%/barg8.gif
>+%%IMGDIR%%/barg8.png
>+%%IMGDIR%%/barh1.gif
>+%%IMGDIR%%/barh1.png
>+%%IMGDIR%%/barh16.gif
>+%%IMGDIR%%/barh16.png
>+%%IMGDIR%%/barh2.gif
>+%%IMGDIR%%/barh2.png
>+%%IMGDIR%%/barh32.gif
>+%%IMGDIR%%/barh32.png
>+%%IMGDIR%%/barh4.gif
>+%%IMGDIR%%/barh4.png
>+%%IMGDIR%%/barh8.gif
>+%%IMGDIR%%/barh8.png
>+%%IMGDIR%%/html2.gif
>+%%IMGDIR%%/html2.png
>+%%IMGDIR%%/sq0.png
>+%%IMGDIR%%/sq1.png
>+%%IMGDIR%%/sq2.png
>+%%IMGDIR%%/sq3.png
>+%%IMGDIR%%/sq4.png
>+%%IMGDIR%%/sq5.png
>+%%IMGDIR%%/sq6.png
>+%%IMGDIR%%/sq7.png
>+%%IMGDIR%%/sq8.png
>+%%IMGDIR%%/sq9.png
>+%%IMGDIR%%/sqg.png
> @dirrm share/analog/lang
> @dirrm share/analog
> %%PORTDOCS%%@dirrm share/doc/analog
>-@unexec rmdir %D/www/data/images 2>/dev/null || true
>-@unexec rmdir %D/www/data 2>/dev/null || true
>-@unexec rmdir %D/www 2>/dev/null || true
>+@unexec rmdir %D/%%IMGDIR%% 2>/dev/null || true
>+

Actions: View | Diff

Attachments on bug 33744: 18885