View | Details | Raw Unified | Return to bug 70345
Collapse All | Expand All

(-)suphp/Makefile (-19 / +10 lines)
Lines 7-28 Link Here
7
7
8
PORTNAME=	suphp
8
PORTNAME=	suphp
9
PORTVERSION=	0.5.2
9
PORTVERSION=	0.5.2
10
PORTREVISION=	1
10
CATEGORIES=	www
11
CATEGORIES=	www
11
MASTER_SITES=	http://www.suphp.org/download/
12
MASTER_SITES=	http://www.suphp.org/download/
12
13
13
MAINTAINER=	freebsd@jdc.parodius.com
14
MAINTAINER=	freebsd@jdc.parodius.com
14
COMMENT=	A combination which provides a wrapper for PHP
15
COMMENT=	Securely execute ~user PHP scripts
15
16
16
GNU_CONFIGURE=	yes
17
GNU_CONFIGURE=	yes
17
USE_GMAKE=	yes
18
USE_PHP=	yes
18
USE_PHP=	yes
19
WANT_PHP_CGI=	yes
20
USE_APACHE=	yes
19
USE_APACHE=	yes
20
WANT_PHP_CGI=	yes
21
CONFLICTS=	mod_php4-4* php-4.*
21
CONFLICTS=	mod_php4-4* php-4.*
22
22
23
LOGFILE?=	/var/log/suphp.log
23
WITH_LOGFILE?=	/var/log/suphp.log
24
PHP_PATH?=	${LOCALBASE}/bin/php
24
PHP_PATH?=	${LOCALBASE}/bin/php
25
APACHE_USER?=	${WWWOWN}
26
MIN_UID?=	80
25
MIN_UID?=	80
27
MIN_GID?=	80
26
MIN_GID?=	80
28
WITH_SETID_MODE?=	owner
27
WITH_SETID_MODE?=	owner
Lines 31-67 Link Here
31
LANG=		en de
30
LANG=		en de
32
31
33
CONFIGURE_ARGS+=	--with-php=${PHP_PATH} \
32
CONFIGURE_ARGS+=	--with-php=${PHP_PATH} \
34
			--with-logfile=${LOGFILE} \
33
			--with-logfile=${WITH_LOGFILE} \
35
			--with-apache-user=${APACHE_USER} \
34
			--with-apache-user=${WWWOWN} \
36
			--with-min-gid=${MIN_UID} \
35
			--with-min-gid=${MIN_UID} \
37
			--with-min-uid=${MIN_GID} \
36
			--with-min-uid=${MIN_GID} \
38
			--with-apxs=${APXS}
37
			--with-apxs=${APXS}
39
38
40
## Available knobs:
39
## Available knobs:
41
##   WITHOUT_CHECKPATH: disable check if script resides in DOCUMENT_ROOT
40
##   WITHOUT_CHECKPATH:    disable check if script resides in DOCUMENT_ROOT
42
.if defined(WITHOUT_CHECKPATH)
41
.if defined(WITHOUT_CHECKPATH)
43
CONFIGURE_ARGS+=	--disable-checkpath
42
CONFIGURE_ARGS+=	--disable-checkpath
44
.endif
43
.endif
45
##   WITHOUT_CHECKUID: accept UIDs that are not listed in /etc/passwd
44
##   WITHOUT_CHECKUID:     accept UIDs that are not listed in /etc/passwd
46
.if defined(WITHOUT_CHECKUID)
45
.if defined(WITHOUT_CHECKUID)
47
CONFIGURE_ARGS+=	--disable-checkuid
46
CONFIGURE_ARGS+=	--disable-checkuid
48
.endif
47
.endif
49
##   WITHOUT_CHECKGID: accept GIDs that are not listed in /etc/group
48
##   WITHOUT_CHECKGID:     accept GIDs that are not listed in /etc/group
50
.if defined(WITHOUT_CHECKGID)
49
.if defined(WITHOUT_CHECKGID)
51
CONFIGURE_ARGS+=	--disable-checkgid
50
CONFIGURE_ARGS+=	--disable-checkgid
52
.endif
51
.endif
53
##   WITH_SETID_MODE: Mode to use for setting UID/GID.
52
##   WITH_SETID_MODE:      mode to use for setting UID/GID.
54
CONFIGURE_ARGS+=	--with-setid-mode=${WITH_SETID_MODE}
53
CONFIGURE_ARGS+=	--with-setid-mode=${WITH_SETID_MODE}
55
54
56
.include <bsd.port.pre.mk>
55
.include <bsd.port.pre.mk>
57
58
##
59
## Sanity check; -C flag for make(1) was added in 4.8, but was not
60
## fully fixed until shortly before 4.9-RELEASE.  We need -C !
61
##
62
.if ${OSVERSION} < 490000
63
BROKEN=	Please upgrade to FreeBSD 4.9-RELEASE or higher \(see PR bin/50981\).
64
.endif
65
56
66
.if exists(${LOCALBASE}/include/apache2/apr.h) || defined(WITH_APACHE2)
57
.if exists(${LOCALBASE}/include/apache2/apr.h) || defined(WITH_APACHE2)
67
APACHE_PORT=	www/apache2
58
APACHE_PORT=	www/apache2
(-)suphp/files/patch-src::Makefile.in (-7 / +34 lines)
Lines 1-6 Link Here
1
--- src/Makefile.in.orig	Mon Aug 25 11:50:48 2003
1
--- src/Makefile.in.orig	Tue Jul 13 02:43:41 2004
2
+++ src/Makefile.in	Thu Jul 15 22:52:13 2004
2
+++ src/Makefile.in	Wed Aug 11 22:02:44 2004
3
@@ -28,11 +28,13 @@
3
@@ -28,37 +28,38 @@
4
 INCLUDES = -I$(top_srcdir)/src
4
 INCLUDES = -I$(top_srcdir)/src
5
 RM = rm -f
5
 RM = rm -f
6
 
6
 
Lines 17-23 Link Here
17
 
17
 
18
 suphp.mod:
18
 suphp.mod:
19
 	@if test "$(APXS)" != "/notfound/"; then \
19
 	@if test "$(APXS)" != "/notfound/"; then \
20
@@ -49,7 +51,6 @@
20
 	  if test "$(APACHE_VERSION_2)" = "true"; then \
21
 	    echo "*** INFO: Building mod_suphp for Apache 2.0 ***"; \
22
-	    $(MAKE) $(MAKEDEFS) -C apache2; \
23
+	    cd apache2 && $(MAKE) $(MAKEDEFS); \
24
 	  fi; \
25
 	  if test "$(APACHE_VERSION_1_3)" = "true"; then \
26
 	    echo "*** INFO: Building mod_suphp for Apache 1.3 ***"; \
27
-	    $(MAKE) $(MAKEDEFS) -C apache; \
28
+	    cd apache && $(MAKE) $(MAKEDEFS); \
29
 	  fi; \
30
 	else \
31
 	  echo "*** WARNING: No 'apxs' found. Skipping mod_suphp! ***"; \
21
 	fi
32
 	fi
22
 
33
 
23
 install: suphp suphp.mod
34
 install: suphp suphp.mod
Lines 25-33 Link Here
25
 	$(INSTALL_PROGRAM) -m 4755 suphp $(DESTDIR)$(sbindir)/suphp
36
 	$(INSTALL_PROGRAM) -m 4755 suphp $(DESTDIR)$(sbindir)/suphp
26
 	@if test "$(APXS)" != "/notfound/"; then \
37
 	@if test "$(APXS)" != "/notfound/"; then \
27
 	  if test "$(APACHE_VERSION_2)" = "true"; then \
38
 	  if test "$(APACHE_VERSION_2)" = "true"; then \
28
@@ -69,6 +70,6 @@
39
 	    echo "*** INFO: Installing mod_suphp for Apache 2.0 ***"; \
29
 	@$(MAKE) $(MAKEDEFS) -C apache clean
40
-	    $(MAKE) $(MAKEDEFS) -C apache2 install; \
30
 	@$(MAKE) $(MAKEDEFS) -C apache2 clean
41
+	    cd apache2 && $(MAKE) $(MAKEDEFS) install; \
42
 	  fi; \
43
 	  if test "$(APACHE_VERSION_1_3)" = "true"; then \
44
 	    echo "*** INFO: Installing mod_suphp for Apache 1.3 ***"; \
45
-	    $(MAKE) $(MAKEDEFS) -C apache install; \
46
+	    cd apache && $(MAKE) $(MAKEDEFS) install; \
47
 	  fi; \
48
 	else \
49
 	  echo "*** WARNING: No 'apxs' found. Skipping installation of mod_suphp! ***"; \
50
@@ -66,9 +67,9 @@
51
 
52
 clean:
53
 	$(RM) suphp *.o
54
-	@$(MAKE) $(MAKEDEFS) -C apache clean
55
-	@$(MAKE) $(MAKEDEFS) -C apache2 clean
56
+	cd apache && $(MAKE) $(MAKEDEFS) clean
57
+	cd apache2 && $(MAKE) $(MAKEDEFS) clean
31
 
58
 
32
-%.o : %.c
59
-%.o : %.c
33
+${OBJS}: ${SRCS}
60
+${OBJS}: ${SRCS}

Return to bug 70345