Fix package building error

Noticed by: "rob" <rob@piethief.co.uk>

Move analog files from ${PREFIX}/lib/analog to ${PREFIX}/share/analog
Make CC / CFLAGS clean
Bumb PORTREVISION

3 files changed, 153 insertions, 138 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index 4da276ac2b46..29425202a81d 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	analog
 PORTVERSION=	4.16
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.analog.cx/ \
 		http://www.monash.edu.au/mirror/analog/ \
@@ -23,10 +24,10 @@ ALL_TARGET=	analog
 
 do-install:
 	${MKDIR} ${PREFIX}/share/doc/analog
-	${MKDIR} ${PREFIX}/lib/analog/lang
+	${MKDIR} ${PREFIX}/share/analog/lang
 	${MKDIR} ${PREFIX}/www/data/images
 	${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/www/data/images
-	${INSTALL_DATA} ${WRKSRC}/lang/* ${PREFIX}/lib/analog/lang
+	${INSTALL_DATA} ${WRKSRC}/lang/* ${PREFIX}/share/analog/lang
 	${INSTALL_PROGRAM} ${WRKSRC}/analog ${PREFIX}/bin
 .if !exists(${PREFIX}/etc/analog.cfg)
 	${INSTALL_DATA} ${WRKSRC}/analog.cfg ${PREFIX}/etc
diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa
index 21c990f2af34..34f3b8af5543 100644
--- a/www/analog/files/patch-aa
+++ b/www/analog/files/patch-aa
@@ -1,6 +1,14 @@
---- Makefile.orig	Thu Feb  1 08:58:17 2001
-+++ Makefile	Sun Feb 11 16:06:14 2001
-@@ -7,7 +7,7 @@
+--- Makefile.orig	Tue Feb 13 07:09:08 2001
++++ Makefile	Wed Apr 11 17:28:09 2001
+@@ -1,13 +1,13 @@
+ # Makefile for analog 4.16
+ # 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.
+-CEXTRAFLAGS = -O2  # options, e.g. for optimisation or ANSI compilation.
++#CEXTRAFLAGS = -O2  # options, e.g. for optimisation or ANSI compilation.
+ #                    HP/UX cc requires CEXTRAFLAGS = -Aa (HP/UX 9) or ...
  #                    -Ae (HP/UX 10);       BS2000/OSD requires -XLLML -XLLMK;
  #                    NeXTSTEP apparently needs...
  #                    CEXTRAFLAGS = -O2 -pipe -no-precomp 
@@ -13,14 +21,14 @@
  #                    DYNIX/ptx reportedly needs -D_SOCKET_VERSION=11
  #                    MPE/iX needs -D_POSIX_SOURCE -D_SOCKET_SOURCE
  #                    All the options are explained at the bottom of this file.
-+DEFS =  -DANALOGDIR=\"$(PREFIX)/lib/analog/\" \
++DEFS =  -DANALOGDIR=\"$(PREFIX)/share/analog/\" \
 +	-DLOGFILE=\"/var/log/httpd-access.log\" \
 +	-DIMAGEDIR=\"/images/\" \
 +	-DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\"
  OS = UNIX          # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS,
  #                    RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400
  LIBS =       # extra libraries needed; Solaris 2 (SunOS 5) needs
-@@ -33,7 +37,7 @@
+@@ -33,12 +37,12 @@
  	input.o macinput.o macstuff.o output.o output2.o pcre.o process.o \
  	settings.o sort.o tree.o utils.o win32.o
  HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h pcre.h
@@ -29,3 +37,9 @@
  
  $(PROGRAM): $(OBJS) $(HEADERS) Makefile
  	$(CC) $(CEXTRAFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
+ 	@echo '***'
+-	@echo '***IMPORTANT: You must read the licence before using analog'
++	@echo '***IMPORTANT: You must read the license before using analog'
+ 	@echo '***'
+ 
+ # There doesn't seem to be a good way to write all these rules in a generic
diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist
index 58783f9cb68f..e4c28251e2b8 100644
--- a/www/analog/pkg-plist
+++ b/www/analog/pkg-plist
@@ -2,135 +2,135 @@ bin/analog
 @unexec [ -f %D/etc/analog.cfg ] && cmp -s %D/etc/analog.cfg %D/etc/analog.cfg-dist && rm -f %D/etc/analog.cfg
 etc/analog.cfg-dist
 @exec if [ ! -f %D/etc/analog.cfg ] ; then cp -p %D/%F %B/analog.cfg; fi
-lib/analog/lang/README.txt
-lib/analog/lang/am.lng
-lib/analog/lang/amdom.tab
-lib/analog/lang/ba.lng
-lib/analog/lang/bg.lng
-lib/analog/lang/bgdom.tab
-lib/analog/lang/bgh.lng
-lib/analog/lang/bghdom.tab
-lib/analog/lang/br.lng
-lib/analog/lang/bra.lng
-lib/analog/lang/bradom.tab
-lib/analog/lang/brdom.tab
-lib/analog/lang/brh.lng
-lib/analog/lang/brhdom.tab
-lib/analog/lang/cat.lng
-lib/analog/lang/cata.lng
-lib/analog/lang/catadom.tab
-lib/analog/lang/catdom.tab
-lib/analog/lang/cath.lng
-lib/analog/lang/cathdom.tab
-lib/analog/lang/cn.lng
-lib/analog/lang/cz.lng
-lib/analog/lang/cz1250.lng
-lib/analog/lang/cza.lng
-lib/analog/lang/de.lng
-lib/analog/lang/dea.lng
-lib/analog/lang/deadom.tab
-lib/analog/lang/dedom.tab
-lib/analog/lang/deform.html
-lib/analog/lang/deh.lng
-lib/analog/lang/dehdom.tab
-lib/analog/lang/dk.lng
-lib/analog/lang/dka.lng
-lib/analog/lang/dkh.lng
-lib/analog/lang/es.lng
-lib/analog/lang/esa.lng
-lib/analog/lang/esadom.tab
-lib/analog/lang/esdom.tab
-lib/analog/lang/esform.html
-lib/analog/lang/esh.lng
-lib/analog/lang/eshdom.tab
-lib/analog/lang/fi.lng
-lib/analog/lang/fia.lng
-lib/analog/lang/fiadom.tab
-lib/analog/lang/fidom.tab
-lib/analog/lang/fih.lng
-lib/analog/lang/fihdom.tab
-lib/analog/lang/fr.lng
-lib/analog/lang/fra.lng
-lib/analog/lang/fradom.tab
-lib/analog/lang/frdom.tab
-lib/analog/lang/frform.html
-lib/analog/lang/frh.lng
-lib/analog/lang/frhdom.tab
-lib/analog/lang/gr.lng
-lib/analog/lang/gra.lng
-lib/analog/lang/hr.lng
-lib/analog/lang/hu.cfg
-lib/analog/lang/hu.lng
-lib/analog/lang/hua.lng
-lib/analog/lang/huadom.tab
-lib/analog/lang/hudom.tab
-lib/analog/lang/is.lng
-lib/analog/lang/isa.lng
-lib/analog/lang/ish.lng
-lib/analog/lang/it.lng
-lib/analog/lang/ita.lng
-lib/analog/lang/itadom.tab
-lib/analog/lang/itdom.tab
-lib/analog/lang/itform.html
-lib/analog/lang/ith.lng
-lib/analog/lang/ithdom.tab
-lib/analog/lang/jp.lng
-lib/analog/lang/jpform.html
-lib/analog/lang/kr.lng
-lib/analog/lang/lt.lng
-lib/analog/lang/lv.lng
-lib/analog/lang/lva.lng
-lib/analog/lang/nl.lng
-lib/analog/lang/nla.lng
-lib/analog/lang/no.lng
-lib/analog/lang/no2.lng
-lib/analog/lang/no2a.lng
-lib/analog/lang/no2h.lng
-lib/analog/lang/noa.lng
-lib/analog/lang/noh.lng
-lib/analog/lang/pl.lng
-lib/analog/lang/pla.lng
-lib/analog/lang/pladom.tab
-lib/analog/lang/pldom.tab
-lib/analog/lang/pt.lng
-lib/analog/lang/pta.lng
-lib/analog/lang/ptadom.tab
-lib/analog/lang/ptdom.tab
-lib/analog/lang/pth.lng
-lib/analog/lang/pthdom.tab
-lib/analog/lang/ro.lng
-lib/analog/lang/rodom.tab
-lib/analog/lang/ru.lng
-lib/analog/lang/rua.lng
-lib/analog/lang/rudom.tab
-lib/analog/lang/se.lng
-lib/analog/lang/sea.lng
-lib/analog/lang/seadom.tab
-lib/analog/lang/sealt.lng
-lib/analog/lang/sealta.lng
-lib/analog/lang/sealth.lng
-lib/analog/lang/sedom.tab
-lib/analog/lang/seh.lng
-lib/analog/lang/sehdom.tab
-lib/analog/lang/si.lng
-lib/analog/lang/si1250.lng
-lib/analog/lang/sk.lng
-lib/analog/lang/ska.lng
-lib/analog/lang/tr.lng
-lib/analog/lang/tra.lng
-lib/analog/lang/tw.lng
-lib/analog/lang/twdom.tab
-lib/analog/lang/ua.lng
-lib/analog/lang/uk.lng
-lib/analog/lang/uka.lng
-lib/analog/lang/ukdom.tab
-lib/analog/lang/us.lng
-lib/analog/lang/usa.lng
-lib/analog/lang/usdom.tab
-lib/analog/lang/usform.html
-lib/analog/lang/yu.lng
-lib/analog/lang/yua.lng
-lib/analog/lang/yudom.tab
+share/analog/lang/README.txt
+share/analog/lang/am.lng
+share/analog/lang/amdom.tab
+share/analog/lang/ba.lng
+share/analog/lang/bg.lng
+share/analog/lang/bgdom.tab
+share/analog/lang/bgh.lng
+share/analog/lang/bghdom.tab
+share/analog/lang/br.lng
+share/analog/lang/bra.lng
+share/analog/lang/bradom.tab
+share/analog/lang/brdom.tab
+share/analog/lang/brh.lng
+share/analog/lang/brhdom.tab
+share/analog/lang/cat.lng
+share/analog/lang/cata.lng
+share/analog/lang/catadom.tab
+share/analog/lang/catdom.tab
+share/analog/lang/cath.lng
+share/analog/lang/cathdom.tab
+share/analog/lang/cn.lng
+share/analog/lang/cz.lng
+share/analog/lang/cz1250.lng
+share/analog/lang/cza.lng
+share/analog/lang/de.lng
+share/analog/lang/dea.lng
+share/analog/lang/deadom.tab
+share/analog/lang/dedom.tab
+share/analog/lang/deform.html
+share/analog/lang/deh.lng
+share/analog/lang/dehdom.tab
+share/analog/lang/dk.lng
+share/analog/lang/dka.lng
+share/analog/lang/dkh.lng
+share/analog/lang/es.lng
+share/analog/lang/esa.lng
+share/analog/lang/esadom.tab
+share/analog/lang/esdom.tab
+share/analog/lang/esform.html
+share/analog/lang/esh.lng
+share/analog/lang/eshdom.tab
+share/analog/lang/fi.lng
+share/analog/lang/fia.lng
+share/analog/lang/fiadom.tab
+share/analog/lang/fidom.tab
+share/analog/lang/fih.lng
+share/analog/lang/fihdom.tab
+share/analog/lang/fr.lng
+share/analog/lang/fra.lng
+share/analog/lang/fradom.tab
+share/analog/lang/frdom.tab
+share/analog/lang/frform.html
+share/analog/lang/frh.lng
+share/analog/lang/frhdom.tab
+share/analog/lang/gr.lng
+share/analog/lang/gra.lng
+share/analog/lang/hr.lng
+share/analog/lang/hu.cfg
+share/analog/lang/hu.lng
+share/analog/lang/hua.lng
+share/analog/lang/huadom.tab
+share/analog/lang/hudom.tab
+share/analog/lang/is.lng
+share/analog/lang/isa.lng
+share/analog/lang/ish.lng
+share/analog/lang/it.lng
+share/analog/lang/ita.lng
+share/analog/lang/itadom.tab
+share/analog/lang/itdom.tab
+share/analog/lang/itform.html
+share/analog/lang/ith.lng
+share/analog/lang/ithdom.tab
+share/analog/lang/jp.lng
+share/analog/lang/jpform.html
+share/analog/lang/kr.lng
+share/analog/lang/lt.lng
+share/analog/lang/lv.lng
+share/analog/lang/lva.lng
+share/analog/lang/nl.lng
+share/analog/lang/nla.lng
+share/analog/lang/no.lng
+share/analog/lang/no2.lng
+share/analog/lang/no2a.lng
+share/analog/lang/no2h.lng
+share/analog/lang/noa.lng
+share/analog/lang/noh.lng
+share/analog/lang/pl.lng
+share/analog/lang/pla.lng
+share/analog/lang/pladom.tab
+share/analog/lang/pldom.tab
+share/analog/lang/pt.lng
+share/analog/lang/pta.lng
+share/analog/lang/ptadom.tab
+share/analog/lang/ptdom.tab
+share/analog/lang/pth.lng
+share/analog/lang/pthdom.tab
+share/analog/lang/ro.lng
+share/analog/lang/rodom.tab
+share/analog/lang/ru.lng
+share/analog/lang/rua.lng
+share/analog/lang/rudom.tab
+share/analog/lang/se.lng
+share/analog/lang/sea.lng
+share/analog/lang/seadom.tab
+share/analog/lang/sealt.lng
+share/analog/lang/sealta.lng
+share/analog/lang/sealth.lng
+share/analog/lang/sedom.tab
+share/analog/lang/seh.lng
+share/analog/lang/sehdom.tab
+share/analog/lang/si.lng
+share/analog/lang/si1250.lng
+share/analog/lang/sk.lng
+share/analog/lang/ska.lng
+share/analog/lang/tr.lng
+share/analog/lang/tra.lng
+share/analog/lang/tw.lng
+share/analog/lang/twdom.tab
+share/analog/lang/ua.lng
+share/analog/lang/uk.lng
+share/analog/lang/uka.lng
+share/analog/lang/ukdom.tab
+share/analog/lang/us.lng
+share/analog/lang/usa.lng
+share/analog/lang/usdom.tab
+share/analog/lang/usform.html
+share/analog/lang/yu.lng
+share/analog/lang/yua.lng
+share/analog/lang/yudom.tab
 share/doc/analog/Licence.txt
 share/doc/analog/Readme.html
 share/doc/analog/acknow.html
@@ -237,8 +237,8 @@ www/data/images/barh32.gif
 www/data/images/barh4.gif
 www/data/images/barh8.gif
 www/data/images/html2.gif
-@dirrm lib/analog/lang
-@dirrm lib/analog
+@dirrm share/analog/lang
+@dirrm share/analog
 @dirrm share/doc/analog
 @unexec rmdir %D/www/data/images 2>/dev/null || true
 @unexec rmdir %D/www/data 2>/dev/null || true