[Midnightbsd-cvs] mports [22379] trunk/www/mod_dnssd: patch build

[laffer1 at midnightbsd.org]

Revision: 22379
          http://svnweb.midnightbsd.org/mports/?rev=22379
Author:   laffer1
Date:     2017-03-18 10:44:39 -0400 (Sat, 18 Mar 2017)
Log Message:
-----------
patch build

Modified Paths:
--------------
    trunk/www/mod_dnssd/Makefile
    trunk/www/mod_dnssd/pkg-plist

Added Paths:
-----------
    trunk/www/mod_dnssd/files/patch-src__Makefile.in
    trunk/www/mod_dnssd/files/patch-src__mod_dnssd.c

Removed Paths:
-------------
    trunk/www/mod_dnssd/files/patch-src_Makefile.in

Modified: trunk/www/mod_dnssd/Makefile
===================================================================
--- trunk/www/mod_dnssd/Makefile	2017-03-18 14:02:31 UTC (rev 22378)
+++ trunk/www/mod_dnssd/Makefile	2017-03-18 14:44:39 UTC (rev 22379)
@@ -2,7 +2,7 @@
 
 PORTNAME=	mod_dnssd
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://0pointer.de/lennart/projects/mod_dnssd/
 
@@ -10,6 +10,7 @@
 COMMENT=	Apache module that provides DNS-SD capabilities
 
 LICENSE=	apache2
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 
@@ -18,18 +19,18 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	APR_CFLAGS="`${LOCALBASE}/bin/apr-1-config --cflags --cppflags --includes`" \
 		APR_LIBS="`${LOCALBASE}/bin/apr-1-config --ldflags`"
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-lynx
-CONFIGURE_ARGS+= MP_APXS=${LOCALBASE}/sbin/apxs PREFIX=${PREFIX}
 
-pre-install:
+OPTIONS_DEFINE=	DOCS
+
+post-configure:
+	${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${FAKE_DESTDIR}${TRUE_PREFIX}/${APACHEMODDIR}|' ${WRKSRC}/src/Makefile
 	${MKDIR} ${FAKE_DESTDIR}${TRUE_PREFIX}/${APACHEMODDIR}
 
-do-install:
-	${INSTALL_LIB} ${WRKSRC}/src/.libs/mod_dnssd.so ${FAKE_DESTDIR}${TRUE_PREFIX}/${APACHEMODDIR}
-	${INSTALL_LIB} ${WRKSRC}/src/.libs/mod_dnssd.a ${FAKE_DESTDIR}${TRUE_PREFIX}/${APACHEMODDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/.libs/mod_dnssd.la ${FAKE_DESTDIR}${TRUE_PREFIX}/${APACHEMODDIR}
+#do-install:
+#	${INSTALL_LIB} ${WRKSRC}/src/.libs/mod_dnssd.so ${FAKE_DESTDIR}${TRUE_PREFIX}/${APACHEMODDIR}
+#	${INSTALL_LIB} ${WRKSRC}/src/.libs/mod_dnssd.a ${FAKE_DESTDIR}${TRUE_PREFIX}/${APACHEMODDIR}
+#	${INSTALL_DATA} ${WRKSRC}/src/.libs/mod_dnssd.la ${FAKE_DESTDIR}${TRUE_PREFIX}/${APACHEMODDIR}
 
 post-install:
 .if !defined(NOPORTDOCS)

Deleted: trunk/www/mod_dnssd/files/patch-src_Makefile.in
===================================================================
--- trunk/www/mod_dnssd/files/patch-src_Makefile.in	2017-03-18 14:02:31 UTC (rev 22378)
+++ trunk/www/mod_dnssd/files/patch-src_Makefile.in	2017-03-18 14:44:39 UTC (rev 22379)
@@ -1,13 +0,0 @@
---- 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 @@
- 
- APXS=@APXS@
- APACHECTL=@APACHECTL@
--LIBS=-Wl,"@LIBS@" @AVAHI_LIBS@
--CFLAGS=-Wc,"@CFLAGS@" @AVAHI_CFLAGS@
-+LIBS=-Wl,"@LIBS@ @AVAHI_LIBS@"
-+CFLAGS=-Wc,"@CFLAGS@ @AVAHI_CFLAGS@"
- 
- all: mod_dnssd.la
- 

Added: trunk/www/mod_dnssd/files/patch-src__Makefile.in
===================================================================
--- trunk/www/mod_dnssd/files/patch-src__Makefile.in	                        (rev 0)
+++ trunk/www/mod_dnssd/files/patch-src__Makefile.in	2017-03-18 14:44:39 UTC (rev 22379)
@@ -0,0 +1,24 @@
+--- src/Makefile.in.orig	2009-01-22 16:42:02 UTC
++++ src/Makefile.in
+@@ -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@
++LIBS=-Wl,"@LIBS@ @AVAHI_LIBS@"
++CFLAGS=-Wc,"@CFLAGS@ @AVAHI_CFLAGS@"
+ 
+ all: mod_dnssd.la
+ 
+@@ -25,7 +26,7 @@ mod_dnssd.la: @srcdir@/mod_dnssd.c
+ 	$(APXS) -c $(CFLAGS) $(LIBS) @srcdir@/mod_dnssd.c
+ 
+ install: all
+-	$(APXS) -i -a mod_dnssd.la 
++	$(APXS) $(APXS_STAGE) -i mod_dnssd.la
+ 
+ clean:
+ 	rm -rf *.o *.so *.loT .deps/ *.la *.lo *.slo .libs/


Property changes on: trunk/www/mod_dnssd/files/patch-src__Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/mod_dnssd/files/patch-src__mod_dnssd.c
===================================================================
--- trunk/www/mod_dnssd/files/patch-src__mod_dnssd.c	                        (rev 0)
+++ trunk/www/mod_dnssd/files/patch-src__mod_dnssd.c	2017-03-18 14:44:39 UTC (rev 22379)
@@ -0,0 +1,19 @@
+--- src/mod_dnssd.c.orig	2009-01-28 02:24:00 UTC
++++ src/mod_dnssd.c
+@@ -24,9 +24,16 @@
+ #include <ap_config.h>
+ #include <apr_strings.h>
+ #include <unixd.h>
++#if MODULE_MAGIC_COOKIE >= 0x41503234UL /* "AP24" */
++#include <mod_unixd.h>
++#endif
+ #include <apr_signal.h>
+ #include <mpm_common.h>
+ 
++#if MODULE_MAGIC_NUMBER_MAJOR >= 20090130
++#define unixd_setup_child ap_unixd_setup_child
++#endif
++
+ #include <unistd.h>
+ 
+ #include <avahi-common/simple-watch.h>


Property changes on: trunk/www/mod_dnssd/files/patch-src__mod_dnssd.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/www/mod_dnssd/pkg-plist
===================================================================
--- trunk/www/mod_dnssd/pkg-plist	2017-03-18 14:02:31 UTC (rev 22378)
+++ trunk/www/mod_dnssd/pkg-plist	2017-03-18 14:44:39 UTC (rev 22379)
@@ -2,4 +2,3 @@
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%f
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%f
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%