ports/147439: [PATCH] www/lighttpd: add docs and mod_h264_streaming

[Martin Matuska]

>Number:         147439
>Category:       ports
>Synopsis:       [PATCH] www/lighttpd: add docs and mod_h264_streaming
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 03 14:20:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 8.1-PRERELEASE amd64
>Organization:
>Environment:
>Description:
 System: FreeBSD neo.vx.sk 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #3 r208765M: Thu Jun  3 09:59:09
 - Add basic docs to portdocs
 - Add optional mod_h264_streaming
 
 mod_h264_streaming is licensed under the 
 Creative Commons Attribution-Noncommercial-Share Alike 3.0 Unported license.
 
 The license permits non-commercial use, adaptation and redistribution.
 Therefore a license notice is displayed if compiling with mod_h264_streaming
 and MANUAL_PACKAGE_BUILD is set to prevent automatic creation of packages.
 
 Port maintainer (mnag at FreeBSD.org) is cc'd.
 
 Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- lighttpd-1.4.26_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/lighttpd/Makefile,v
retrieving revision 1.78
diff -u -r1.78 Makefile
--- Makefile	21 May 2010 07:49:36 -0000	1.78
+++ Makefile	3 Jun 2010 14:06:10 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	lighttpd
 PORTVERSION=	1.4.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
 
@@ -21,7 +21,7 @@
 GNU_CONFIGURE=	yes
 USE_GNOME=	lthack pkgconfig
 USE_RC_SUBR=	lighttpd.sh
-CONFIGURE_ARGS=	--libdir=${PREFIX}/lib/lighttpd
+CONFIGURE_ARGS=	--libdir=${PREFIX}/lib/lighttpd --enable-static
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -32,6 +32,7 @@
 		CML		"Enable Cache Meta Language support" off \
 		FAM		"Enable fam/gamin support" off \
 		GDBM		"Enable gdbm storage support" off \
+		H264		"Enable H.264 streaming" off \
 		IPV6		"Enable IPV6 support" on \
 		MAGNET		"Enable magnet support" off \
 		MEMCACHE	"Enable memory caching support" off \
@@ -43,11 +44,28 @@
 		VALGRIND	"Enable valgrind support" off \
 		WEBDAV		"Enable WebDAV support"	off
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	AUTHORS COPYING INSTALL NEWS README
+.endif
+
 .include <bsd.port.pre.mk>
 
 # Default REQUIRE to rc.d script
 _REQUIRE=	DAEMON
 
+.if defined(WITH_H264)
+PATCH_SITES+=		${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR+=	mm
+PATCHFILES+=		lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch.gz
+USE_AUTOTOOLS+=		autoconf:262 autoheader:262 aclocal:110 automake:110
+ACLOCAL_ARGS+=		-I m4
+PORTDOCS+=		COPYING_H264
+MANUAL_PACKAGE_BUILD=	free for non-commercial use only
+PLIST_SUB+=		H264=""
+.else
+PLIST_SUB+=		H264="@comment "
+.endif
+
 .if !defined(WITHOUT_OPENSSL)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 CONFIGURE_ARGS+=	--with-openssl \
@@ -143,6 +161,10 @@
 	@${ECHO} "server.use-ipv6 = \"enable\"" >> ${WRKSRC}/doc/lighttpd.conf
 	@${ECHO} "\$$SERVER[\"socket\"] == \"0.0.0.0:80\" { }" >> ${WRKSRC}/doc/lighttpd.conf
 .endif
+.if defined(WITH_H264)
+	@${CAT} ${WRKSRC}/COPYING_H264
+	@sleep 5
+.endif
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/doc/lighttpd.conf ${PREFIX}/etc/lighttpd.conf.sample
@@ -150,5 +172,11 @@
 	@${INSTALL_DATA} ${WRKSRC}/doc/lighttpd.conf ${PREFIX}/etc/lighttpd.conf
 .endif
 	@${LIBTOOL} --finish ${PREFIX}/lib
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+. for FILE in ${PORTDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}/${FILE}
+. endfor
+.endif
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/www/lighttpd/distinfo,v
retrieving revision 1.41
diff -u -r1.41 distinfo
--- distinfo	16 Feb 2010 21:22:00 -0000	1.41
+++ distinfo	3 Jun 2010 14:06:10 -0000
@@ -1,3 +1,6 @@
 MD5 (lighttpd-1.4.26.tar.bz2) = a682c8efce47a2f4263a247ba0813c9b
 SHA256 (lighttpd-1.4.26.tar.bz2) = d7c25a5bb08c8dbc3e8d86f9e564c90ebf0c365d7fcf5ee801e912fb3c2357fd
 SIZE (lighttpd-1.4.26.tar.bz2) = 627971
+MD5 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch.gz) = 633af734ed50d42b743ab70724058951
+SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch.gz) = d7c3704d5253c4f3c18459f89059063b311e50096cd2c38fc982cec683c32e61
+SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch.gz) = 44695
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/lighttpd/pkg-plist,v
retrieving revision 1.17
diff -u -r1.17 pkg-plist
--- pkg-plist	25 Apr 2009 04:17:03 -0000	1.17
+++ pkg-plist	3 Jun 2010 14:06:10 -0000
@@ -44,6 +44,9 @@
 lib/lighttpd/mod_flv_streaming.a
 lib/lighttpd/mod_flv_streaming.la
 lib/lighttpd/mod_flv_streaming.so
+%%H264%%lib/lighttpd/mod_h264_streaming.a
+%%H264%%lib/lighttpd/mod_h264_streaming.la
+%%H264%%lib/lighttpd/mod_h264_streaming.so
 lib/lighttpd/mod_indexfile.a
 lib/lighttpd/mod_indexfile.la
 lib/lighttpd/mod_indexfile.so
--- lighttpd-1.4.26_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: