cosmetic changes using portlint, a really nice tool ;-)

5 files changed, 79 insertions, 113 deletions

diff --git a/www/mapedit/Makefile b/www/mapedit/Makefile
index eb023325c60f..9209e4ddab3a 100644
--- a/www/mapedit/Makefile
+++ b/www/mapedit/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Fr   4 Apr 1997 17:45:31 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.5 1997/04/04 19:36:35 andreas Exp $
+# $Id: Makefile,v 1.6 1997/04/09 03:09:50 asami Exp $
 #
 
 DISTNAME=	mapedit2.24
@@ -23,7 +23,7 @@ pre-install:
 	@echo ""
 
 do-install:
-	mkdir -p ${DOCDIR}
+	${MKDIR} -p ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.TXT ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/help.html ${DOCDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/mapedit ${PREFIX}/bin
diff --git a/www/mapedit/pkg-descr b/www/mapedit/pkg-descr
index 87d80283a6cd..6c8dbbf35216 100644
--- a/www/mapedit/pkg-descr
+++ b/www/mapedit/pkg-descr
@@ -1,45 +1,17 @@
-An important note from the port maintainer 
-				(Andreas Klemm <andreas@knobel.gun.de>)
-
-Please note: mapedit is NOT public domain software
-==================================================
-
 Credits and license terms
 =========================
 
 Copyright 1994 by Thomas Boutell. THIS IS NOT PUBLIC DOMAIN SOFTWARE.
-Commercial users must pay for it to continue using it after 30
-days. You need not register again when new versions are released.
-Please remit $25 to:
+Commercial users must pay for it to continue using it after 30 days.
+You need not register again when new versions are released.
 
-Thomas Boutell
-426 Bellevue Ave. E Apt. 1
-Seattle, WA 98102 USA
+Please remit $25 to:	Thomas Boutell
+			426 Bellevue Ave. E Apt. 1
+			Seattle, WA 98102 USA
 
 Nonprofit and educational users are required to send me a postcard!
 
-What is mapedit?
-================
-
-mapedit is a WYSIWYG (What You See Is What You Get) editor for
-imagemap files.
-
-Imagemap files are a feature of both NCSA and CERN httpd servers;
-they allow you to turn a GIF into a clickable map by designating
-polygons, circles and rectangles within the GIF and specifying a
-URL for each to link to.
-
-Unfortunately, creating good image maps by hand is a lot of work,
-because the points must be located using an editor not explicitly
-designed for the purpose.
-
-mapedit allows you to load your GIF image into a scrollable,
-resizable window and then draw polygons, circles and rectangles on
-top of it, specifying a URL for each. It also allows you to go back
-and delete these "hot spots", set a default URL for clicks outside
-of the "hot" areas, and so on. In addition, it allows you to
-associate comments of arbitrary length with each object if you have
-a server that accepts the NCSA imagemap format.
+What is mapedit:	mapedit is a WYSIWYG (What You See Is What You Get)
+			editor for imagemap files.
 
-Please take a look at the file /usr/X11R6/lib/X11/mapedit/mapedit.html
-for full usage documentation.
+For full documentation:	/usr/X11R6/lib/X11/mapedit/mapedit.html
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index d5e125bc0f60..6e44a4a57df3 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Wed Sep  3 18:28:20 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.40 1997/09/03 18:49:53 andreas Exp $
+# $Id: Makefile,v 1.41 1997/09/09 10:01:36 asami Exp $
 #
 
 DISTNAME=       apache_1.2.1
@@ -11,26 +11,25 @@ PKGNAME=	apache-php-1.2.1
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
 		ftp://ftp.nerosworld.com/pub/php/dist/ \
-		ftp://ftp.u-aizu.ac.jp/pub/net/www/php \
+		ftp://ftp.u-aizu.ac.jp/pub/net/www/php/ \
 		ftp://ftpza.co.za/pub/mirrors/php/
-DISTFILES=	apache_1.2.1.tar.gz \
-                php-2.0b12.tar.gz
+DISTFILES=	apache_1.2.1.tar.gz php-2.0b12.tar.gz
 
 MAINTAINER=     andreas@FreeBSD.ORG
 
 NO_PACKAGE=	"Too many questions"
+BROKEN=		"php conf-dialogue needs knowledge of include and library paths"
 IS_INTERACTIVE=	yes
-BROKEN=		"Am working on it..."
 
 #
 # Currently we support two db's: msql and mysql
 #
 .if !defined(PHP_DBTYPE)
 pre-fetch:
-	@echo
-	@echo "You must set variable PHP_DBTYPE to msql or mysql by typing"
-	@echo "make PHP_DBTYPE=[ msql | mysql ]"
-	@false
+	@ ${ECHO}
+	@ ${ECHO} "You must set variable PHP_DBTYPE to msql or mysql by typing"
+	@ ${ECHO} "make PHP_DBTYPE=[ msql | mysql ]"
+	@ ${FALSE}
 
 .elif defined(PHP_DBTYPE)
 .if ${PHP_DBTYPE} == msql
@@ -48,40 +47,39 @@ VERS_ID = php-2.0b12/andreas
 
 .if defined(VERS_ID)
 post-patch:
-	@cd ${WRKSRC}/src && \
-	mv Configuration Configuration.old && \
-	sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
+	@ cd ${WRKSRC}/src && \
+	${MV}  Configuration Configuration.old && \
+	${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
 	< Configuration.old > Configuration
 .endif
 
-
 pre-configure:
-	echo "Don\'t forget to add ${PREFIX}/include/gd to additional path !!!"
+	${ECHO} "Don\'t forget to add ${PREFIX}/include/gd to additional path !"
 	( cd ${WRKDIR}/php-2.0b12; ./install )
 	( cd ${WRKDIR}/php-2.0b12/src; make )
 	( cd ${WRKDIR}/php-2.0b12/src \
-	&& cp mod_php.c mod_php.h libphp.a ../../apache_1.2.1/src )
+	&& ${CP} mod_php.c mod_php.h libphp.a ../../apache_1.2.1/src )
 	( cd ${WRKDIR}/apache_1.2.1/src \
-	&& echo "Module php_module mod_php.o" \
+	&& ${ECHO} "Module php_module mod_php.o" \
 	>> Configuration \
 .if ${PHP_DBTYPE} == msql
-	&& echo "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
 .else
-	&& echo "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib/mysql -lmysql -L/usr/local/lib -lgd -lm" \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib/mysql -lmysql -L/usr/local/lib -lgd -lm" \
 .endif
 	>> Configuration )
 
 post-install:
-	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		echo "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && echo -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+	@ if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && ${ECHO} -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
-	echo "AddType application/x-httpd-php .phtml" \
+	${ECHO} "AddType application/x-httpd-php .phtml" \
 		> ${PREFIX}/etc/apache/srm.conf.php
-	echo "Don't forget to enable php support in \
+	${ECHO} "Don't forget to enable php support in \
 		${PREFIX}/etc/apache/srm.conf"
-	echo "See ${PREFIX}/etc/apache/srm.conf.php"
+	${ECHO} "See ${PREFIX}/etc/apache/srm.conf.php"
 
 .include <bsd.port.mk>
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index d5e125bc0f60..6e44a4a57df3 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Wed Sep  3 18:28:20 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.40 1997/09/03 18:49:53 andreas Exp $
+# $Id: Makefile,v 1.41 1997/09/09 10:01:36 asami Exp $
 #
 
 DISTNAME=       apache_1.2.1
@@ -11,26 +11,25 @@ PKGNAME=	apache-php-1.2.1
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
 		ftp://ftp.nerosworld.com/pub/php/dist/ \
-		ftp://ftp.u-aizu.ac.jp/pub/net/www/php \
+		ftp://ftp.u-aizu.ac.jp/pub/net/www/php/ \
 		ftp://ftpza.co.za/pub/mirrors/php/
-DISTFILES=	apache_1.2.1.tar.gz \
-                php-2.0b12.tar.gz
+DISTFILES=	apache_1.2.1.tar.gz php-2.0b12.tar.gz
 
 MAINTAINER=     andreas@FreeBSD.ORG
 
 NO_PACKAGE=	"Too many questions"
+BROKEN=		"php conf-dialogue needs knowledge of include and library paths"
 IS_INTERACTIVE=	yes
-BROKEN=		"Am working on it..."
 
 #
 # Currently we support two db's: msql and mysql
 #
 .if !defined(PHP_DBTYPE)
 pre-fetch:
-	@echo
-	@echo "You must set variable PHP_DBTYPE to msql or mysql by typing"
-	@echo "make PHP_DBTYPE=[ msql | mysql ]"
-	@false
+	@ ${ECHO}
+	@ ${ECHO} "You must set variable PHP_DBTYPE to msql or mysql by typing"
+	@ ${ECHO} "make PHP_DBTYPE=[ msql | mysql ]"
+	@ ${FALSE}
 
 .elif defined(PHP_DBTYPE)
 .if ${PHP_DBTYPE} == msql
@@ -48,40 +47,39 @@ VERS_ID = php-2.0b12/andreas
 
 .if defined(VERS_ID)
 post-patch:
-	@cd ${WRKSRC}/src && \
-	mv Configuration Configuration.old && \
-	sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
+	@ cd ${WRKSRC}/src && \
+	${MV}  Configuration Configuration.old && \
+	${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
 	< Configuration.old > Configuration
 .endif
 
-
 pre-configure:
-	echo "Don\'t forget to add ${PREFIX}/include/gd to additional path !!!"
+	${ECHO} "Don\'t forget to add ${PREFIX}/include/gd to additional path !"
 	( cd ${WRKDIR}/php-2.0b12; ./install )
 	( cd ${WRKDIR}/php-2.0b12/src; make )
 	( cd ${WRKDIR}/php-2.0b12/src \
-	&& cp mod_php.c mod_php.h libphp.a ../../apache_1.2.1/src )
+	&& ${CP} mod_php.c mod_php.h libphp.a ../../apache_1.2.1/src )
 	( cd ${WRKDIR}/apache_1.2.1/src \
-	&& echo "Module php_module mod_php.o" \
+	&& ${ECHO} "Module php_module mod_php.o" \
 	>> Configuration \
 .if ${PHP_DBTYPE} == msql
-	&& echo "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
 .else
-	&& echo "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib/mysql -lmysql -L/usr/local/lib -lgd -lm" \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib/mysql -lmysql -L/usr/local/lib -lgd -lm" \
 .endif
 	>> Configuration )
 
 post-install:
-	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		echo "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && echo -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+	@ if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && ${ECHO} -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
-	echo "AddType application/x-httpd-php .phtml" \
+	${ECHO} "AddType application/x-httpd-php .phtml" \
 		> ${PREFIX}/etc/apache/srm.conf.php
-	echo "Don't forget to enable php support in \
+	${ECHO} "Don't forget to enable php support in \
 		${PREFIX}/etc/apache/srm.conf"
-	echo "See ${PREFIX}/etc/apache/srm.conf.php"
+	${ECHO} "See ${PREFIX}/etc/apache/srm.conf.php"
 
 .include <bsd.port.mk>
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index d5e125bc0f60..6e44a4a57df3 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Wed Sep  3 18:28:20 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.40 1997/09/03 18:49:53 andreas Exp $
+# $Id: Makefile,v 1.41 1997/09/09 10:01:36 asami Exp $
 #
 
 DISTNAME=       apache_1.2.1
@@ -11,26 +11,25 @@ PKGNAME=	apache-php-1.2.1
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
 		ftp://ftp.nerosworld.com/pub/php/dist/ \
-		ftp://ftp.u-aizu.ac.jp/pub/net/www/php \
+		ftp://ftp.u-aizu.ac.jp/pub/net/www/php/ \
 		ftp://ftpza.co.za/pub/mirrors/php/
-DISTFILES=	apache_1.2.1.tar.gz \
-                php-2.0b12.tar.gz
+DISTFILES=	apache_1.2.1.tar.gz php-2.0b12.tar.gz
 
 MAINTAINER=     andreas@FreeBSD.ORG
 
 NO_PACKAGE=	"Too many questions"
+BROKEN=		"php conf-dialogue needs knowledge of include and library paths"
 IS_INTERACTIVE=	yes
-BROKEN=		"Am working on it..."
 
 #
 # Currently we support two db's: msql and mysql
 #
 .if !defined(PHP_DBTYPE)
 pre-fetch:
-	@echo
-	@echo "You must set variable PHP_DBTYPE to msql or mysql by typing"
-	@echo "make PHP_DBTYPE=[ msql | mysql ]"
-	@false
+	@ ${ECHO}
+	@ ${ECHO} "You must set variable PHP_DBTYPE to msql or mysql by typing"
+	@ ${ECHO} "make PHP_DBTYPE=[ msql | mysql ]"
+	@ ${FALSE}
 
 .elif defined(PHP_DBTYPE)
 .if ${PHP_DBTYPE} == msql
@@ -48,40 +47,39 @@ VERS_ID = php-2.0b12/andreas
 
 .if defined(VERS_ID)
 post-patch:
-	@cd ${WRKSRC}/src && \
-	mv Configuration Configuration.old && \
-	sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
+	@ cd ${WRKSRC}/src && \
+	${MV}  Configuration Configuration.old && \
+	${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
 	< Configuration.old > Configuration
 .endif
 
-
 pre-configure:
-	echo "Don\'t forget to add ${PREFIX}/include/gd to additional path !!!"
+	${ECHO} "Don\'t forget to add ${PREFIX}/include/gd to additional path !"
 	( cd ${WRKDIR}/php-2.0b12; ./install )
 	( cd ${WRKDIR}/php-2.0b12/src; make )
 	( cd ${WRKDIR}/php-2.0b12/src \
-	&& cp mod_php.c mod_php.h libphp.a ../../apache_1.2.1/src )
+	&& ${CP} mod_php.c mod_php.h libphp.a ../../apache_1.2.1/src )
 	( cd ${WRKDIR}/apache_1.2.1/src \
-	&& echo "Module php_module mod_php.o" \
+	&& ${ECHO} "Module php_module mod_php.o" \
 	>> Configuration \
 .if ${PHP_DBTYPE} == msql
-	&& echo "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
 .else
-	&& echo "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib/mysql -lmysql -L/usr/local/lib -lgd -lm" \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib/mysql -lmysql -L/usr/local/lib -lgd -lm" \
 .endif
 	>> Configuration )
 
 post-install:
-	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
-		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		echo "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && echo -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+	@ if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && ${ECHO} -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
-	echo "AddType application/x-httpd-php .phtml" \
+	${ECHO} "AddType application/x-httpd-php .phtml" \
 		> ${PREFIX}/etc/apache/srm.conf.php
-	echo "Don't forget to enable php support in \
+	${ECHO} "Don't forget to enable php support in \
 		${PREFIX}/etc/apache/srm.conf"
-	echo "See ${PREFIX}/etc/apache/srm.conf.php"
+	${ECHO} "See ${PREFIX}/etc/apache/srm.conf.php"
 
 .include <bsd.port.mk>