Index: head/www/xshttpd-devel/Makefile =================================================================== --- head/www/xshttpd-devel/Makefile (revision 193491) +++ head/www/xshttpd-devel/Makefile (revision 193492) @@ -1,112 +1,114 @@ # New ports collection makefile for: xshttpd # Date created: 29 June 2005 # Whom: Ed Schouten # # $FreeBSD$ # PORTNAME= xshttpd -DISTVERSION= 3.5b07 +DISTVERSION= 3.5b10 CATEGORIES= www ipv6 MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ \ ftp://mud.stack.nl/pub/xs-httpd/release/ PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}-${DISTVERSION:S/.//} MAINTAINER= johans@stack.nl COMMENT= A webserver with CGI as own user and SSL suport -RUN_DEPENDS= run-mailcap:${PORTSDIR}/misc/mime-support +RUN_DEPENDS= run-mailcap:${PORTSDIR}/misc/mime-support \ + ppmtogif:${PORTSDIR}/graphics/netpbm -CONFLICTS+= apache-[0-9]* xshttpd-[0-9]* +CONFLICTS+= xshttpd-[0-9]* MAN1= clearxs.1 gfxcount.1 httpd.1 httpdc.1 imagemap.1 \ readxs.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.sh GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} OPTIONS= SSL "Enable https support" On \ + PCRE "Enable pcre rewriting support" On \ LDAP "Enable ldap support" Off \ - PCRE "Enable pcre rewriting support" Off \ CURL "Enable curl (proxy) support" Off \ M4_CONFIG "Enable m4 configuration preprocessor" Off \ PERSISTENT_PERL "Enable persistent perl interpreter" Off PORTDOCS= README COPYING ChangeLog +.include # By default XS-HTTPD stores its data in ${PREFIX}/lib/httpd -WWWDIR?= ${PREFIX}/www +WWWDIR?= ${PREFIX}/www/${PORTNAME} CONFIGURE_ARGS+=--with-rootdir=${WWWDIR} --mandir=${MANPREFIX}/man -.include - .if !defined(WITHOUT_SSL) .include <${PORTSDIR}/Mk/bsd.openssl.mk> #USE_OPENSSL= yes CONFIGURE_ARGS+=--with-ssl .else CONFIGURE_ARGS+=--without-ssl .endif .if defined(WITH_LDAP) USE_OPENLDAP= yes CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} .else CONFIGURE_ARGS+=--without-ldap .endif .if defined(WITH_M4_CONFIG) CONFIGURE_ARGS+=--with-preprocessor .else CONFIGURE_ARGS+=--without-preprocessor .endif .if defined(WITH_PERSISTENT_PERL) USE_PERL5= yes CONFIGURE_ARGS+=--with-perl .else CONFIGURE_ARGS+=--without-perl .endif .if defined(WITH_PCRE) LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre CONFIGURE_ARGS+=--with-pcre=yes .else CONFIGURE_ARGS+=--with-pcre=no .endif .if defined(WITH_CURL) LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=--with-curl=yes .else CONFIGURE_ARGS+=--with-curl=no .endif post-patch: .for i in man/httpd.1 man/httpd.conf.5 config/httpd.conf.sample \ contrib/SSL-Makefile contrib/logrotate.sh @${REINPLACE_CMD} \ -e 's|/wwwsys|${WWWDIR}|g' \ -e 's|/usr/local/lib/httpd|${WWWDIR}|g' \ -e 's|nobody|${WWWOWN}|g' \ -e 's|nogroup|${WWWGRP}|g' \ ${WRKSRC}/$i .endfor - @${REINPLACE_CMD} -e 's|\(MIMETYPESFILE\ "\).*|\1${LOCALBASE}/etc/mime.types"|' \ + @${REINPLACE_CMD} \ + -e 's|\(MIMETYPESFILE\ "\).*|\1${LOCALBASE}/etc/mime.types"|' \ ${WRKSRC}/src/confuser.h @${REINPLACE_CMD} -e 's|mime.types ||g' \ ${WRKSRC}/config/Makefile.in post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} . for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} . endfor .endif .include Property changes on: head/www/xshttpd-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.27 \ No newline at end of property +1.28 \ No newline at end of property Index: head/www/xshttpd-devel/distinfo =================================================================== --- head/www/xshttpd-devel/distinfo (revision 193491) +++ head/www/xshttpd-devel/distinfo (revision 193492) @@ -1,3 +1,3 @@ -MD5 (xshttpd-35b07.tar.bz2) = c91b93d9866dc8cc85ec875d3f8f6b00 -SHA256 (xshttpd-35b07.tar.bz2) = fb67c7ba1ccda1da76751053c72c234f6c1d722b0887667f84dd3b84e2cf5b20 -SIZE (xshttpd-35b07.tar.bz2) = 211175 +MD5 (xshttpd-35b10.tar.bz2) = b7e5871b164c988643a029fc2c26d4f5 +SHA256 (xshttpd-35b10.tar.bz2) = f92eda0f4f2a041c0d70422c313ed490fa5a2a5d2b476aed4807db2ccdb1a933 +SIZE (xshttpd-35b10.tar.bz2) = 212620 Property changes on: head/www/xshttpd-devel/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.24 \ No newline at end of property +1.25 \ No newline at end of property Index: head/www/xshttpd-devel/pkg-plist =================================================================== --- head/www/xshttpd-devel/pkg-plist (revision 193491) +++ head/www/xshttpd-devel/pkg-plist (revision 193492) @@ -1,71 +1,74 @@ bin/clearxs bin/httpd bin/httpdc bin/readxs bin/xsindex bin/xspasswd %%WWWDIR%%/cgi-bin/error %%WWWDIR%%/cgi-bin/gfxcount %%WWWDIR%%/cgi-bin/imagemap +%%WWWDIR%%/conf/httpd.conf.sample +%%WWWDIR%%/conf/mime.index +%%WWWDIR%%/conf/script.methods.sample %%WWWDIR%%/contrib/SSL-Makefile %%WWWDIR%%/contrib/agentstats.pl %%WWWDIR%%/contrib/caroot.pem %%WWWDIR%%/contrib/logrotate.sh %%WWWDIR%%/contrib/persistent.pl %%WWWDIR%%/contrib/powered-by-xs.gif %%WWWDIR%%/contrib/wwwstats.pl %%WWWDIR%%/compress.methods.sample %%WWWDIR%%/gfxcount/digital0.ppm %%WWWDIR%%/gfxcount/digital1.ppm %%WWWDIR%%/gfxcount/digital2.ppm %%WWWDIR%%/gfxcount/digital3.ppm %%WWWDIR%%/gfxcount/digital4.ppm %%WWWDIR%%/gfxcount/digital5.ppm %%WWWDIR%%/gfxcount/digital6.ppm %%WWWDIR%%/gfxcount/digital7.ppm %%WWWDIR%%/gfxcount/digital8.ppm %%WWWDIR%%/gfxcount/digital9.ppm %%WWWDIR%%/gfxcount/large0.ppm %%WWWDIR%%/gfxcount/large1.ppm %%WWWDIR%%/gfxcount/large2.ppm %%WWWDIR%%/gfxcount/large3.ppm %%WWWDIR%%/gfxcount/large4.ppm %%WWWDIR%%/gfxcount/large5.ppm %%WWWDIR%%/gfxcount/large6.ppm %%WWWDIR%%/gfxcount/large7.ppm %%WWWDIR%%/gfxcount/large8.ppm %%WWWDIR%%/gfxcount/large9.ppm %%WWWDIR%%/gfxcount/largecol0.ppm %%WWWDIR%%/gfxcount/largecol1.ppm %%WWWDIR%%/gfxcount/largecol2.ppm %%WWWDIR%%/gfxcount/largecol3.ppm %%WWWDIR%%/gfxcount/largecol4.ppm %%WWWDIR%%/gfxcount/largecol5.ppm %%WWWDIR%%/gfxcount/largecol6.ppm %%WWWDIR%%/gfxcount/largecol7.ppm %%WWWDIR%%/gfxcount/largecol8.ppm %%WWWDIR%%/gfxcount/largecol9.ppm -%%WWWDIR%%/httpd.conf.sample -%%WWWDIR%%/htdocs/icons/xs-audio.gif -%%WWWDIR%%/htdocs/icons/xs-back.gif -%%WWWDIR%%/htdocs/icons/xs-base.gif -%%WWWDIR%%/htdocs/icons/xs-bin.gif -%%WWWDIR%%/htdocs/icons/xs-dir.gif -%%WWWDIR%%/htdocs/icons/xs-gif.gif -%%WWWDIR%%/htdocs/icons/xs-html.gif -%%WWWDIR%%/htdocs/icons/xs-image.gif -%%WWWDIR%%/htdocs/icons/xs-jpeg.gif -%%WWWDIR%%/htdocs/icons/xs-ps.gif -%%WWWDIR%%/htdocs/icons/xs-tar.gif -%%WWWDIR%%/htdocs/icons/xs-txt.gif -%%WWWDIR%%/htdocs/icons/xs-unknown.gif -%%WWWDIR%%/htdocs/icons/xs-video.gif -%%WWWDIR%%/htdocs/icons/xs-zip.gif -%%WWWDIR%%/mime.index -%%WWWDIR%%/script.methods.sample +%%WWWDIR%%/icons/xs-audio.gif +%%WWWDIR%%/icons/xs-back.gif +%%WWWDIR%%/icons/xs-base.gif +%%WWWDIR%%/icons/xs-bin.gif +%%WWWDIR%%/icons/xs-dir.gif +%%WWWDIR%%/icons/xs-gif.gif +%%WWWDIR%%/icons/xs-html.gif +%%WWWDIR%%/icons/xs-image.gif +%%WWWDIR%%/icons/xs-jpeg.gif +%%WWWDIR%%/icons/xs-ps.gif +%%WWWDIR%%/icons/xs-tar.gif +%%WWWDIR%%/icons/xs-txt.gif +%%WWWDIR%%/icons/xs-unknown.gif +%%WWWDIR%%/icons/xs-video.gif +%%WWWDIR%%/icons/xs-zip.gif +@exec mkdir -p %%WWWDIR%%/htdocs @dirrm %%WWWDIR%%/contrib @dirrm %%WWWDIR%%/gfxcount @dirrmtry %%WWWDIR%%/cgi-bin -@dirrmtry %%WWWDIR%%/htdocs/icons +@dirrmtry %%WWWDIR%%/conf @dirrmtry %%WWWDIR%%/htdocs +@dirrmtry %%WWWDIR%%/icons @dirrmtry %%WWWDIR%%/logs +@dirrmtry %%WWWDIR%% Property changes on: head/www/xshttpd-devel/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property