From owner-svn-ports-all@freebsd.org Sat Oct 20 11:33:31 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DCD38FD70D2; Sat, 20 Oct 2018 11:33:30 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8FBD38C0ED; Sat, 20 Oct 2018 11:33:30 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8AA621D860; Sat, 20 Oct 2018 11:33:30 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9KBXURi014858; Sat, 20 Oct 2018 11:33:30 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9KBXTPk014853; Sat, 20 Oct 2018 11:33:29 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201810201133.w9KBXTPk014853@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Sat, 20 Oct 2018 11:33:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482491 - in head/www/suphp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head/www/suphp: . files X-SVN-Commit-Revision: 482491 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Oct 2018 11:33:31 -0000 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@dan.me.uk Reported by: freebsd-ports@dan.me.uk Reviewed by: mfechner@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@FreeBSD.org +MAINTAINER= freebsd-ports@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 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 -@exec %D/sbin/apxs -e -a -n suphp %D/%f -@unexec %D/sbin/apxs -e -A -n suphp %D/%f +@postexec %D/sbin/apxs -e -a -n suphp %D/%f +@preunexec %D/sbin/apxs -e -A -n suphp %D/%f %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README