3 files changed, 48 insertions, 24 deletions

diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index a21f7839c496..054e61dbb08a 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmlsec1
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.aleksey.com/xmlsec/download/ \
 		ftp://ftp.aleksey.com/pub/xmlsec/releases/ \
@@ -16,24 +17,41 @@ MASTER_SITES=	http://www.aleksey.com/xmlsec/download/ \
 MAINTAINER=	jim@corebsd.or.id
 COMMENT=	XML Security Library
 
-LIB_DEPENDS=	xslt:${PORTSDIR}/textproc/libxslt \
-		gnutls.8:${PORTSDIR}/security/gnutls
+RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
-USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
+USE_GNOME=	gnomehack libxslt
 USE_REINPLACE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
-
-CONFIGURE_TARGET=	-build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--with-gnutls="${LOCALBASE}"
 
 MAN1=	xmlsec1.1 xmlsec1-config.1
 
-post-configure:
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e "s:src apps man docs:src apps man:g" \
-		${WRKSRC}/Makefile
+.if defined(WITH_GNUTLS)
+CONFIGURE_ARGS+=	--with-gnutls="${LOCALBASE}"
+LIB_DEPENDS+=		gnutls.8:${PORTSDIR}/security/gnutls
+PLIST_SUB+=             GNUTLS=""
+.else
+CONFIGURE_ARGS+=	--without-gnutls
+PLIST_SUB+=             GNUTLS="@comment "
+.endif
+
+.if !defined(NOPORTDOCS)
+MAKE_ENV=	DOCS=docs
 .endif
 
+pre-everything::
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "      WITH_GNUTLS=yes   Enable GNUTLS support"
+	@${ECHO} ""
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|src apps man docs|src apps man \$${DOCS}|g ; \
+		 s|^confexecdir =.*$$|confexecdir = \$$(sysconfdir)|g' \
+			${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/security/xmlsec1/files/patch-configure b/security/xmlsec1/files/patch-configure
new file mode 100644
index 000000000000..948c41138b67
--- /dev/null
+++ b/security/xmlsec1/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Tue Apr 29 13:32:15 2003
++++ configure	Tue May 13 05:20:21 2003
+@@ -7873,6 +7873,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/security/xmlsec1/pkg-plist b/security/xmlsec1/pkg-plist
index 72be0bb33677..0f8d5c813396 100644
--- a/security/xmlsec1/pkg-plist
+++ b/security/xmlsec1/pkg-plist
@@ -1,13 +1,14 @@
 bin/xmlsec1
 bin/xmlsec1-config
+etc/xmlsec1Conf.sh
 include/xmlsec1/xmlsec/base64.h
 include/xmlsec1/xmlsec/buffer.h
 include/xmlsec1/xmlsec/crypto.h
 include/xmlsec1/xmlsec/errors.h
 include/xmlsec1/xmlsec/exports.h
-include/xmlsec1/xmlsec/gnutls/app.h
-include/xmlsec1/xmlsec/gnutls/crypto.h
-include/xmlsec1/xmlsec/gnutls/symbols.h
+%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/app.h
+%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/crypto.h
+%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/symbols.h
 include/xmlsec1/xmlsec/io.h
 include/xmlsec1/xmlsec/keyinfo.h
 include/xmlsec1/xmlsec/keys.h
@@ -31,20 +32,16 @@ include/xmlsec1/xmlsec/xmldsig.h
 include/xmlsec1/xmlsec/xmlenc.h
 include/xmlsec1/xmlsec/xmlsec.h
 include/xmlsec1/xmlsec/xmltree.h
-lib/libxmlsec1-gnutls.a
-lib/libxmlsec1-gnutls.la
-lib/libxmlsec1-gnutls.so
-lib/libxmlsec1-gnutls.so.1
+%%GNUTLS%%lib/libxmlsec1-gnutls.a
+%%GNUTLS%%lib/libxmlsec1-gnutls.so
+%%GNUTLS%%lib/libxmlsec1-gnutls.so.1
 lib/libxmlsec1-openssl.a
-lib/libxmlsec1-openssl.la
 lib/libxmlsec1-openssl.so
 lib/libxmlsec1-openssl.so.1
 lib/libxmlsec1.a
-lib/libxmlsec1.la
 lib/libxmlsec1.so
 lib/libxmlsec1.so.1
-lib/pkgconfig/xmlsec1.pc
-lib/xmlsec1Conf.sh
+libdata/pkgconfig/xmlsec1.pc
 %%PORTDOCS%%share/doc/xmlsec1/api/chapters/compiling-and-linking.sgml
 %%PORTDOCS%%share/doc/xmlsec1/api/chapters/creating-templates.sgml
 %%PORTDOCS%%share/doc/xmlsec1/api/chapters/examples.sgml
@@ -184,7 +181,6 @@ lib/xmlsec1Conf.sh
 %%PORTDOCS%%@dirrm share/doc/xmlsec1/api
 %%PORTDOCS%%@dirrm share/doc/xmlsec1
 @dirrm include/xmlsec1/xmlsec/openssl
-@dirrm include/xmlsec1/xmlsec/gnutls
+%%GNUTLS%%@dirrm include/xmlsec1/xmlsec/gnutls
 @dirrm include/xmlsec1/xmlsec
 @dirrm include/xmlsec1
-@unexec rmdir $D/lib/pkgconfig 2>/dev/null || true