[Midnightbsd-cvs] mports [21155] trunk/security/xmlsec1: fix build of xmlsec1

[laffer1 at midnightbsd.org]

Revision: 21155
          http://svnweb.midnightbsd.org/mports/?rev=21155
Author:   laffer1
Date:     2016-03-14 09:47:01 -0400 (Mon, 14 Mar 2016)
Log Message:
-----------
fix build of xmlsec1

Modified Paths:
--------------
    trunk/security/xmlsec1/Makefile
    trunk/security/xmlsec1/pkg-plist

Modified: trunk/security/xmlsec1/Makefile
===================================================================
--- trunk/security/xmlsec1/Makefile	2016-03-14 13:44:44 UTC (rev 21154)
+++ trunk/security/xmlsec1/Makefile	2016-03-14 13:47:01 UTC (rev 21155)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xmlsec1
 PORTVERSION=	1.2.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.aleksey.com/xmlsec/download/ \
 		ftp://ftp.aleksey.com/pub/xmlsec/releases/ \
@@ -27,7 +27,7 @@
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		libtool:oldver pathfix pkgconfig
+USES=		libtool pathfix pkgconfig
 USE_OPENSSL=	yes
 USE_GNOME=	libxml2 libxslt
 USE_LDCONFIG=	yes
@@ -55,12 +55,11 @@
 	    -e '/^XMLSEC_SHLIBSFX="/s|"[^"]*"|".so"|' \
 	    -e 's|openssl_exlibs=-ldl|openssl_exlibs=|' \
 	    -e 's|-ldl"|"|' \
-	    -e 's,with_nspr/include,with_nspr/include/nspr ${PTHREAD_CFLAGS},' \
 	    -e 's,with_nss/include,with_nss/include/nss/nss,' \
 	    -e 's,with_nss/lib,with_nss/lib/nss,g' \
 	    -e 's,\(CPPFLAGS="\$$NSS_CFLAGS\),\1 $$NSPR_CFLAGS,' \
 	    -e '/XMLSEC_CRYPTO_LIST=.*openssl/s,$$,\; CPPFLAGS="$$CPPFLAGS $$OPENSSL_CFLAGS",' \
-	    -e 's,\(-lplc4\)",\1 ${PTHREAD_LIBS}",' \
+	    -e 's,\(-lplc4\)",\1 -lpthread",' \
 	    -e '/ test /s, == , = ,' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} \
@@ -76,7 +75,7 @@
 .if ${PORT_OPTIONS:MNSS}
 # Makeing the xmlsec1 executable multi-threaded to let load -lnss,
 # when needed.
-	@${REINPLACE_CMD} -e 's,^\(xmlsec1_LDADD = \)\\$$,\1 -L${LOCALBASE}/lib ${PTHREAD_LIBS}\\,' \
+	@${REINPLACE_CMD} -e 's,^\(xmlsec1_LDADD = \)\\$$,\1 -L${LOCALBASE}/lib -lpthread\\,' \
 		${WRKSRC}/apps/Makefile.in
 .endif
 

Modified: trunk/security/xmlsec1/pkg-plist
===================================================================
--- trunk/security/xmlsec1/pkg-plist	2016-03-14 13:44:44 UTC (rev 21154)
+++ trunk/security/xmlsec1/pkg-plist	2016-03-14 13:47:01 UTC (rev 21155)
@@ -53,25 +53,25 @@
 include/xmlsec1/xmlsec/xmlsec.h
 include/xmlsec1/xmlsec/xmltree.h
 lib/libxmlsec1-gcrypt.a
-lib/libxmlsec1-gcrypt.la
 lib/libxmlsec1-gcrypt.so
-lib/libxmlsec1-gcrypt.so.3
+lib/libxmlsec1-gcrypt.so.1
+lib/libxmlsec1-gcrypt.so.1.2.20
 %%GNUTLS%%lib/libxmlsec1-gnutls.a
-%%GNUTLS%%lib/libxmlsec1-gnutls.la
 %%GNUTLS%%lib/libxmlsec1-gnutls.so
-%%GNUTLS%%lib/libxmlsec1-gnutls.so.3
+%%GNUTLS%%lib/libxmlsec1-gnutls.so.1
+%%GNUTLS%%lib/libxmlsec1-gnutls.so.1.2.20
 %%NSS%%lib/libxmlsec1-nss.a
-%%NSS%%lib/libxmlsec1-nss.la
 %%NSS%%lib/libxmlsec1-nss.so
-%%NSS%%lib/libxmlsec1-nss.so.3
+%%NSS%%lib/libxmlsec1-nss.so.1
+%%NSS%%lib/libxmlsec1-nss.so.1.2.20
 lib/libxmlsec1-openssl.a
-lib/libxmlsec1-openssl.la
 lib/libxmlsec1-openssl.so
-lib/libxmlsec1-openssl.so.3
+lib/libxmlsec1-openssl.so.1
+lib/libxmlsec1-openssl.so.1.2.20
 lib/libxmlsec1.a
-lib/libxmlsec1.la
 lib/libxmlsec1.so
-lib/libxmlsec1.so.3
+lib/libxmlsec1.so.1
+lib/libxmlsec1.so.1.2.20
 libdata/pkgconfig/xmlsec1-gcrypt.pc
 %%GNUTLS%%libdata/pkgconfig/xmlsec1-gnutls.pc
 %%NSS%%libdata/pkgconfig/xmlsec1-nss.pc
@@ -226,14 +226,3 @@
 %%PORTDOCS%%%%DOCSDIR%%/xmldsig.html
 %%PORTDOCS%%%%DOCSDIR%%/xmlenc.html
 %%PORTDOCS%%%%DOCSDIR%%/xmlsec-man.html
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/api/images
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/api
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
- at dirrmtry include/xmlsec1/xmlsec/private
- at dirrmtry include/xmlsec1/xmlsec/openssl
-%%NSS%%@dirrmtry include/xmlsec1/xmlsec/nss
-%%GNUTLS%%@dirrmtry include/xmlsec1/xmlsec/gnutls
- at dirrmtry include/xmlsec1/xmlsec/gcrypt
- at dirrmtry include/xmlsec1/xmlsec
- at dirrmtry include/xmlsec1