From d94872cad9b660dec7d983080cb8f559cd573a38 Mon Sep 17 00:00:00 2001
From: sunpoet <sunpoet@FreeBSD.org>
Date: Tue, 1 Nov 2016 17:52:14 +0000
Subject: - Remove unnecessary CHMOD - Strip shared library and binary
 executable using existing STRIP in source - Cosmetic change - Remove
 superfluous blank lines in patch files

---
 net/mDNSResponder/Makefile                               |  6 ++----
 net/mDNSResponder/files/patch-dnsextd__lexer.l           | 16 ----------------
 net/mDNSResponder/files/patch-mDNSShared-dnsextd_lexer.l | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100644 net/mDNSResponder/files/patch-dnsextd__lexer.l
 create mode 100644 net/mDNSResponder/files/patch-mDNSShared-dnsextd_lexer.l

diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index 0eea43c7d333..2c743ce9deea 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -18,7 +18,7 @@ CONFLICTS_INSTALL=	avahi-libdns openmdns
 ALL_TARGET=	all dnsextd
 BUILD_WRKSRC=	${WRKSRC}/mDNSPosix
 INSTALL_WRKSRC=	${WRKSRC}/mDNSPosix
-MAKE_ARGS=	LDCONFIG=${TRUE} LOCALBASE=${PREFIX} MANPATH=${MANPREFIX}/man os=freebsd
+MAKE_ARGS=	LDCONFIG=${TRUE} LOCALBASE=${PREFIX} MANPATH=${MANPREFIX}/man STRIP=${STRIP_CMD} os=freebsd
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	mdnsd mdnsresponderposix
@@ -41,8 +41,6 @@ post-install:
 	cd ${WRKSRC}/mDNSShared/ && ${INSTALL_MAN} ${EXTRA_MAN1} ${STAGEDIR}${PREFIX}/man/man1/
 	cd ${WRKSRC}/mDNSShared/ && ${INSTALL_MAN} ${EXTRA_MAN8} ${STAGEDIR}${PREFIX}/man/man8/
 	cd ${WRKSRC}/mDNSPosix/build/prod/ && ${INSTALL_PROGRAM} ${EXTRA_SBIN} ${STAGEDIR}${PREFIX}/sbin/
-	${CHMOD} u+w ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libdns_sd.so.1 ${STAGEDIR}${PREFIX}/sbin/*
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libdns_sd.so.1 ${STAGEDIR}${PREFIX}/sbin/*
-	${CHMOD} u-w ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libdns_sd.so.1 ${STAGEDIR}${PREFIX}/sbin/*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dns-sd
 
 .include <bsd.port.mk>
diff --git a/net/mDNSResponder/files/patch-dnsextd__lexer.l b/net/mDNSResponder/files/patch-dnsextd__lexer.l
deleted file mode 100644
index 69ac4be20522..000000000000
--- a/net/mDNSResponder/files/patch-dnsextd__lexer.l
+++ /dev/null
@@ -1,16 +0,0 @@
---- mDNSShared/dnsextd_lexer.l.orig	2016-07-01 01:07:18 UTC
-+++ mDNSShared/dnsextd_lexer.l
-@@ -23,6 +23,13 @@
- 
- extern YYSTYPE yylval;
- 
-+#if !defined YYSTYPE_yylineno
-+#if YY_FLEX_MAJOR_VERSION <= 2 && YY_FLEX_MINOR_VERSION <= 5 && YY_FLEX_SUBMINOR_VERSION <= 4
-+int yylineno = 1;
-+#endif
-+#endif
-+
-+
- #define YY_NO_INPUT 1
- int  yylex(void);
- 
diff --git a/net/mDNSResponder/files/patch-mDNSShared-dnsextd_lexer.l b/net/mDNSResponder/files/patch-mDNSShared-dnsextd_lexer.l
new file mode 100644
index 000000000000..fe64231f18c4
--- /dev/null
+++ b/net/mDNSResponder/files/patch-mDNSShared-dnsextd_lexer.l
@@ -0,0 +1,15 @@
+--- mDNSShared/dnsextd_lexer.l.orig	2016-03-11 09:47:07 UTC
++++ mDNSShared/dnsextd_lexer.l
+@@ -23,6 +23,12 @@
+ 
+ extern YYSTYPE yylval;
+ 
++#if !defined YYSTYPE_yylineno
++#if YY_FLEX_MAJOR_VERSION <= 2 && YY_FLEX_MINOR_VERSION <= 5 && YY_FLEX_SUBMINOR_VERSION <= 4
++int yylineno = 1;
++#endif
++#endif
++
+ #define YY_NO_INPUT 1
+ int  yylex(void);
+ 
-- 
cgit