svn commit: r362912 - in head/www/mod_dnssd: . files

[Dag-Erling Smørgrav]

Author: des
Date: Fri Jul 25 14:16:50 2014
New Revision: 362912
URL: http://svnweb.freebsd.org/changeset/ports/362912
QAT: https://qat.redports.org/buildarchive/r362912/

Log:
  Stagify, implement the DOCS option correctly, and enable Apache 2.4.

Modified:
  head/www/mod_dnssd/Makefile
  head/www/mod_dnssd/files/patch-src_Makefile.in

Modified: head/www/mod_dnssd/Makefile
==============================================================================
--- head/www/mod_dnssd/Makefile	Fri Jul 25 14:15:55 2014	(r362911)
+++ head/www/mod_dnssd/Makefile	Fri Jul 25 14:16:50 2014	(r362912)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mod_dnssd
 PORTVERSION=	0.6
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	www
 MASTER_SITES=	http://0pointer.de/lennart/projects/mod_dnssd/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ COMMENT=	An Apache module that provides 
 LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
 
 USES=		gmake pkgconfig
-USE_APACHE=	22
+USE_APACHE=	22+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	APR_CFLAGS="`${LOCALBASE}/bin/apr-1-config --cflags --cppflags --includes`" \
 		APR_LIBS="`${LOCALBASE}/bin/apr-1-config --ldflags`"
@@ -22,11 +22,16 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-lynx
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
+post-configure:
+	${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' ${WRKSRC}/src/Makefile
+
+pre-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
+
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/README ${DOCSDIR}/README
-.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/README ${STAGEDIR}${DOCSDIR}/README
 
 .include <bsd.port.mk>

Modified: head/www/mod_dnssd/files/patch-src_Makefile.in
==============================================================================
--- head/www/mod_dnssd/files/patch-src_Makefile.in	Fri Jul 25 14:15:55 2014	(r362911)
+++ head/www/mod_dnssd/files/patch-src_Makefile.in	Fri Jul 25 14:16:50 2014	(r362912)
@@ -1,8 +1,10 @@
---- src/Makefile.in.orig	2009-02-27 17:10:12.000000000 -0500
-+++ src/Makefile.in	2009-02-27 17:10:21.000000000 -0500
-@@ -16,8 +16,8 @@
+--- src/Makefile.in.orig	2009-01-22 17:42:02.000000000 +0100
++++ src/Makefile.in	2014-07-25 15:51:40.137601137 +0200
+@@ -15,9 +15,10 @@
+ # permissions and limitations under the License.
  
  APXS=@APXS@
++APXS_STAGE=@APXS_STAGE@
  APACHECTL=@APACHECTL@
 -LIBS=-Wl,"@LIBS@" @AVAHI_LIBS@
 -CFLAGS=-Wc,"@CFLAGS@" @AVAHI_CFLAGS@
@@ -11,3 +13,12 @@
  
  all: mod_dnssd.la
  
+@@ -25,7 +26,7 @@
+ 	$(APXS) -c $(CFLAGS) $(LIBS) @srcdir@/mod_dnssd.c
+ 
+ install: all
+-	$(APXS) -i -a mod_dnssd.la 
++	$(APXS) $(APXS_STAGE) -i -a mod_dnssd.la 
+ 
+ clean:
+ 	rm -rf *.o *.so *.loT .deps/ *.la *.lo *.slo .libs/