From 13defa1742c35d3d2b09ea8cd84ce5ec5b4d075e Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Sat, 16 Jul 2005 12:48:46 +0000 Subject: [PATCH] - Update to 1.3.3 PR: ports/82579 Submitted by: Radim Kolar Approved by: maintainer timeout (3 weeks) --- devel/tla/Makefile | 35 ++++++++++++------- devel/tla/distinfo | 4 +-- devel/tla/files/patch-linkopenssl | 10 ++++++ devel/tla/files/patch-neonssl | 8 +++++ .../patch-tla::libneon::PLUGIN::AUTOCONF | 8 ----- devel/tla/files/patch-tla::tla::Makefile.in | 10 ------ devel/tla/pkg-plist | 3 -- 7 files changed, 43 insertions(+), 35 deletions(-) create mode 100644 devel/tla/files/patch-linkopenssl create mode 100644 devel/tla/files/patch-neonssl delete mode 100644 devel/tla/files/patch-tla::libneon::PLUGIN::AUTOCONF delete mode 100644 devel/tla/files/patch-tla::tla::Makefile.in delete mode 100644 devel/tla/pkg-plist diff --git a/devel/tla/Makefile b/devel/tla/Makefile index b6d10a8f3432..d8fc5e5c8565 100644 --- a/devel/tla/Makefile +++ b/devel/tla/Makefile @@ -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 @@ MAINTAINER= seanc@FreeBSD.org 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 @@ do-configure: 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 --git a/devel/tla/distinfo b/devel/tla/distinfo index ab5bddffb8c2..03f37fd0b430 100644 --- a/devel/tla/distinfo +++ b/devel/tla/distinfo @@ -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 --git a/devel/tla/files/patch-linkopenssl b/devel/tla/files/patch-linkopenssl new file mode 100644 index 000000000000..960edede414e --- /dev/null +++ b/devel/tla/files/patch-linkopenssl @@ -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 --git a/devel/tla/files/patch-neonssl b/devel/tla/files/patch-neonssl new file mode 100644 index 000000000000..dce5f28cdf1e --- /dev/null +++ b/devel/tla/files/patch-neonssl @@ -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 --git a/devel/tla/files/patch-tla::libneon::PLUGIN::AUTOCONF b/devel/tla/files/patch-tla::libneon::PLUGIN::AUTOCONF deleted file mode 100644 index dd07d7780409..000000000000 --- a/devel/tla/files/patch-tla::libneon::PLUGIN::AUTOCONF +++ /dev/null @@ -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 --git a/devel/tla/files/patch-tla::tla::Makefile.in b/devel/tla/files/patch-tla::tla::Makefile.in deleted file mode 100644 index ae155bdc1b51..000000000000 --- a/devel/tla/files/patch-tla::tla::Makefile.in +++ /dev/null @@ -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 --git a/devel/tla/pkg-plist b/devel/tla/pkg-plist deleted file mode 100644 index 6ba125a29a28..000000000000 --- a/devel/tla/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -bin/tla -bin/tla-gpg-check -@comment automatically generated plist for docs