Attachment 142022 Details for Bug 188972 – lighttpd.patch

[patch] lighttpd.patch

lighttpd.patch (text/plain), 6.50 KB, created by Tijl Coosemans on 2014-04-24 20:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2014-04-24 20:30:01 UTC

Size: 6.50 KB

patch

obsolete

>Index: www/lighttpd/Makefile
>===================================================================
>--- www/lighttpd/Makefile	(revision 352018)
>+++ www/lighttpd/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=	lighttpd
> PORTVERSION=	1.4.35
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES?=	www
> MASTER_SITES?=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
> 
>@@ -17,21 +17,17 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
> 
>-USE_BZIP2=	yes
> GNU_CONFIGURE=	yes
>-USE_GNOME=	lthack
>-USES=		gmake pkgconfig
>+USES=		gmake libtool:keepla pkgconfig tar:bzip2
> 
> #.if !defined(_BUILDING_LIGHTTPD_MODULE)
>-#USE_AUTOTOOLS=	libtool
> #.else
>-USE_AUTOTOOLS=	autoconf autoheader aclocal automake libtool
>-ACLOCAL_ARGS=	-I m4
>-AUTOMAKE_ARGS=	--add-missing
>+USE_AUTOTOOLS=	autoconf autoheader aclocal automake
>+AUTOMAKE_ARGS=	-a -c -f
> #.endif
>-CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/lighttpd --enable-static
>+CONFIGURE_ARGS+=--libdir=${PREFIX}/lib/lighttpd
> 
>-CFLAGS+=	-I${LOCALBASE}/include
>+CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
> .if !defined(_BUILDING_LIGHTTPD_MODULE)
>Index: www/lighttpd/files/pkg-plist.mod_geoip
>===================================================================
>--- www/lighttpd/files/pkg-plist.mod_geoip	(revision 352018)
>+++ www/lighttpd/files/pkg-plist.mod_geoip	(working copy)
>@@ -1,6 +1,5 @@
> @unexec if cmp -s %D/etc/lighttpd/conf.d/geoip.conf %D/etc/lighttpd/conf.d/geoip.conf.sample; then rm -f %D/etc/lighttpd/conf.d/geoip.conf; fi
> etc/lighttpd/conf.d/geoip.conf.sample
> @exec [ -f %B/geoip.conf ] || cp %B/%f %B/geoip.conf
>-lib/lighttpd/mod_geoip.a
> lib/lighttpd/mod_geoip.la
> lib/lighttpd/mod_geoip.so
>Index: www/lighttpd/files/pkg-plist.mod_h264_streaming
>===================================================================
>--- www/lighttpd/files/pkg-plist.mod_h264_streaming	(revision 352018)
>+++ www/lighttpd/files/pkg-plist.mod_h264_streaming	(working copy)
>@@ -1,6 +1,5 @@
> @unexec if cmp -s %D/etc/lighttpd/conf.d/h264_streaming.conf %D/etc/lighttpd/conf.d/h264_streaming.conf.sample; then rm -f %D/etc/lighttpd/conf.d/h264_streaming.conf; fi
> etc/lighttpd/conf.d/h264_streaming.conf.sample
> @exec [ -f %B/h264_streaming.conf ] || cp %B/%f %B/h264_streaming.conf
>-lib/lighttpd/mod_h264_streaming.a
> lib/lighttpd/mod_h264_streaming.la
> lib/lighttpd/mod_h264_streaming.so
>Index: www/lighttpd/pkg-plist
>===================================================================
>--- www/lighttpd/pkg-plist	(revision 352018)
>+++ www/lighttpd/pkg-plist	(working copy)
>@@ -74,100 +74,68 @@ etc/lighttpd/conf.d/userdir.conf.sample
> etc/lighttpd/conf.d/webdav.conf.sample
> @exec [ -f %B/webdav.conf ] || cp %B/%f %B/webdav.conf
> etc/lighttpd/vhosts.d/vhosts.template
>-lib/lighttpd/mod_access.a
> lib/lighttpd/mod_access.la
> lib/lighttpd/mod_access.so
>-lib/lighttpd/mod_accesslog.a
> lib/lighttpd/mod_accesslog.la
> lib/lighttpd/mod_accesslog.so
>-lib/lighttpd/mod_alias.a
> lib/lighttpd/mod_alias.la
> lib/lighttpd/mod_alias.so
>-lib/lighttpd/mod_auth.a
> lib/lighttpd/mod_auth.la
> lib/lighttpd/mod_auth.so
>-lib/lighttpd/mod_cgi.a
> lib/lighttpd/mod_cgi.la
> lib/lighttpd/mod_cgi.so
>-lib/lighttpd/mod_cml.a
> lib/lighttpd/mod_cml.la
> lib/lighttpd/mod_cml.so
>-lib/lighttpd/mod_compress.a
> lib/lighttpd/mod_compress.la
> lib/lighttpd/mod_compress.so
>-lib/lighttpd/mod_dirlisting.a
> lib/lighttpd/mod_dirlisting.la
> lib/lighttpd/mod_dirlisting.so
>-lib/lighttpd/mod_evasive.a
> lib/lighttpd/mod_evasive.la
> lib/lighttpd/mod_evasive.so
>-lib/lighttpd/mod_evhost.a
> lib/lighttpd/mod_evhost.la
> lib/lighttpd/mod_evhost.so
>-lib/lighttpd/mod_expire.a
> lib/lighttpd/mod_expire.la
> lib/lighttpd/mod_expire.so
>-lib/lighttpd/mod_extforward.a
> lib/lighttpd/mod_extforward.la
> lib/lighttpd/mod_extforward.so
>-lib/lighttpd/mod_fastcgi.a
> lib/lighttpd/mod_fastcgi.la
> lib/lighttpd/mod_fastcgi.so
>-lib/lighttpd/mod_flv_streaming.a
> lib/lighttpd/mod_flv_streaming.la
> lib/lighttpd/mod_flv_streaming.so
>-lib/lighttpd/mod_indexfile.a
> lib/lighttpd/mod_indexfile.la
> lib/lighttpd/mod_indexfile.so
>-lib/lighttpd/mod_magnet.a
> lib/lighttpd/mod_magnet.la
> lib/lighttpd/mod_magnet.so
>-lib/lighttpd/mod_mysql_vhost.a
> lib/lighttpd/mod_mysql_vhost.la
> lib/lighttpd/mod_mysql_vhost.so
>-lib/lighttpd/mod_proxy.a
> lib/lighttpd/mod_proxy.la
> lib/lighttpd/mod_proxy.so
>-lib/lighttpd/mod_redirect.a
> lib/lighttpd/mod_redirect.la
> lib/lighttpd/mod_redirect.so
>-lib/lighttpd/mod_rewrite.a
> lib/lighttpd/mod_rewrite.la
> lib/lighttpd/mod_rewrite.so
>-lib/lighttpd/mod_rrdtool.a
> lib/lighttpd/mod_rrdtool.la
> lib/lighttpd/mod_rrdtool.so
>-lib/lighttpd/mod_scgi.a
> lib/lighttpd/mod_scgi.la
> lib/lighttpd/mod_scgi.so
>-lib/lighttpd/mod_secdownload.a
> lib/lighttpd/mod_secdownload.la
> lib/lighttpd/mod_secdownload.so
>-lib/lighttpd/mod_setenv.a
> lib/lighttpd/mod_setenv.la
> lib/lighttpd/mod_setenv.so
>-lib/lighttpd/mod_simple_vhost.a
> lib/lighttpd/mod_simple_vhost.la
> lib/lighttpd/mod_simple_vhost.so
>-lib/lighttpd/mod_ssi.a
> lib/lighttpd/mod_ssi.la
> lib/lighttpd/mod_ssi.so
>-lib/lighttpd/mod_staticfile.a
> lib/lighttpd/mod_staticfile.la
> lib/lighttpd/mod_staticfile.so
>-lib/lighttpd/mod_status.a
> lib/lighttpd/mod_status.la
> lib/lighttpd/mod_status.so
>-lib/lighttpd/mod_trigger_b4_dl.a
> lib/lighttpd/mod_trigger_b4_dl.la
> lib/lighttpd/mod_trigger_b4_dl.so
>-lib/lighttpd/mod_userdir.a
> lib/lighttpd/mod_userdir.la
> lib/lighttpd/mod_userdir.so
>-lib/lighttpd/mod_usertrack.a
> lib/lighttpd/mod_usertrack.la
> lib/lighttpd/mod_usertrack.so
>-lib/lighttpd/mod_webdav.a
> lib/lighttpd/mod_webdav.la
> lib/lighttpd/mod_webdav.so
> man/man8/lighttpd.8.gz
>Index: www/lighttpd-mod_geoip/Makefile
>===================================================================
>--- www/lighttpd-mod_geoip/Makefile	(revision 352018)
>+++ www/lighttpd-mod_geoip/Makefile	(working copy)
>@@ -33,8 +33,6 @@ do-install:
> 		${STAGEDIR}${PREFIX}/lib/lighttpd
> 	@${INSTALL_KLD} ${WRKSRC}/src/.libs/${PORTNAME}.la \
> 		${STAGEDIR}${PREFIX}/lib/lighttpd
>-	@${INSTALL_DATA} ${WRKSRC}/src/.libs/${PORTNAME}.a \
>-		${STAGEDIR}${PREFIX}/lib/lighttpd
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d
>Index: www/lighttpd-mod_h264_streaming/Makefile
>===================================================================
>--- www/lighttpd-mod_h264_streaming/Makefile	(revision 352018)
>+++ www/lighttpd-mod_h264_streaming/Makefile	(working copy)
>@@ -41,8 +41,6 @@ do-install:
> 		${STAGEDIR}${PREFIX}/lib/lighttpd
> 	@${INSTALL_KLD} ${WRKSRC}/src/.libs/${PORTNAME}.la \
> 		${STAGEDIR}${PREFIX}/lib/lighttpd
>-	@${INSTALL_DATA} ${WRKSRC}/src/.libs/${PORTNAME}.a \
>-		${STAGEDIR}${PREFIX}/lib/lighttpd
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d

Actions: View | Diff

Attachments on bug 188972: 142022