svn commit: r324345 - in head/www: xshttpd xshttpd-devel
Alexey Dokuchaev
danfe at FreeBSD.org
Wed Aug 7 10:53:32 UTC 2013
Author: danfe
Date: Wed Aug 7 10:53:31 2013
New Revision: 324345
URL: http://svnweb.freebsd.org/changeset/ports/324345
Log:
- Unbreak parallel builds in xshttpd-devel port (add missing dependencies)
- Define LICENSE (BSD), do not spam portdocs with COPYING files
- Use new way when setting LIB_DEPENDS, fix PERSISTENT_PERL_DESC
- For xshttpd port only: trim the header, convert NOPORTDOCS
- Get rid of .for loop when installing documentation files
- Remove gratuitous differences between two ports, sort knobs, fix whitespace
Modified:
head/www/xshttpd-devel/Makefile
head/www/xshttpd/Makefile
Modified: head/www/xshttpd-devel/Makefile
==============================================================================
--- head/www/xshttpd-devel/Makefile Wed Aug 7 10:48:11 2013 (r324344)
+++ head/www/xshttpd-devel/Makefile Wed Aug 7 10:53:31 2013 (r324345)
@@ -13,30 +13,33 @@ DISTNAME= ${PORTNAME}-${DISTVERSION:S/./
MAINTAINER= johans at FreeBSD.org
COMMENT= Webserver with CGI as own user and SSL support
+LICENSE= BSD
+
RUN_DEPENDS= run-mailcap:${PORTSDIR}/misc/mime-support \
ppmtogif:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
+
+CONFLICTS_INSTALL= xshttpd-[0-9]* publicfile-[0-9]*
-CONFLICTS_INSTALL+= xshttpd-[0-9]* publicfile-[0-9]*
+USE_BZIP2= yes
+USE_OPENSSL= yes
+USE_RC_SUBR= xshttpd
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-hier=bsd
MAN1= clearxs.1 gfxcount.1 httpd.1 httpdc.1 imagemap.1 \
readxs.1 xschpass.1 xsindex.1 xspasswd.1
MAN5= httpd.conf.5 xsauth.5 xsconf.5 xsscripts.5 xsredir.5
MAN7= httpd_cgi.7 httpd_ssi.7
-USE_OPENSSL= yes
-USE_BZIP2= yes
-USE_RC_SUBR= xshttpd
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--enable-hier=bsd
OPTIONS_DEFINE= LDAP CURL M4_CONFIG PERSISTENT_PERL
M4_CONFIG_DESC= Enable m4 configuration preprocessor
-PERSISTENT_PERL_DESC= Enable persistent perl interpreter
+PERSISTENT_PERL_DESC= Enable persistent Perl interpreter
-PORTDOCS= README COPYING ChangeLog
+PORTDOCS= README ChangeLog
.include <bsd.port.options.mk>
+
# By default XS-HTTPD stores its data in ${PREFIX}/lib/httpd
WWWDIR?= ${PREFIX}/www/${PORTNAME}
@@ -65,7 +68,7 @@ PLIST_SUB+= PERL="@comment "
.endif
.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+=--with-curl
.else
CONFIGURE_ARGS+=--without-curl
@@ -80,13 +83,15 @@ post-patch:
${WRKSRC}/src/constants.h
@${REINPLACE_CMD} -e 's|mime.types ||g' \
${WRKSRC}/config/Makefile.in
+# Fix parallel builds (-jX): all programs must depend on the library
+ @${ECHO_CMD} '$$(bin_PROGRAMS) $$(phexec_PROGRAMS)' \
+ '$$(noinst_PROGRAMS): $$(noinst_LIBRARIES)' \
+ >> ${WRKSRC}/src/Makefile.in
post-install:
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
-. for f in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-. endfor
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
.endif
.include <bsd.port.mk>
Modified: head/www/xshttpd/Makefile
==============================================================================
--- head/www/xshttpd/Makefile Wed Aug 7 10:48:11 2013 (r324344)
+++ head/www/xshttpd/Makefile Wed Aug 7 10:53:31 2013 (r324345)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xshttpd
-# Date created: 29 June 2005
-# Whom: Ed Schouten <ed at fxq.nl>
-#
+# Created by: Ed Schouten <ed at fxq.nl>
# $FreeBSD$
-#
PORTNAME= xshttpd
DISTVERSION= 3.6g01
@@ -16,28 +12,31 @@ DISTNAME= ${PORTNAME}-${DISTVERSION:S/./
MAINTAINER= johans at FreeBSD.org
COMMENT= Webserver with CGI as own user and SSL support
+LICENSE= BSD
+
RUN_DEPENDS= run-mailcap:${PORTSDIR}/misc/mime-support \
ppmtogif:${PORTSDIR}/graphics/netpbm
-CONFLICTS_INSTALL+= xshttpd-devel-[0-9]* publicfile-[0-9]*
+CONFLICTS_INSTALL= xshttpd-devel-[0-9]* publicfile-[0-9]*
+
+USE_BZIP2= yes
+USE_RC_SUBR= xshttpd
+GNU_CONFIGURE= yes
MAN1= clearxs.1 gfxcount.1 httpd.1 httpdc.1 imagemap.1 \
readxs.1 xschpass.1 xsindex.1 xspasswd.1
MAN5= httpd.conf.5 xsauth.5 xsconf.5 xsscripts.5 xsredir.5
MAN7= httpd_cgi.7 httpd_ssi.7
-USE_BZIP2= yes
-USE_RC_SUBR= xshttpd
-
-GNU_CONFIGURE= yes
OPTIONS_DEFINE= SSL PCRE LDAP CURL M4_CONFIG PERSISTENT_PERL
OPTIONS_DEFAULT=SSL PCRE
M4_CONFIG_DESC= Enable m4 configuration preprocessor
-PERSISTENT_PERL_DESC= Enable persistent perl interpreter
+PERSISTENT_PERL_DESC= Enable persistent Perl interpreter
-PORTDOCS= README COPYING ChangeLog
+PORTDOCS= README ChangeLog
.include <bsd.port.options.mk>
+
# By default XS-HTTPD stores its data in ${PREFIX}/lib/httpd
WWWDIR?= ${PREFIX}/www/${PORTNAME}
CONFIGURE_ARGS+=--with-rootdir=${WWWDIR}
@@ -101,11 +100,9 @@ post-patch:
${WRKSRC}/config/Makefile.in
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
-. for f in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-. endfor
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
.endif
.include <bsd.port.mk>
More information about the svn-ports-all
mailing list