- Re-sort MASTER_SITES (primary site is temporarily unavailable)

- Use REINPLACE instead of 3 individual patches
- Allow user to specify their own CPPFLAGS and LDFLAGS
- Remove useless .la files

PR:		ports/47522
Submitted by:	Sergei Kolobov <sergei@kolobov.com> (maintainer)

5 files changed, 14 insertions, 40 deletions

diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index 0c8f9e80aab2..207b213b5186 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -9,24 +9,32 @@ PORTNAME=	libtasn1
 PORTVERSION=	0.1.2
 CATEGORIES=	security
 MASTER_SITES=	http://gd.tuwien.ac.at/privacy/gnupg/alpha/gnutls/libtasn1/ \
-	ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \
-	ftp://ftp.gnupg.org/pub/gcrypt/alpha/gnutls/libtasn1/ \
 	http://www.mirrors.wiretapped.net/security/network-security/gnutls/libtasn1/ \
-	ftp://ftp.mirrors.wiretapped.net/security/network-security/gnutls/libtasn1/
+	ftp://ftp.gnupg.org/pub/gcrypt/alpha/gnutls/libtasn1/ \
+	ftp://ftp.mirrors.wiretapped.net/security/network-security/gnutls/libtasn1/ \
+	ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
 
 MAINTAINER=	sergei@kolobov.com
 
-LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
+USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lgnugetopt
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 DOCS=		AUTHORS NEWS README THANKS
 DOCS2=		asn1.ps asn1.tex fdl.tex
 
+post-patch:
+.for file in asn1Coding.c asn1Decoding.c asn1Parser.c
+	${REINPLACE_CMD} -e 's/<malloc.h>/<stdlib.h>/' ${WRKSRC}/src/${file}
+.endfor
+
 post-install:
+	${RM} -f ${PREFIX}/lib/libtasn1.la
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in ${DOCS}
diff --git a/security/libtasn1/files/patch-src::asn1Coding.c b/security/libtasn1/files/patch-src::asn1Coding.c
deleted file mode 100644
index 9bed2ff1a2d4..000000000000
--- a/security/libtasn1/files/patch-src::asn1Coding.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/asn1Coding.c.orig	Tue Jan  7 05:39:32 2003
-+++ src/asn1Coding.c	Tue Jan  7 05:39:36 2003
-@@ -28,7 +28,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <libtasn1.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <config.h>
- 
- #ifdef HAVE_GETOPT_H
diff --git a/security/libtasn1/files/patch-src::asn1Decoding.c b/security/libtasn1/files/patch-src::asn1Decoding.c
deleted file mode 100644
index 4c7fca6ba7b9..000000000000
--- a/security/libtasn1/files/patch-src::asn1Decoding.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/asn1Decoding.c.orig	Tue Jan  7 05:40:14 2003
-+++ src/asn1Decoding.c	Tue Jan  7 05:40:20 2003
-@@ -28,7 +28,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <libtasn1.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <config.h>
- 
- #ifdef HAVE_GETOPT_H
diff --git a/security/libtasn1/files/patch-src::asn1Parser.c b/security/libtasn1/files/patch-src::asn1Parser.c
deleted file mode 100644
index 85072d72cf4c..000000000000
--- a/security/libtasn1/files/patch-src::asn1Parser.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/asn1Parser.c.orig	Tue Jan  7 05:38:03 2003
-+++ src/asn1Parser.c	Tue Jan  7 05:38:09 2003
-@@ -28,7 +28,7 @@
- #include <stdio.h>

- #include <string.h>

- #include <libtasn1.h>

--#include <malloc.h>

-+#include <stdlib.h>

- #include <config.h>

- 

- #ifdef HAVE_GETOPT_H

diff --git a/security/libtasn1/pkg-plist b/security/libtasn1/pkg-plist
index 3591d8045175..1a3bc94b231f 100644
--- a/security/libtasn1/pkg-plist
+++ b/security/libtasn1/pkg-plist
@@ -1,7 +1,6 @@
 include/libtasn1.h
 lib/libtasn1.so.0
 lib/libtasn1.so
-lib/libtasn1.la
 lib/libtasn1.a
 %%PORTDOCS%%share/doc/libtasn1/AUTHORS
 %%PORTDOCS%%share/doc/libtasn1/NEWS