- Fix the build with vogue GCC [1]

- Respect CC a bit further
- Fix install when PREFIX != LOCALBASE
- Better PORTDOCS handling
- Utilize DATADIR macro in pkg-plist
- Pet portlint(1)
- Clean up Makefile and pkg-desrc

Reported by:	pointyhat (logs) [1]

4 files changed, 26 insertions, 20 deletions

diff --git a/www/wb0/Makefile b/www/wb0/Makefile
index ea86893d4355..58e6939937dd 100644
--- a/www/wb0/Makefile
+++ b/www/wb0/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	wb0
 # Date created:				2001-01-31
-# Whom:					trevor
+# Whom:					Trevor Johnson <trevor@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -20,21 +20,21 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		vga.1:${PORTSDIR}/graphics/svgalib \
 		png.5:${PORTSDIR}/graphics/png
 
-PORTDOCS=	AUTHORS Changelog README
+DOCS=		AUTHORS Changelog README etc/wb0/wb0.config.README
+PORTDOCS=	${DOCS:T}
 ONLY_FOR_ARCHS=	i386
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/wb0|${LOCALBASE}/etc|g ; \
-		s|/usr/local/src/wb0/font/bit|${LOCALBASE}/share/wb0/|g' \
-		${WRKSRC}/wb0.c
+		s|/usr/local/src/wb0/font/bit|${LOCALBASE}/share/wb0/|g ; \
+		s|^static ||' ${WRKSRC}/wb0.c
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
+	@${MKDIR} ${DOCSDIR}
+.for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/etc/wb0/wb0.config.README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/wb0/files/patch-Makefile b/www/wb0/files/patch-Makefile
index 0a9574c37e9f..c179f6dbc339 100644
--- a/www/wb0/files/patch-Makefile
+++ b/www/wb0/files/patch-Makefile
@@ -24,7 +24,16 @@
 +	cp ./data/* ${PREFIX}/share/wb0/
 +	echo "path ${PREFIX}/share/wb0/" >>${PREFIX}/etc/wb0.config
 +	chmod u+s ${PREFIX}/bin/wb0
-+	chown root:wheel ${LOCALBASE}/bin/wb0
++	chown root:wheel ${PREFIX}/bin/wb0
  
  pkfont: pkfont.c
  
+@@ -19,7 +20,7 @@
+ makefont: makefont.c
+ 
+ wb0: wb0.o scroller.o line_breaker.o font_loader.o gvars.o watcher.o image_parser.o printer.o block.o
+-	gcc $(LDFLAGS) wb0.o scroller.o line_breaker.o font_loader.o gvars.o watcher.o image_parser.o printer.o block.o -o wb0
++	$(CC) $(LDFLAGS) wb0.o scroller.o line_breaker.o font_loader.o gvars.o watcher.o image_parser.o printer.o block.o -o wb0
+ 
+ line_breaker.o: line_breaker.c line_breaker.h gvars.h scroller.h gvars.c block.h
+ 
diff --git a/www/wb0/pkg-descr b/www/wb0/pkg-descr
index d1ce4a82adc6..215f11e1ef27 100644
--- a/www/wb0/pkg-descr
+++ b/www/wb0/pkg-descr
@@ -3,6 +3,4 @@ It uses libjpeg, libpng, Lynx, and svgalib.
 
 If you have difficulties, try running it with the "m321" option.
 
-WWW:  http://atrey.karlin.mff.cuni.cz/~clock/twibright/wb0
-
-Trevor Johnson
+WWW: http://atrey.karlin.mff.cuni.cz/~clock/twibright/wb0
diff --git a/www/wb0/pkg-plist b/www/wb0/pkg-plist
index e592e1f3c2a9..253f79936cb8 100644
--- a/www/wb0/pkg-plist
+++ b/www/wb0/pkg-plist
@@ -1,11 +1,10 @@
 bin/wb0
 etc/wb0.config
-share/wb0/iso_8859-2.bit
-share/wb0/kamen.encoding
-share/wb0/iso_8859-2.encoding
-share/wb0/pc-latin-2.encoding
-share/wb0/iso_8859-1.encoding
-share/wb0/cp1250.encoding
-share/wb0/cork.encoding
-@dirrm share/wb0
-%%PORTDOCS%%%%DOCSDIR%%/wb0.config.README
+%%DATADIR%%/iso_8859-2.bit
+%%DATADIR%%/kamen.encoding
+%%DATADIR%%/iso_8859-2.encoding
+%%DATADIR%%/pc-latin-2.encoding
+%%DATADIR%%/iso_8859-1.encoding
+%%DATADIR%%/cp1250.encoding
+%%DATADIR%%/cork.encoding
+@dirrm %%DATADIR%%