svn commit: r340003 - in head/www/horde3-base: . files

[Rene Ladan]

Author: rene
Date: Fri Jan 17 01:10:41 2014
New Revision: 340003
URL: http://svnweb.freebsd.org/changeset/ports/340003
QAT: https://qat.redports.org/buildarchive/r340003/

Log:
  Remove support for the expired www/suphp port.
  
  PR:		ports/184924
  Submitted by:	rene
  Approved by:	maintainer timeout (horde@ , 1 month)

Modified:
  head/www/horde3-base/Makefile
  head/www/horde3-base/bsd.horde.mk
  head/www/horde3-base/files/pkg-install.in

Modified: head/www/horde3-base/Makefile
==============================================================================
--- head/www/horde3-base/Makefile	Fri Jan 17 00:33:46 2014	(r340002)
+++ head/www/horde3-base/Makefile	Fri Jan 17 01:10:41 2014	(r340003)
@@ -12,8 +12,8 @@ DISTNAME=	horde-${PORTVERSION}
 MAINTAINER=	horde at FreeBSD.org
 COMMENT=	Common code-base used by Horde applications
 
-#----------------------------------------------------------------------------
 NO_STAGE=	yes
+#----------------------------------------------------------------------------
 # You may define these options:
 #
 # - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree.
@@ -62,8 +62,6 @@ NO_STAGE=	yes
 #
 # - WITH_DEB:		handle Debian packages.
 #
-# - WITH_SUPHP:		Install appropriately for use with the www/suphp port.
-#
 #----------------------------------------------------------------------------
 
 RUN_DEPENDS+=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date			\
@@ -79,14 +77,7 @@ RUN_DEPENDS+=	${PEARDIR}/Date.php:${PORT
 USES=		gettext
 USE_PHP=	ctype gettext session
 
-.if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
-RUN_DEPENDS+=	${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp
-WANT_PHP_CGI=	yes
-HORDEADMUSR?=	horde
-SUB_LIST=	WITH_SUPHP=yes
-.else
 WANT_PHP_WEB=	yes
-.endif
 
 .if !defined(WITHOUT_FILEINFO)
 USE_PHP+=	fileinfo
@@ -254,9 +245,6 @@ pre-install:
 	 fi ; \
 	fi
 .endif
-.if defined(WITH_SUPHP)
-	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-.endif
 
 .include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.post.mk>

Modified: head/www/horde3-base/bsd.horde.mk
==============================================================================
--- head/www/horde3-base/bsd.horde.mk	Fri Jan 17 00:33:46 2014	(r340002)
+++ head/www/horde3-base/bsd.horde.mk	Fri Jan 17 01:10:41 2014	(r340003)
@@ -35,14 +35,7 @@ PKGMESSAGE?=	${WRKDIR}/pkg-message
 SUB_FILES?=		pkg-message
 .endif
 
-.if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
-RUN_DEPENDS+=	${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp
-WANT_PHP_CGI=	yes
-HORDEADMUSR?=	horde
-SUB_LIST+=		WITH_SUPHP=yes
-.else
 WANT_PHP_WEB=	yes
-.endif
 
 HOSTNAME?=	`/bin/hostname`
 SERVOS?=	${OPSYS}-${OSREL}

Modified: head/www/horde3-base/files/pkg-install.in
==============================================================================
--- head/www/horde3-base/files/pkg-install.in	Fri Jan 17 00:33:46 2014	(r340002)
+++ head/www/horde3-base/files/pkg-install.in	Fri Jan 17 01:10:41 2014	(r340003)
@@ -3,12 +3,9 @@
 # $FreeBSD$
 #
 # Copied from databases/phpmyadmin.
-# Used if WITH_SUPHP has been defined.
 
 PATH=/usr/sbin:/usr/bin:/bin ; export PATH
 
-WITH_SUPHP=%%WITH_SUPHP%%
-
 hordedir=%%HORDIR%%
 hordeusr=%%HORDEADMUSR%%
 hordegrp=%%HORDEGRP%%
@@ -74,33 +71,7 @@ create_user() {
 
 
 case $2 in
-    PRE-INSTALL)
-
-        if [ $WITH_SUPHP != "yes" ]; then
-            exit 0
-        fi
-
-        # Create the horde user and group if they do not already exist
-
-        if pw user show -n $hordeusr >/dev/null 2>&1 ; then
-	    echo "===> Using pre-existing user $hordeusr"
-	else
-	    if ! pw group show -n $hordegrp >/dev/null 2>&1 ; then
-		create_group $hordeusr $hordegrp "$hordegcos" $hordehome \
-		    $hordeshell
-	    fi
-	    create_user $hordeusr $hordegrp "$hordegcos" $hordehome $hordeshell
-	fi
-	;;
     POST-INSTALL)
-
-        if [ $WITH_SUPHP = "yes" ]; then
-    	    # Change ownership of the Horde directory
-
-            echo "===> Adjusting file ownership in $hordedir"
-            chown -R $hordeusr:$hordegrp $hordedir || exit 1
-        fi
-
         if [ -z "${PACKAGE_BUILDING}" ]; then
             # Copy over sample config files unless they already exist