- Fix dependencies (php, apache, mysql, what a mess, it depends only on php)

- Fix pkg-plist
- make portlint happy
- add SIZE
- remove BROKEN and DEPRECATED

Approved by:	nork (mentor/implicitly)

4 files changed, 20 insertions, 35 deletions

diff --git a/www/oscommerce/Makefile b/www/oscommerce/Makefile
index 778be31adf09..29637f3c9271 100644
--- a/www/oscommerce/Makefile
+++ b/www/oscommerce/Makefile
@@ -17,46 +17,31 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/ms/}
 MAINTAINER=	hcoyote@ghostar.org
 COMMENT=	An full-featured open source e-commerce system
 
-BROKEN=		"Inconsistent dependencies (on mysql-client 3.x and 4.x)"
-DEPRECATED=	"This port will be removed on April 15 if it is still broken."
-
-USE_MYSQL=	yes
-WANT_MYSQL_VER=	323
-NO_BUILD=	YES
-PHP4_PORT?=	www/mod_php4
-OSCOMMERCE?=	${PREFIX}/www/data/oscommerce
+USE_PHP=	yes
+WANT_PHP_WEB=	yes
+NO_BUILD=	yes
+OSCOMMERCE=	${PREFIX}/www/data/oscommerce
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.if defined(WITH_APACHE2)
-MOD_DIR=	libexec/apache2
-.else
-MOD_DIR=	libexec/apache
-.endif
-
-MOD_PHP=	${PREFIX}/${MOD_DIR}/libphp4.so
-
 WWWOWN?=	www
 WWWGRP?=	www
 
-RUN_DEPENDS+=	${MOD_PHP}:${PORTSDIR}/${PHP4_PORT}
-RUN_DEPENDS+=	${PREFIX}/bin/mysql:${PORTSDIR}/databases/mysql323-client
-
 do-install:
 	${MKDIR} ${OSCOMMERCE}
 	${CP} -R ${WRKSRC}/catalog ${OSCOMMERCE}
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${OSCOMMERCE}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${CP}	${WRKSRC}/LICENSE ${DOCSDIR}
-	${CP}	${WRKSRC}/FAQ ${DOCSDIR}
-	${CP}	${WRKSRC}/INSTALL ${DOCSDIR}
-	${CP}	${WRKSRC}/README ${DOCSDIR}
-	${CP}	${WRKSRC}/STANDARD ${DOCSDIR}
-	${CP}	${WRKSRC}/tep_database-pr2.2-CVS.pdf ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/FAQ ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/STANDARD ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/tep_database-pr2.2-CVS.pdf ${DOCSDIR}
 .endif
 
 post-install:
-	@ ${SED} -e 's#%%OSCOMMERCE%%#${OSCOMMERCE}#g' pkg-message > ${PKGMESSAGE}
-	${CAT} ${PKGMESSAGE}
+	@${SED} -e 's#%%OSCOMMERCE%%#${OSCOMMERCE}#g' pkg-message > ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/oscommerce/distinfo b/www/oscommerce/distinfo
index dbd75d48caf0..fb66f06341b3 100644
--- a/www/oscommerce/distinfo
+++ b/www/oscommerce/distinfo
@@ -1 +1,2 @@
 MD5 (oscommerce-2.2ms2.tar.gz) = 2dee2756a27ab86561645a4141499795
+SIZE (oscommerce-2.2ms2.tar.gz) = 891581
diff --git a/www/oscommerce/pkg-message b/www/oscommerce/pkg-message
index 73376b692465..3d477125f680 100644
--- a/www/oscommerce/pkg-message
+++ b/www/oscommerce/pkg-message
@@ -20,5 +20,4 @@ The administrative interface can be found at
 and should have its access appropriately restricted to prevent someone 
 from modifying parts of your catalog.
 
-
 -----------------------------------------------------------------------------
diff --git a/www/oscommerce/pkg-plist b/www/oscommerce/pkg-plist
index 6959fb358298..0e4d1689f7d1 100644
--- a/www/oscommerce/pkg-plist
+++ b/www/oscommerce/pkg-plist
@@ -1,9 +1,9 @@
-share/doc/oscommerce/FAQ
-share/doc/oscommerce/INSTALL
-share/doc/oscommerce/LICENSE
-share/doc/oscommerce/README
-share/doc/oscommerce/STANDARD
-share/doc/oscommerce/tep_database-pr2.2-CVS.pdf
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/STANDARD
+%%PORTDOCS%%%%DOCSDIR%%/tep_database-pr2.2-CVS.pdf
 www/data/oscommerce/catalog/.htaccess
 www/data/oscommerce/catalog/account.php
 www/data/oscommerce/catalog/account_edit.php
@@ -988,6 +988,7 @@ www/data/oscommerce/catalog/specials.php
 www/data/oscommerce/catalog/ssl_check.php
 www/data/oscommerce/catalog/stylesheet.css
 www/data/oscommerce/catalog/tell_a_friend.php
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm www/data/oscommerce/catalog/pub
 @dirrm www/data/oscommerce/catalog/install/templates/pages
 @dirrm www/data/oscommerce/catalog/install/templates/main_page
@@ -1075,4 +1076,3 @@ www/data/oscommerce/catalog/tell_a_friend.php
 @dirrm www/data/oscommerce/catalog/admin
 @dirrm www/data/oscommerce/catalog
 @dirrm www/data/oscommerce
-@dirrm share/doc/oscommerce