diff -ru original/apache13/Makefile ./apache13/Makefile
--- original/apache13/Makefile	Sun Apr 16 08:37:41 2000
+++ ./apache13/Makefile	Thu May  4 17:07:54 2000
@@ -7,7 +7,9 @@
 #
 
 DISTNAME=       apache_${VERSION_APACHE}
-PKGNAME=        apache-${VERSION_APACHE}
+#PKGNAME=        apache-${VERSION_APACHE}
+PORTNAME=	apache
+PORTVERSION=	${VERSION_APACHE}
 CATEGORIES=	www
 MASTER_SITES=   http://www.apache.org/dist/ \
 		http://www.freebsd.org/gifs/ \
Only in .: mod_apache.diff
diff -ru original/mod_frontpage/Makefile ./mod_frontpage/Makefile
--- original/mod_frontpage/Makefile	Sun Apr 16 07:44:48 2000
+++ ./mod_frontpage/Makefile	Thu May  4 17:08:47 2000
@@ -7,7 +7,9 @@
 #
 
 DISTNAME=	fp40.bsdi
-PKGNAME=	mod_frontpage-4.0.4.3
+#PKGNAME=	mod_frontpage-4.0.4.3
+PORTNAME=	mod_frontpage
+PORTVERSION=	4.0.4.3
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.microsoft.com/products/frontpage/ \
 		http://officeupdate.microsoft.com/frontpage/wpp/serk/ \
diff -ru original/mod_jserv/Makefile ./mod_jserv/Makefile
--- original/mod_jserv/Makefile	Fri Mar 24 14:50:27 2000
+++ ./mod_jserv/Makefile	Thu May  4 17:09:34 2000
@@ -6,7 +6,9 @@
 # $FreeBSD: ports/www/apache-jserv/Makefile,v 1.4 2000/02/10 14:19:14 kuriyama Exp $
 
 DISTNAME=	ApacheJServ-1.1
-PKGNAME=	mod_jserv-1.1
+#PKGNAME=	mod_jserv-1.1
+PORTNAME=	mod_jserv
+PORTVERSION=	1.1
 CATEGORIES=	www java
 MASTER_SITES=	http://java.apache.org/jserv/dist/
 
diff -ru original/mod_php3/Makefile ./mod_php3/Makefile
--- original/mod_php3/Makefile	Fri Mar 17 17:59:18 2000
+++ ./mod_php3/Makefile	Thu May  4 17:10:12 2000
@@ -7,7 +7,9 @@
 #
 
 DISTNAME=	php-${VERSION_PHP}
-PKGNAME=	mod_php3-${VERSION_PHP}
+#PKGNAME=	mod_php3-${VERSION_PHP}
+PORTNAME=	mod_php3
+PORTVERSION=	${VERSION_PHP}
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.php.net/pub/${PHP_DISTDIR}/ \
 		http://us.php.net/${PHP_DISTDIR}/ \
diff -ru original/mod_php4/Makefile ./mod_php4/Makefile
--- original/mod_php4/Makefile	Wed Mar 15 17:14:02 2000
+++ ./mod_php4/Makefile	Thu May  4 17:10:42 2000
@@ -8,7 +8,9 @@
 #
 
 DISTNAME=	php-${VERSION_PHP}
-PKGNAME=	mod_php4-${VERSION_PHP}
+#PKGNAME=	mod_php4-${VERSION_PHP}
+PORTNAME=	mod_php4
+PORTVERSION=	${VERSION_PHP}
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.php.net/pub/${PHP_DISTDIR}/ \
 		http://us.php.net/${PHP_DISTDIR}/ \
diff -ru original/mod_ssl/Makefile ./mod_ssl/Makefile
--- original/mod_ssl/Makefile	Wed Mar 15 17:00:31 2000
+++ ./mod_ssl/Makefile	Thu May  4 17:08:12 2000
@@ -7,7 +7,9 @@
 #
 
 DISTNAME=	mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}
-PKGNAME=	${DISTNAME}
+#PKGNAME=	${DISTNAME}
+PORTNAME=	mod_ssl
+PORTVERSION=	${VERSION_MODSSL}-${VERSION_APACHE}
 CATEGORIES=	www security
 MASTER_SITES=	ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/ \
 		ftp://ftp.ecrc.net/pub/security/mod_ssl/ \
Only in .: original