From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 28 12:40:08 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D1C1737B401 for ; Wed, 28 May 2003 12:40:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5EB343F93 for ; Wed, 28 May 2003 12:40:07 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h4SJe7Up016808 for ; Wed, 28 May 2003 12:40:07 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h4SJe7Rl016807; Wed, 28 May 2003 12:40:07 -0700 (PDT) Resent-Date: Wed, 28 May 2003 12:40:07 -0700 (PDT) Resent-Message-Id: <200305281940.h4SJe7Rl016807@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jim Geovedi Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BAAF537B401 for ; Wed, 28 May 2003 12:32:54 -0700 (PDT) Received: from develbox.bhc.or.id (develbox.bhc.or.id [202.77.97.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1364943F75 for ; Wed, 28 May 2003 12:32:52 -0700 (PDT) (envelope-from negative@develbox.bhc.or.id) Received: by develbox.bhc.or.id (Postfix, from userid 1027) id 021836DA; Thu, 29 May 2003 02:27:13 +0700 (WIT) Message-Id: <20030528192713.021836DA@develbox.bhc.or.id> Date: Thu, 29 May 2003 02:27:13 +0700 (WIT) From: Jim Geovedi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/52769: Update: security/xmlsec1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jim Geovedi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 May 2003 19:40:09 -0000 >Number: 52769 >Category: ports >Synopsis: Update: security/xmlsec1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed May 28 12:40:07 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Jim Geovedi >Release: FreeBSD 4.8-STABLE i386 >Organization: >Environment: System: FreeBSD develbox.bhc.or.id 4.8-STABLE FreeBSD 4.8-STABLE #1: Thu May 1 09:18:05 WIT 2003 root@develbox.bhc.or.id:/usr/obj/usr/src/sys/BHC i386 >Description: Changes/update for myself - Bring GNUTLS as optional flavor Changes/update from KATO Tsuguru (thanks!) - Do not install useless .la file - Install .pc file to correct place >How-To-Repeat: >Fix: --- xmlsec1.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/security/xmlsec1/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- Makefile 6 May 2003 03:10:46 -0000 1.1 +++ Makefile 28 May 2003 19:03:09 -0000 @@ -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 @@ 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 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/security/xmlsec1/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 6 May 2003 03:10:46 -0000 1.1 +++ pkg-plist 28 May 2003 19:00:10 -0000 @@ -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/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 @@ %%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 Index: files/patch-configure =================================================================== RCS file: files/patch-configure diff -N files/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-configure 28 May 2003 18:37:44 -0000 @@ -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' --- xmlsec1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: