From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jun 23 16:50:15 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 7D36416A41C for ; Thu, 23 Jun 2005 16:50:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CCF843D1F for ; Thu, 23 Jun 2005 16:50:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j5NGoFQL007493 for ; Thu, 23 Jun 2005 16:50:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j5NGoF7o007492; Thu, 23 Jun 2005 16:50:15 GMT (envelope-from gnats) Resent-Date: Thu, 23 Jun 2005 16:50:15 GMT Resent-Message-Id: <200506231650.j5NGoF7o007492@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, Radim Kolar Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77F8516A41C; Thu, 23 Jun 2005 16:45:45 +0000 (GMT) (envelope-from hsn@netmag.cz) Received: from smtp1.vol.cz (smtp1.vol.cz [195.250.128.73]) by mx1.FreeBSD.org (Postfix) with ESMTP id A58EE43D49; Thu, 23 Jun 2005 16:45:42 +0000 (GMT) (envelope-from hsn@netmag.cz) Received: from sanatana.dharma (volny-ipt-4-225.dialup.vol.cz [62.177.67.225]) by smtp1.vol.cz (8.12.9p2/8.12.9) with ESMTP id j5NGjZ3C074842; Thu, 23 Jun 2005 18:45:37 +0200 (CEST) (envelope-from hsn@netmag.cz) Received: from hsn@localhost by sanatana.dharma (Exim 4.51_0 FreeBSD) id 1DlUNy-000Dhx-0b ; Thu, 23 Jun 2005 18:17:02 +0200 Message-Id: Date: Thu, 23 Jun 2005 18:17:02 +0200 From: Radim Kolar To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: seanc@FreeBSD.org, hsn@netmag.cz Subject: ports/82579: [PATCH] devel/tla: update to 1.3.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2005 16:50:15 -0000 >Number: 82579 >Category: ports >Synopsis: [PATCH] devel/tla: update to 1.3.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jun 23 16:50:14 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Radim Kolar >Release: FreeBSD 5.4-STABLE i386 >Organization: Sanatana Dharma >Environment: System: FreeBSD sanatana.dharma 5.4-STABLE FreeBSD 5.4-STABLE #10: Wed Jun 15 11:34:46 CEST 2005 >Description: This PR replaces ports/75859 We should be little more active in process of replacing broken versions of revision control system. - Update to 1.3.3 Added file(s): - files/patch-linkopenssl - files/patch-neonssl Removed file(s): - files/patch-tla::libneon::PLUGIN::AUTOCONF - files/patch-tla::tla::Makefile.in - pkg-plist Port maintainer (seanc@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- tla-1.3.3.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/tla/Makefile /home/hsn/hacked/tla/Makefile --- /usr/ports/devel/tla/Makefile Thu Sep 2 20:18:41 2004 +++ /home/hsn/hacked/tla/Makefile Thu Jun 23 18:02:27 2005 @@ -6,7 +6,7 @@ # PORTNAME= tla -PORTVERSION= 1.2.1 +PORTVERSION= 1.3.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} \ http://regexps.srparish.net/src/${PORTNAME}/ \ @@ -17,15 +17,18 @@ COMMENT= The original arch source control management CLI written in C BUILD_DEPENDS= gpatch:${PORTSDIR}/devel/patch \ - gdiff:${PORTSDIR}/textproc/diffutils + gdiff:${PORTSDIR}/textproc/diffutils \ + gtar:${PORTSDIR}/archivers/gtar RUN_DEPENDS= ${BUILD_DEPENDS} GNU_CONFIGURE= yes USE_GMAKE= yes ORIGWRKSRC= ${WRKDIR}/${DISTNAME}/src -PATCH_WRKSRC= ${ORIGWRKSRC} +PATCH_WRKSRC= ${ORIGWRKSRC}/.. WRKSRC= ${ORIGWRKSRC}/=build +PLIST= ${WRKDIR}/plist +PLIST_FILES= bin/tla bin/tla-gpg-check bin/awiki pre-patch: ${MKDIR} ${WRKSRC} @@ -34,23 +37,31 @@ cd ${WRKSRC} ; ../configure --prefix ${LOCALBASE} \ --with-gnu-patch gpatch \ --with-gnu-diff gdiff \ - --with-gnu-diff3 gdiff3 + --with-gnu-diff3 gdiff3 \ + --with-gnu-tar gtar test: cd ${WRKSRC} ; ${GMAKE} test -post-install: +pre-install: +.if !defined(NOPORTDOCS) + ${RM} -rf ${ORIGWRKSRC}/docs-tla/PLUGIN ${ORIGWRKSRC}/docs-tla/{arch} \ + ${ORIGWRKSRC}/docs-tla/.arch-ids + cd ${ORIGWRKSRC}/docs-tla && ${FIND} . -type f -name '*.html' -exec ${ECHO_CMD} "%%DOCSDIR%%/{}" \; > ${PLIST} + cd ${ORIGWRKSRC}/docs-tla && ${FIND} -d . -mindepth 1 -maxdepth 1 -type d -exec ${ECHO_CMD} "@dirrm %%DOCSDIR%%/{}" \; >> ${PLIST} + ${ECHO} @dirrm %%DOCSDIR%% >> ${PLIST} +.endif + +do-install: + ${INSTALL_PROGRAM} ${ORIGWRKSRC}/=build/tla/tla/tla ${PREFIX}/bin + ${INSTALL_PROGRAM} ${ORIGWRKSRC}/=build/awiki/awiki/awiki ${PREFIX}/bin ${SED} 's,^#!.*$$,#!${AWK} -f,' ${ORIGWRKSRC}/tla/=gpg-check.awk \ > ${WRKDIR}/tla-gpg-check ${INSTALL_SCRIPT} ${WRKDIR}/tla-gpg-check ${PREFIX}/bin .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR}; \ - for f in `${FIND} ${ORIGWRKSRC}/docs-tla/html -type f -name '*.html' \ - -exec ${BASENAME} {} \;`; do \ - ${INSTALL_DATA} ${ORIGWRKSRC}/docs-tla/html/$$f ${DOCSDIR}/; \ - ${PRINTF} "share/doc/${PORTNAME}/%s\n" $$f >> ${TMPPLIST}; \ - done; \ - ${ECHO} @dirrm share/doc/${PORTNAME} >> ${TMPPLIST} + ${MKDIR} ${DOCSDIR} + cd ${ORIGWRKSRC}/docs-tla && ${FIND} . -name '*.html' | ${CPIO} -pdm -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} + ${CHMOD} -R a=rX ${DOCSDIR} .endif .include diff -ruN --exclude=CVS /usr/ports/devel/tla/distinfo /home/hsn/hacked/tla/distinfo --- /usr/ports/devel/tla/distinfo Thu Sep 2 20:18:41 2004 +++ /home/hsn/hacked/tla/distinfo Sun Jun 19 19:05:40 2005 @@ -1,2 +1,2 @@ -MD5 (tla-1.2.1.tar.gz) = 40c70c9f881a2b0258441a447e1bd53d -SIZE (tla-1.2.1.tar.gz) = 4539239 +MD5 (tla-1.3.3.tar.gz) = 61d5dea41e071f78a8319401ee07ab0b +SIZE (tla-1.3.3.tar.gz) = 4202834 diff -ruN --exclude=CVS /usr/ports/devel/tla/files/patch-linkopenssl /home/hsn/hacked/tla/files/patch-linkopenssl --- /usr/ports/devel/tla/files/patch-linkopenssl Thu Jan 1 01:00:00 1970 +++ /home/hsn/hacked/tla/files/patch-linkopenssl Sun Jun 19 19:20:22 2005 @@ -0,0 +1,10 @@ +--- src/tla/tla/Makefile.in.orig Wed Jun 1 21:08:31 2005 ++++ src/tla/tla/Makefile.in Sun Jun 19 19:19:29 2005 +@@ -4,6 +4,7 @@ + ../libdate/libdate.a \ + $(objroot)/hackerlab/libhackerlab/libhackerlab.a \ + ../../libneon/src/libneon.la \ ++ -lssl -lcrypto \ + -lm + + mains := tla.c diff -ruN --exclude=CVS /usr/ports/devel/tla/files/patch-neonssl /home/hsn/hacked/tla/files/patch-neonssl --- /usr/ports/devel/tla/files/patch-neonssl Thu Jan 1 01:00:00 1970 +++ /home/hsn/hacked/tla/files/patch-neonssl Sun Jun 19 19:24:41 2005 @@ -0,0 +1,8 @@ +--- src/libneon/PLUGIN/AUTOCONF.orig Wed Jun 1 21:08:13 2005 ++++ src/libneon/PLUGIN/AUTOCONF Sun Jun 19 19:23:56 2005 +@@ -16,4 +16,4 @@ + fi + + +-"$1" --with-ssl=no --with-included-expat --with-expat --disable-shared --enable-static ++"$1" --with-ssl --with-included-expat --with-expat --disable-shared --enable-static diff -ruN --exclude=CVS /usr/ports/devel/tla/files/patch-tla::libneon::PLUGIN::AUTOCONF /home/hsn/hacked/tla/files/patch-tla::libneon::PLUGIN::AUTOCONF --- /usr/ports/devel/tla/files/patch-tla::libneon::PLUGIN::AUTOCONF Tue Aug 31 22:57:13 2004 +++ /home/hsn/hacked/tla/files/patch-tla::libneon::PLUGIN::AUTOCONF Thu Jan 1 01:00:00 1970 @@ -1,8 +0,0 @@ ---- tla/libneon/PLUGIN/AUTOCONF.orig Sat Dec 6 11:35:27 2003 -+++ tla/libneon/PLUGIN/AUTOCONF Tue Aug 31 13:22:59 2004 -@@ -1,4 +1,4 @@ - #!/bin/sh - --"$1" --with-expat --with-included-expat --with-included-neon -+"$1" --with-expat --with-included-expat --with-included-neon --with-ssl - diff -ruN --exclude=CVS /usr/ports/devel/tla/files/patch-tla::tla::Makefile.in /home/hsn/hacked/tla/files/patch-tla::tla::Makefile.in --- /usr/ports/devel/tla/files/patch-tla::tla::Makefile.in Tue Aug 31 22:57:13 2004 +++ /home/hsn/hacked/tla/files/patch-tla::tla::Makefile.in Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ ---- tla/tla/Makefile.in.orig Tue Aug 31 13:35:23 2004 -+++ tla/tla/Makefile.in Tue Aug 31 13:35:45 2004 -@@ -4,6 +4,7 @@ - ../libdate/libdate.a \ - $(objroot)/hackerlab/libhackerlab/libhackerlab.a \ - ../libneon/libneon.a \ -+ -lssl -lcrypto \ - -lm - - mains := tla.c diff -ruN --exclude=CVS /usr/ports/devel/tla/pkg-plist /home/hsn/hacked/tla/pkg-plist --- /usr/ports/devel/tla/pkg-plist Sun Jun 27 17:42:20 2004 +++ /home/hsn/hacked/tla/pkg-plist Thu Jan 1 01:00:00 1970 @@ -1,3 +0,0 @@ -bin/tla -bin/tla-gpg-check -@comment automatically generated plist for docs --- tla-1.3.3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: