Date: Tue, 28 Jun 2005 20:26:18 GMT From: Jeremy Johnston <jeremy@smart-serv.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/82746: Upgrade suphp to 0.6.0 Message-ID: <200506282026.j5SKQIrT098046@www.freebsd.org> Resent-Message-ID: <200506282030.j5SKUFw8059639@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 82746
>Category: ports
>Synopsis: Upgrade suphp to 0.6.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 28 20:30:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Johnston
>Release: 5.4-STABLE
>Organization:
SmartServ Hosting
>Environment:
FreeBSD lightning.smart-serv.net 5.4-STABLE FreeBSD 5.4-STABLE #2: Wed Apr 27 10:45:52 MST 2005 root@lightning.smart-serv.net:/usr/obj/releng5/usr/src/releng5/sys/LIGHTNING i386
>Description:
suPHP update to 0.6.0
>How-To-Repeat:
>Fix:
diff -uNrd suphp.orig/Makefile suphp/Makefile
--- suphp.orig/Makefile Tue Jun 28 10:12:30 2005
+++ suphp/Makefile Tue Jun 28 13:22:24 2005
@@ -6,8 +6,7 @@
#
PORTNAME= suphp
-PORTVERSION= 0.5.2
-PORTREVISION= 1
+PORTVERSION= 0.6.0
CATEGORIES= www
MASTER_SITES= http://www.suphp.org/download/
@@ -25,10 +24,9 @@
MIN_UID?= 80
MIN_GID?= 80
WITH_SETID_MODE?= owner
-MYPORTDOCS= apache/CONFIG apache/INSTALL apache/README apache/LICENSE LICENSE INSTALL README
-LANG= en de
+MYPORTDOCS= apache/CONFIG apache/INSTALL apache/README LICENSE INSTALL README
-CONFIGURE_ARGS+= --with-php=${PHP_PATH} \
+CONFIGURE_ARGS+= \
--with-logfile=${WITH_LOGFILE} \
--with-apache-user=${WWWOWN} \
--with-min-gid=${MIN_UID} \
@@ -69,13 +67,12 @@
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
-.for l in ${LANG}
- @${MKDIR} ${DOCSDIR}/${l}/apache
+ @${MKDIR} ${DOCSDIR}/apache
. for f in ${MYPORTDOCS}
- @${CP} -Rfp ${WRKSRC}/doc/${l}/${f} ${DOCSDIR}/${l}/${f}
+ @${CP} -Rfp ${WRKSRC}/doc/${f} ${DOCSDIR}/${f}
. endfor
-.endfor
.endif
@${CAT} ${PKGMESSAGE}
+ @${CP} -Rfp ${WRKSRC}/doc/suphp.conf-example ${LOCALBASE}/etc/suphp.conf.sample
.include <bsd.port.post.mk>
diff -uNrd suphp.orig/distinfo suphp/distinfo
--- suphp.orig/distinfo Tue Jun 28 10:12:30 2005
+++ suphp/distinfo Tue Jun 28 10:17:18 2005
@@ -1,2 +1,2 @@
-MD5 (suphp-0.5.2.tar.gz) = 337909e87027af124052baddddbd2994
-SIZE (suphp-0.5.2.tar.gz) = 104699
+MD5 (suphp-0.6.0.tar.gz) = fa89691101b9ebf18f4922b1382186c6
+SIZE (suphp-0.6.0.tar.gz) = 247534
diff -uNrd suphp.orig/files/patch-Makefile.in suphp/files/patch-Makefile.in
--- suphp.orig/files/patch-Makefile.in Tue Jun 28 10:12:30 2005
+++ suphp/files/patch-Makefile.in Wed Dec 31 17:00:00 1969
@@ -1,9 +0,0 @@
---- Makefile.in.orig Tue Jul 13 02:43:40 2004
-+++ Makefile.in Wed Oct 27 23:10:27 2004
-@@ -17,5 +17,5 @@
- srcdir='$(srcdir)'
-
- all install clean:
-- @$(MAKE) $(MAKEDEFS) -C src $@
-+ cd src && $(MAKE) $(MAKEDEFS) $@
-
diff -uNrd suphp.orig/files/patch-src::Makefile.in suphp/files/patch-src::Makefile.in
--- suphp.orig/files/patch-src::Makefile.in Tue Jun 28 10:12:30 2005
+++ suphp/files/patch-src::Makefile.in Wed Dec 31 17:00:00 1969
@@ -1,62 +0,0 @@
---- src/Makefile.in.orig Tue Jul 13 02:43:41 2004
-+++ src/Makefile.in Wed Aug 11 22:02:44 2004
-@@ -28,37 +28,38 @@
- INCLUDES = -I$(top_srcdir)/src
- RM = rm -f
-
-+SRCS= suphp.c filesystem.c check.c error.c log.c compat.c
-+OBJS= ${SRCS:.c=.o}
-+
- all: suphp suphp.mod
-
--suphp: suphp.o filesystem.o check.o error.o log.o compat.o
-- $(CC) $(LDFLAGS) $(DEFS) -o suphp \
-- suphp.o filesystem.o check.o error.o log.o compat.o
-+suphp: ${OBJS}
-+ $(CC) $(LDFLAGS) $(DEFS) -o suphp ${OBJS}
-
- suphp.mod:
- @if test "$(APXS)" != "/notfound/"; then \
- if test "$(APACHE_VERSION_2)" = "true"; then \
- echo "*** INFO: Building mod_suphp for Apache 2.0 ***"; \
-- $(MAKE) $(MAKEDEFS) -C apache2; \
-+ cd apache2 && $(MAKE) $(MAKEDEFS); \
- fi; \
- if test "$(APACHE_VERSION_1_3)" = "true"; then \
- echo "*** INFO: Building mod_suphp for Apache 1.3 ***"; \
-- $(MAKE) $(MAKEDEFS) -C apache; \
-+ cd apache && $(MAKE) $(MAKEDEFS); \
- fi; \
- else \
- echo "*** WARNING: No 'apxs' found. Skipping mod_suphp! ***"; \
- fi
-
- install: suphp suphp.mod
-- $(INSTALL_PROGRAM) -d $(DESTDIR)$(sbindir)
- $(INSTALL_PROGRAM) -m 4755 suphp $(DESTDIR)$(sbindir)/suphp
- @if test "$(APXS)" != "/notfound/"; then \
- if test "$(APACHE_VERSION_2)" = "true"; then \
- echo "*** INFO: Installing mod_suphp for Apache 2.0 ***"; \
-- $(MAKE) $(MAKEDEFS) -C apache2 install; \
-+ cd apache2 && $(MAKE) $(MAKEDEFS) install; \
- fi; \
- if test "$(APACHE_VERSION_1_3)" = "true"; then \
- echo "*** INFO: Installing mod_suphp for Apache 1.3 ***"; \
-- $(MAKE) $(MAKEDEFS) -C apache install; \
-+ cd apache && $(MAKE) $(MAKEDEFS) install; \
- fi; \
- else \
- echo "*** WARNING: No 'apxs' found. Skipping installation of mod_suphp! ***"; \
-@@ -66,9 +67,9 @@
-
- clean:
- $(RM) suphp *.o
-- @$(MAKE) $(MAKEDEFS) -C apache clean
-- @$(MAKE) $(MAKEDEFS) -C apache2 clean
-+ cd apache && $(MAKE) $(MAKEDEFS) clean
-+ cd apache2 && $(MAKE) $(MAKEDEFS) clean
-
--%.o : %.c
-+${OBJS}: ${SRCS}
- $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $<
-
diff -uNrd suphp.orig/files/patch-src::apache::Makefile.in suphp/files/patch-src::apache::Makefile.in
--- suphp.orig/files/patch-src::apache::Makefile.in Tue Jun 28 10:12:30 2005
+++ suphp/files/patch-src::apache::Makefile.in Wed Dec 31 17:00:00 1969
@@ -1,13 +0,0 @@
---- src/apache/Makefile.in.orig Mon Aug 25 11:40:47 2003
-+++ src/apache/Makefile.in Mon Aug 25 11:41:02 2003
-@@ -29,7 +29,9 @@
- all: suphp.mod
-
- suphp.mod: mod_suphp.c
-- $(APXS) -c $(DEFS) $(EXTRADEFS) $(INCLUDES) -Wc,"$(CFLAGS)" mod_suphp.c
-+ @if [ ! -f mod_suphp.o ]; then \
-+ $(APXS) -c $(DEFS) $(EXTRADEFS) $(INCLUDES) -Wc,"$(CFLAGS)" mod_suphp.c ;\
-+ fi;
-
- install: suphp.mod
- $(APXS) -i -a mod_suphp.so
diff -uNrd suphp.orig/pkg-plist suphp/pkg-plist
--- suphp.orig/pkg-plist Tue Jun 28 10:12:30 2005
+++ suphp/pkg-plist Tue Jun 28 13:13:56 2005
@@ -1,23 +1,13 @@
sbin/suphp
+etc/suphp.conf.sample
%%MODULEDIR%%/mod_suphp.so
@exec %D/sbin/apxs -e -a -n suphp %D/%f
@unexec %D/sbin/apxs -e -A -n suphp %D/%f
-%%PORTDOCS%%%%DOCSDIR%%/en/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/en/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/en/README
-%%PORTDOCS%%%%DOCSDIR%%/en/apache/CONFIG
-%%PORTDOCS%%%%DOCSDIR%%/en/apache/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/en/apache/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/en/apache/README
-%%PORTDOCS%%%%DOCSDIR%%/de/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/de/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/de/README
-%%PORTDOCS%%%%DOCSDIR%%/de/apache/CONFIG
-%%PORTDOCS%%%%DOCSDIR%%/de/apache/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/de/apache/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/de/apache/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/de/apache
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/apache
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/de
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/apache/CONFIG
+%%PORTDOCS%%%%DOCSDIR%%/apache/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/apache/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/apache
%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506282026.j5SKQIrT098046>