[Midnightbsd-cvs] mports [17378] trunk/dns/libidn: cleanup patches and modernize

[laffer1 at midnightbsd.org]

Revision: 17378
          http://svnweb.midnightbsd.org/mports/?rev=17378
Author:   laffer1
Date:     2014-09-19 19:10:08 -0400 (Fri, 19 Sep 2014)
Log Message:
-----------
cleanup patches and modernize

Modified Paths:
--------------
    trunk/dns/libidn/Makefile

Added Paths:
-----------
    trunk/dns/libidn/files/patch-doc__libidn.texi

Removed Paths:
-------------
    trunk/dns/libidn/files/patch-doc::libidn.texi

Modified: trunk/dns/libidn/Makefile
===================================================================
--- trunk/dns/libidn/Makefile	2014-09-19 23:07:33 UTC (rev 17377)
+++ trunk/dns/libidn/Makefile	2014-09-19 23:10:08 UTC (rev 17378)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libidn
 PORTVERSION=	1.28
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	GNU
 
@@ -8,16 +9,16 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Internationalized Domain Names command line tool
 
-LICENSE=	gpl3
+OPTIONS_DEFINE=	DOCS NLS
 
-USES=		iconv pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_PERL5_BUILD=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USE_PERL5=	build
+USES=		iconv makeinfo pathfix perl5 pkgconfig
 
-INFO=	libidn
+INFO=		libidn
 
 .include <bsd.mport.options.mk>
 
@@ -32,20 +33,20 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's|@image{components}||g' \
 		${WRKSRC}/doc/libidn.texi
-	@${REINPLACE_CMD} -e 's|$$(AUTOMAKE)|${TRUE}|' \
-			-e 's|imagesdir = $$(infodir)|imagesdir = $$(docdir)|' \
+	@${REINPLACE_CMD} -e 's|$$(AUTOMAKE)|${TRUE}|; /imagesdir = / s|infodir|docdir|' \
 		${WRKSRC}/doc/Makefile.in
 .if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e 's|install-data-am: install-imagesDATA install-info-am install-man|install-data-am: install-info-am install-man|' \
+	@${REINPLACE_CMD} -e '/^install-data-am: / s| install-imagesDATA||' \
 		${WRKSRC}/doc/Makefile.in
 .endif
+.if ${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e 's/-lidn/& -lintl/' ${WRKSRC}/libidn.pc.in
+.endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for i in FAQ NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>

Deleted: trunk/dns/libidn/files/patch-doc::libidn.texi
===================================================================
--- trunk/dns/libidn/files/patch-doc::libidn.texi	2014-09-19 23:07:33 UTC (rev 17377)
+++ trunk/dns/libidn/files/patch-doc::libidn.texi	2014-09-19 23:10:08 UTC (rev 17378)
@@ -1,12 +0,0 @@
---- doc/libidn.texi.orig	Thu Jan 22 20:48:25 2004
-+++ doc/libidn.texi	Thu Jan 22 20:48:45 2004
-@@ -1271,8 +1271,7 @@
- Accessing a specific StringPrep profile directly:
- 
- @example
--jas@@latte:~$ idn --quiet --profile=SASLprep --stringprep te at ss{}t at ordf{}
--te at ss{}ta
-+jas@@latte:~$ idn --quiet --profile=SASLprep --stringprep
- jas@@latte:~$
- @end example
- 

Added: trunk/dns/libidn/files/patch-doc__libidn.texi
===================================================================
--- trunk/dns/libidn/files/patch-doc__libidn.texi	                        (rev 0)
+++ trunk/dns/libidn/files/patch-doc__libidn.texi	2014-09-19 23:10:08 UTC (rev 17378)
@@ -0,0 +1,12 @@
+--- doc/libidn.texi.orig	Thu Jan 22 20:48:25 2004
++++ doc/libidn.texi	Thu Jan 22 20:48:45 2004
+@@ -1271,8 +1271,7 @@
+ Accessing a specific StringPrep profile directly:
+ 
+ @example
+-jas@@latte:~$ idn --quiet --profile=SASLprep --stringprep te at ss{}t at ordf{}
+-te at ss{}ta
++jas@@latte:~$ idn --quiet --profile=SASLprep --stringprep
+ jas@@latte:~$
+ @end example
+