Attachment 138843 Details for Bug 184924 – www__horde3-base.diff

[patch] www__horde3-base.diff

www__horde3-base.diff (text/x-patch), 3.25 KB, created by Rene Ladan on 2013-12-31 12:19:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rene Ladan

Created: 2013-12-31 12:19:28 UTC

Size: 3.25 KB

patch

obsolete

>Index: www/horde3-base/Makefile
>===================================================================
>--- www/horde3-base/Makefile	(revision 338281)
>+++ www/horde3-base/Makefile	(working copy)
>@@ -12,8 +12,8 @@
> MAINTAINER=	horde@FreeBSD.org
> COMMENT=	Common code-base used by Horde applications
> 
>+NO_STAGE=	yes
> #----------------------------------------------------------------------------
>-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 @@
> #
> # - 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 @@
> 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 @@
> 	 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>
>Index: www/horde3-base/bsd.horde.mk
>===================================================================
>--- www/horde3-base/bsd.horde.mk	(revision 338281)
>+++ www/horde3-base/bsd.horde.mk	(working copy)
>@@ -35,14 +35,7 @@
> 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}
>Index: www/horde3-base/files/pkg-install.in
>===================================================================
>--- www/horde3-base/files/pkg-install.in	(revision 338281)
>+++ www/horde3-base/files/pkg-install.in	(working copy)
>@@ -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 @@
> 
> 
> 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
>

Actions: View | Diff

Attachments on bug 184924: 138842 | 138843 | 138844