svn commit: r482491 - in head/www/suphp: . files

[Matthias Fechner]

Author: mfechner
Date: Sat Oct 20 11:33:29 2018
New Revision: 482491
URL: https://svnweb.freebsd.org/changeset/ports/482491

Log:
  Add PHP flavor support.
  Add LICENSE
  Fix portlint warnings (strip .so file, fix @exec in plist)
  Regenerate patches with makepatch
  Change maintainer as requested.
  
  PR:		227378
  Submitted by:	freebsd-ports at dan.me.uk
  Reported by:	freebsd-ports at dan.me.uk
  Reviewed by:	mfechner at FreeBSD.org
  Approved by:	maintainer timeout

Added:
  head/www/suphp/files/patch-doc_suphp.conf-example
     - copied, changed from r482490, head/www/suphp/files/patch-doc__suphp.conf-example
Deleted:
  head/www/suphp/files/patch-doc__suphp.conf-example
Modified:
  head/www/suphp/Makefile
  head/www/suphp/files/patch-configure.ac
  head/www/suphp/files/patch-src_SmartPtr.hpp
  head/www/suphp/pkg-plist

Modified: head/www/suphp/Makefile
==============================================================================
--- head/www/suphp/Makefile	Sat Oct 20 11:27:14 2018	(r482490)
+++ head/www/suphp/Makefile	Sat Oct 20 11:33:29 2018	(r482491)
@@ -8,12 +8,15 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.suphp.org/download/ \
 		LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/
+PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
-MAINTAINER=	bdrewery at FreeBSD.org
+MAINTAINER=	freebsd-ports at dan.me.uk
 COMMENT=	Securely execute PHP scripts under Apache
 
+LICENSE=	GPLv2
+
 GNU_CONFIGURE=	yes
-USES=		apache:2.2+ autoreconf libtool php:cgi
+USES=		apache:2.2+ autoreconf libtool php:cgi,flavors
 SUB_FILES=	pkg-message
 
 CFLAGS+=	-I${LOCALBASE}/include
@@ -45,6 +48,7 @@ CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}
 post-install:
 .if !defined(WITH_DEBUG)
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/suphp
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_suphp.so
 .endif
 	${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example \
 	    ${STAGEDIR}${PREFIX}/etc/suphp.conf-example

Modified: head/www/suphp/files/patch-configure.ac
==============================================================================
--- head/www/suphp/files/patch-configure.ac	Sat Oct 20 11:27:14 2018	(r482490)
+++ head/www/suphp/files/patch-configure.ac	Sat Oct 20 11:33:29 2018	(r482491)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2014-08-31 10:39:02.982846403 +0100
-+++ configure.ac	2014-08-31 10:39:31.763844267 +0100
-@@ -15343,7 +15343,7 @@
+--- configure.ac.orig	2013-05-20 16:26:56 UTC
++++ configure.ac
+@@ -66,7 +66,7 @@ if test -n "$APXS"; then
                      | cut -f2 -d"/" \
                      | cut -f1 -d" "`
      major_version=`echo $APACHE_VERSION|cut -f1,2 -d.`

Copied and modified: head/www/suphp/files/patch-doc_suphp.conf-example (from r482490, head/www/suphp/files/patch-doc__suphp.conf-example)
==============================================================================
--- head/www/suphp/files/patch-doc__suphp.conf-example	Sat Oct 20 11:27:14 2018	(r482490, copy source)
+++ head/www/suphp/files/patch-doc_suphp.conf-example	Sat Oct 20 11:33:29 2018	(r482491)
@@ -1,6 +1,6 @@
---- doc/suphp.conf-example.orig
+--- doc/suphp.conf-example.orig	2011-03-13 17:52:24 UTC
 +++ doc/suphp.conf-example
-@@ -6,10 +6,10 @@
+@@ -6,10 +6,10 @@ logfile=/var/log/suphp.log
  loglevel=info
  
  ;User Apache is running as
@@ -13,7 +13,7 @@
  
  ;Path to chroot() to before executing script
  ;chroot=/mychroot
-@@ -33,15 +33,15 @@
+@@ -33,15 +33,15 @@ env_path="/bin:/usr/bin"
  umask=0077
  
  ; Minimum UID

Modified: head/www/suphp/files/patch-src_SmartPtr.hpp
==============================================================================
--- head/www/suphp/files/patch-src_SmartPtr.hpp	Sat Oct 20 11:27:14 2018	(r482490)
+++ head/www/suphp/files/patch-src_SmartPtr.hpp	Sat Oct 20 11:33:29 2018	(r482491)
@@ -1,8 +1,4 @@
-$NetBSD: patch-src_SmartPtr.hpp,v 1.1 2011/09/21 12:54:16 adam Exp $
-
-Fix C++ syntax
-
---- src/SmartPtr.hpp.orig	2011-09-21 12:48:02.000000000 +0000
+--- src/SmartPtr.hpp.orig	2007-03-13 14:17:02 UTC
 +++ src/SmartPtr.hpp
 @@ -150,7 +150,7 @@ namespace suPHP {
      template<class T>

Modified: head/www/suphp/pkg-plist
==============================================================================
--- head/www/suphp/pkg-plist	Sat Oct 20 11:27:14 2018	(r482490)
+++ head/www/suphp/pkg-plist	Sat Oct 20 11:33:29 2018	(r482491)
@@ -1,8 +1,8 @@
 sbin/suphp
 etc/suphp.conf-example
 %%APACHEMODDIR%%/mod_suphp.so
- at exec %D/sbin/apxs -e -a -n suphp %D/%f
- at unexec %D/sbin/apxs -e -A -n suphp %D/%f
+ at postexec %D/sbin/apxs -e -a -n suphp %D/%f
+ at preunexec %D/sbin/apxs -e -A -n suphp %D/%f
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README