From owner-svn-ports-head@FreeBSD.ORG Tue Jan 14 09:22:28 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DE65AF32; Tue, 14 Jan 2014 09:22:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CA2A910B0; Tue, 14 Jan 2014 09:22:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0E9MRgt078480; Tue, 14 Jan 2014 09:22:27 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0E9MRsf078474; Tue, 14 Jan 2014 09:22:27 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201401140922.s0E9MRsf078474@svn.freebsd.org> From: Pietro Cerutti Date: Tue, 14 Jan 2014 09:22:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339668 - in head/security/tclsasl: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 09:22:28 -0000 Author: gahr Date: Tue Jan 14 09:22:26 2014 New Revision: 339668 URL: http://svnweb.freebsd.org/changeset/ports/339668 Log: - Convert to USES=tcl - Convert to new LIB_DEPENDS format - Remove article from COMMENT - STAGE-clean Modified: head/security/tclsasl/Makefile (contents, props changed) head/security/tclsasl/files/patch-Makefile.in (contents, props changed) head/security/tclsasl/files/patch-configure (contents, props changed) Modified: head/security/tclsasl/Makefile ============================================================================== --- head/security/tclsasl/Makefile Tue Jan 14 09:12:21 2014 (r339667) +++ head/security/tclsasl/Makefile Tue Jan 14 09:22:26 2014 (r339668) @@ -9,27 +9,24 @@ MASTER_SITES= http://beepcore-tcl.source EXTRACT_SUFX= .tgz MAINTAINER= dsh@vlink.ru -COMMENT= A Tcl interface to the Cyrus SASLv2 library +COMMENT= Tcl interface to the Cyrus SASLv2 library -LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 +LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 +USES= tcl GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_TCL= yes -USE_TCL_BUILD= yes CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ --with-tclinclude=${TCL_INCLUDEDIR} \ - --with-cyrus-sasl=${LOCALBASE} -CONFIGURE_ENV= INSTALL="${INSTALL_DATA}" + --with-cyrus-sasl=${LOCALBASE} \ + --prefix=${PREFIX} +CONFIGURE_ENV= INSTALL="${INSTALL_DATA}" STAGEDIR="${STAGEDIR}" PORTDOCS= tclsasl.html -NO_STAGE= yes post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/tclsasl.html ${DOCSDIR} -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/tclsasl.html ${STAGEDIR}${DOCSDIR} .include Modified: head/security/tclsasl/files/patch-Makefile.in ============================================================================== --- head/security/tclsasl/files/patch-Makefile.in Tue Jan 14 09:12:21 2014 (r339667) +++ head/security/tclsasl/files/patch-Makefile.in Tue Jan 14 09:22:26 2014 (r339668) @@ -1,5 +1,5 @@ ---- Makefile.in.orig Sat Jun 8 11:10:07 2002 -+++ Makefile.in Wed Apr 26 13:14:22 2006 +--- Makefile.in.orig 2002-06-08 09:10:07.000000000 +0200 ++++ Makefile.in 2014-01-14 10:23:11.000000000 +0100 @@ -137,7 +137,7 @@ WISH_PROG = @WISH_PROG@ tclsasl_LIB_FILE = @tclsasl_LIB_FILE@ @@ -18,7 +18,13 @@ all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -@@ -437,7 +437,6 @@ +@@ -432,12 +432,11 @@ + $(mkinstalldirs) @PKG_TCL@ + echo "package ifneeded sasl" \ + `echo $(VERSION) | awk -F. '{ printf "%s.%s", $$1, $$2 }'` \ +- "[list load $(DESTDIR)$(libdir)/libtclsasl.so]" \ ++ "[list load $(libdir)/libtclsasl.so]" \ + > @PKG_TCL@/pkgIndex.tcl sed -e 's%load .libs/libtclsasl.so%package require sasl%' \ < test.tcl \ > @PKG_TCL@/test.tcl Modified: head/security/tclsasl/files/patch-configure ============================================================================== --- head/security/tclsasl/files/patch-configure Tue Jan 14 09:12:21 2014 (r339667) +++ head/security/tclsasl/files/patch-configure Tue Jan 14 09:22:26 2014 (r339668) @@ -5,7 +5,7 @@ -PKG_TCL=${TCL_PACKAGE_PATH}/sasl-${VERSION} -+PKG_TCL=${TCL_PREFIX}/lib/tclsasl ++PKG_TCL=${STAGEDIR}${prefix}/lib/tclsasl # Check whether --with-cyrus-sasl or --without-cyrus-sasl was given.