diff options
| author | Jeremy Chadwick <koitsu@FreeBSD.org> | 2007-08-15 22:58:58 +0000 |
|---|---|---|
| committer | Jeremy Chadwick <koitsu@FreeBSD.org> | 2007-08-15 22:58:58 +0000 |
| commit | ad568101229354684ddc7db86f6d9e4ceed3324b (patch) | |
| tree | f22642f0f28353d0d75fdd194171ff50a2ffde12 /www | |
| parent | c4668e479c0a0f4be1fe60622595429e01167223 (diff) | |
| download | ports-ad568101229354684ddc7db86f6d9e4ceed3324b.tar.gz ports-ad568101229354684ddc7db86f6d9e4ceed3324b.zip | |
Fix for "make install"; logic in cgiwrap's autoconf file for --with-cgiwrapd
and --without-cgiwrapd is broken (always assumes cgiwrapd will be used).
Will submit fix upstream.
Reviewed by: philip
Approved by: philip
Notes
Notes:
svn path=/head/; revision=197778
Diffstat (limited to 'www')
| -rw-r--r-- | www/cgiwrap/Makefile | 9 | ||||
| -rw-r--r-- | www/cgiwrap/files/patch-configure | 45 |
2 files changed, 50 insertions, 4 deletions
diff --git a/www/cgiwrap/Makefile b/www/cgiwrap/Makefile index d8eb4f90a4e7..951a53a14e03 100644 --- a/www/cgiwrap/Makefile +++ b/www/cgiwrap/Makefile @@ -7,6 +7,7 @@ PORTNAME= cgiwrap PORTVERSION= 4.0 +PORTREVISION= 1 CATEGORIES= www security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -103,11 +104,11 @@ CONFIGURE_ARGS+= --without-nph PLIST_SUB+= NPHFLAG= .endif -.if !defined(WITH_DEBUG) -PLIST_SUB+= DEBUGFLAG="@comment " -CONFIGURE_ARGS+= --without-cgiwrapd -.else +.if defined(WITH_DEBUG) PLIST_SUB+= DEBUGFLAG= +CONFIGURE_ARGS+= --with-cgiwrapd +.else +PLIST_SUB+= DEBUGFLAG="@comment " .endif .if !defined(NOPORTDOCS) diff --git a/www/cgiwrap/files/patch-configure b/www/cgiwrap/files/patch-configure new file mode 100644 index 000000000000..30f72256ad5b --- /dev/null +++ b/www/cgiwrap/files/patch-configure @@ -0,0 +1,45 @@ +--- configure.old Wed Jan 24 09:29:16 2007 ++++ configure Wed Aug 15 11:19:50 2007 +@@ -1306,7 +1306,7 @@ + --with-install-dir=PATH + path to installation directory + --with-cgiwrapd +- disable installation of cgiwrapd ++ install cgiwrapd + --without-nph + disable installation of nph-cgiwrap + --with-cgi-dir=PATH (public_html/cgi-bin) +@@ -6323,20 +6323,25 @@ + + + +-{ echo "$as_me:$LINENO: checking for whether to disable cgiwrapd" >&5 +-echo $ECHO_N "checking for whether to disable cgiwrapd... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking for whether to install cgiwrapd" >&5 ++echo $ECHO_N "checking for whether to install cgiwrapd... $ECHO_C" >&6; } + + # Check whether --with-cgiwrapd was given. + if test "${with_cgiwrapd+set}" = set; then + withval=$with_cgiwrapd; +- { echo "$as_me:$LINENO: result: enabled" >&5 +-echo "${ECHO_T}enabled" >&6; } +- DOINSTALLCGIWRAPD="" +- ++ if test x"$withval" != xno; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ DOINSTALLCGIWRAPD="" ++ else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ DOINSTALLCGIWRAPD="#" ++ fi + else + +- { echo "$as_me:$LINENO: result: disabled" >&5 +-echo "${ECHO_T}disabled" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + DOINSTALLCGIWRAPD="#" + + fi |