[Midnightbsd-cvs] CVS Commit: databases/phpmyadmin: $MidnightBSD$ More SUPHP cleanup

[laffer1 at midnightbsd.org]

Log Message:
-----------
$MidnightBSD$

More SUPHP cleanup

Modified Files:
--------------
    mports/databases/phpmyadmin:
        Makefile (r1.6 -> r1.7)
    mports/databases/phpmyadmin/files:
        config.inc.php.sample (r1.1 -> r1.2)
        pkg-deinstall.in (r1.1 -> r1.2)
        pkg-install.in (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/databases/phpmyadmin/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldatabases/phpmyadmin/Makefile -Ldatabases/phpmyadmin/Makefile -u -r1.6 -r1.7
--- databases/phpmyadmin/Makefile
+++ databases/phpmyadmin/Makefile
@@ -65,7 +65,6 @@
 .endfor
 .endif
 
-# MYADMUSR is only used WITH_SUPHP
 MYADMDIR?=	www/phpMyAdmin
 MYADMGRP?=	${WWWGRP}
 CFGFILE=	config.inc.php
@@ -78,14 +77,6 @@
 do-build:
 	@${DO_NADA}
 
-pre-everything::
-	${ECHO_MSG} ""
-	${ECHO_MSG} "You may use the following additional build option:"
-	${ECHO_MSG} ""
-	${ECHO_MSG} "    WITH_SUPHP=yes   Install appropriately for use with"
-	${ECHO_MSG} "                     the www/suphp port [default: no]"
-	${ECHO_MSG} ""
-
 # When creating a package, empty directories will not be generated
 # from the pkg tarball.  Therefore make sure no directories are empty.
 
@@ -103,11 +94,6 @@
 	     -e "s,^\.$$, at dirrmtry %%MYADMDIR%%," \
 	     -e "s,^\., at dirrm %%MYADMDIR%%,"         >>${PLIST}
 
-pre-install:
-.if defined(WITH_SUPHP)
-	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-.endif
-
 do-install: install-app install-conf
 
 install-app:
@@ -129,9 +115,4 @@
 	    ${CP} -p ${CFGFILE}.sample ${CFGFILE} ; \
 	fi
 
-post-install:
-.if defined(WITH_SUPHP)
-	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-
 .include <bsd.port.mk>
Index: pkg-install.in
===================================================================
RCS file: /home/cvs/mports/databases/phpmyadmin/files/pkg-install.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldatabases/phpmyadmin/files/pkg-install.in -Ldatabases/phpmyadmin/files/pkg-install.in -u -r1.1 -r1.2
--- databases/phpmyadmin/files/pkg-install.in
+++ databases/phpmyadmin/files/pkg-install.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 #
+# $MidnightBSD$
 # $FreeBSD: ports/databases/phpmyadmin/files/pkg-install.in,v 1.1 2005/03/06 10:48:47 thierry Exp $
 #
 
Index: config.inc.php.sample
===================================================================
RCS file: /home/cvs/mports/databases/phpmyadmin/files/config.inc.php.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldatabases/phpmyadmin/files/config.inc.php.sample -Ldatabases/phpmyadmin/files/config.inc.php.sample -u -r1.1 -r1.2
--- databases/phpmyadmin/files/config.inc.php.sample
+++ databases/phpmyadmin/files/config.inc.php.sample
@@ -1,5 +1,6 @@
 <?php
 /* $FreeBSD: ports/databases/phpmyadmin/files/config.inc.php.sample,v 1.3 2006/05/16 06:43:23 clsung Exp $
+ * $MidnightBSD$
  *
  * Skeleton configuration file -- this file is empty on a fresh
  * installaton of phpmyadmin.
Index: pkg-deinstall.in
===================================================================
RCS file: /home/cvs/mports/databases/phpmyadmin/files/pkg-deinstall.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldatabases/phpmyadmin/files/pkg-deinstall.in -Ldatabases/phpmyadmin/files/pkg-deinstall.in -u -r1.1 -r1.2
--- databases/phpmyadmin/files/pkg-deinstall.in
+++ databases/phpmyadmin/files/pkg-deinstall.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 #
+# $MidnightBSD$
 # $FreeBSD: ports/databases/phpmyadmin/files/pkg-deinstall.in,v 1.1 2005/03/06 10:48:47 thierry Exp $
 #