Hi,
I guess this one qualifies for a more or less permanent maintainer
timeout:
<[EMAIL PROTECTED]>... Deferred: Connection timed out with gsoares.org.
Message could not be delivered for 5 days
Changes for this port:
- Update to 2.3.2.
- Take maintainership (see above).
- Install t2tconv from extras.
- Use MODULE lang/python.
- Remove patches, just replace #!/usr/bin/env python right here in the
Makefile.
- Include samples/css.
- Enable regress (although six tests are failing due to the strange
distribution policy, i.e. tests aren't matching the released
version). I sent a mail to upstream asking for a less insane
release policy. Let's hope that future releases will be complete.
Test reports and comments are welcome.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /var/cvs/OpenBSD/ports/textproc/txt2tags/Makefile,v
retrieving revision 1.2
diff -u -w -r1.2 Makefile
--- Makefile 3 Jun 2006 15:56:21 -0000 1.2
+++ Makefile 18 Nov 2006 21:00:51 -0000
@@ -2,13 +2,18 @@
COMMENT= "utility to turn simply formatted text into markup"
-DISTNAME= txt2tags-2.2
-PKGNAME= ${DISTNAME}p0
+# Packaging nightmare: roll out tarballs for major releases but update
+# only the python script for minor releases...
+DISTNAME= txt2tags-2.3.2
+MAJORNAME= ${DISTNAME:C,\.[0-9]$,,}
+EXTRACT_ONLY= ${MAJORNAME}.tgz
+DISTFILES= ${EXTRACT_ONLY} ${DISTNAME}.py:0
+WRKDIST= ${WRKDIR}/${MAJORNAME}
CATEGORIES= textproc
HOMEPAGE= http://txt2tags.sourceforge.net/
-MAINTAINER= Gleydson Soares <[EMAIL PROTECTED]>
+MAINTAINER= Matthias Kilian <[EMAIL PROTECTED]>
# GPL
PERMIT_PACKAGE_CDROM= Yes
@@ -16,30 +21,38 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${HOMEPAGE}/src/
-EXTRACT_SUFX= .tgz
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=txt2tags/}
+MASTER_SITES0= ${HOMEPAGE}/src/
-PY_VERSION= 2.4
-RUN_DEPENDS= :python-${PY_VERSION}*:lang/python/${PY_VERSION}
+MODULES= lang/python
PKG_ARCH= *
NO_BUILD= Yes
-NO_REGRESS= Yes
DOCDIR= ${PREFIX}/share/doc/txt2tags
EXAMPLESDIR= ${PREFIX}/share/examples/txt2tags
+
+post-extract:
+ cp -p ${FULLDISTDIR}/${DISTNAME}.py ${WRKSRC}/${DISTNAME:C,-.*,,}
+
pre-configure:
- @perl -pi -e "s,%%PYTHON%%,${LOCALBASE}/bin/python${PY_VERSION}," \
- ${WRKSRC}/{txt2tags,t2tconv}
+ @perl -pi -e "s,^#!/usr/bin/env python,#!${MODPY_BIN}," \
+ ${WRKSRC}/{txt2tags,extras/t2tconv,test/run.py}
do-install:
- ${INSTALL_DATA_DIR} ${DOCDIR} ${EXAMPLESDIR} ${EXAMPLESDIR}/img
- ${INSTALL_SCRIPT} ${WRKSRC}/{txt2tags,t2tconv} ${PREFIX}/bin
+ ${INSTALL_DATA_DIR} ${DOCDIR} ${EXAMPLESDIR}{,/img,/css}
+ ${INSTALL_SCRIPT} ${WRKSRC}/{txt2tags,extras/t2tconv} ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/doc/{*.*,txt2tagsrc} ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/samples/*.* ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/samples/img/*.* ${EXAMPLESDIR}/img
+ ${INSTALL_DATA} ${WRKSRC}/samples/css/*.* ${EXAMPLESDIR}/css
${INSTALL_MAN} ${WRKSRC}/doc/manpage.man ${PREFIX}/man/man1/txt2tags.1
+
+do-regress:
+ @echo Note: there are 6 tests that will fail.
+ chmod +x ${WRKSRC}/txt2tags
+ PATH=${WRKSRC}:$$PATH ${WRKSRC}/test/run.py
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /var/cvs/OpenBSD/ports/textproc/txt2tags/distinfo,v
retrieving revision 1.1.1.1
diff -u -w -r1.1.1.1 distinfo
--- distinfo 11 Feb 2005 11:59:23 -0000 1.1.1.1
+++ distinfo 18 Nov 2006 21:00:51 -0000
@@ -1,4 +1,8 @@
-MD5 (txt2tags-2.2.tgz) = b50157fa0f532585739d79e3affd6588
-RMD160 (txt2tags-2.2.tgz) = d03859e41e71bd82cca85ee1eee75faf94730ea3
-SHA1 (txt2tags-2.2.tgz) = c9ea2b90881db19815676e5ff59e8b17e4bf594a
-SIZE (txt2tags-2.2.tgz) = 609447
+MD5 (txt2tags-2.3.2.py) = 8dc8087c0076155ceaea631e88122962
+MD5 (txt2tags-2.3.tgz) = 0514bb01161183808dc8be105c032677
+RMD160 (txt2tags-2.3.2.py) = 3ce75a506095d3437b29ebb44e8ea2c68a06d29c
+RMD160 (txt2tags-2.3.tgz) = 320abbee12eb8be5e35d02068c0ff8db17734d6c
+SHA1 (txt2tags-2.3.2.py) = 0b721b278d25e6f0c8316021a6fa06ff4cc6145c
+SHA1 (txt2tags-2.3.tgz) = ee64c96a3a4b7c35f0e7546dfeb471b9592f16ef
+SIZE (txt2tags-2.3.2.py) = 157308
+SIZE (txt2tags-2.3.tgz) = 880164
Index: patches/patch-t2tconv
===================================================================
RCS file: /var/cvs/OpenBSD/ports/textproc/txt2tags/patches/patch-t2tconv,v
retrieving revision 1.1.1.1
diff -u -w -r1.1.1.1 patch-t2tconv
--- patches/patch-t2tconv 11 Feb 2005 11:59:23 -0000 1.1.1.1
+++ patches/patch-t2tconv 18 Nov 2006 21:00:51 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-t2tconv,v 1.1.1.1 2005/02/11 11:59:23 alek Exp $
---- t2tconv.orig 2004-07-18 16:23:24.000000000 +0300
-+++ t2tconv 2005-02-03 09:56:03.000000000 +0300
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!%%PYTHON%%
- # t2tconv - txt2tags version 1.7 -> 2.0 convertor
- #
- # This file converts txt2tags source files (.t2t) from the old
Index: patches/patch-txt2tags
===================================================================
RCS file: /var/cvs/OpenBSD/ports/textproc/txt2tags/patches/patch-txt2tags,v
retrieving revision 1.1.1.1
diff -u -w -r1.1.1.1 patch-txt2tags
--- patches/patch-txt2tags 11 Feb 2005 11:59:23 -0000 1.1.1.1
+++ patches/patch-txt2tags 18 Nov 2006 21:00:51 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-txt2tags,v 1.1.1.1 2005/02/11 11:59:23 alek Exp $
---- txt2tags.orig 2004-12-28 22:39:01.000000000 +0300
-+++ txt2tags 2005-02-03 09:56:03.000000000 +0300
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!%%PYTHON%%
- # txt2tags - generic text conversion tool
- # http://txt2tags.sf.net
- #
Index: pkg/PLIST
===================================================================
RCS file: /var/cvs/OpenBSD/ports/textproc/txt2tags/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -w -r1.1.1.1 PLIST
--- pkg/PLIST 11 Feb 2005 11:59:23 -0000 1.1.1.1
+++ pkg/PLIST 18 Nov 2006 21:00:51 -0000
@@ -6,17 +6,25 @@
@comment share/doc/txt2tags/manpage.man
@comment share/doc/txt2tags/manpage.t2t
share/doc/txt2tags/markup.html
+share/doc/txt2tags/rules.html
+share/doc/txt2tags/rules.t2t
share/doc/txt2tags/txt2tagsrc
share/doc/txt2tags/userguide.pdf
share/doc/txt2tags/writing-book.html
share/examples/txt2tags/
-share/examples/txt2tags/abuseme.html
-share/examples/txt2tags/abuseme.t2t
+share/examples/txt2tags/css/
+share/examples/txt2tags/css/color.css
+share/examples/txt2tags/css/color.html
+share/examples/txt2tags/css/modern.css
+share/examples/txt2tags/css/modern.html
+share/examples/txt2tags/css/tech.css
+share/examples/txt2tags/css/tech.html
share/examples/txt2tags/img/
share/examples/txt2tags/img/madeinbr.png
share/examples/txt2tags/img/old-poweredby-1.png
share/examples/txt2tags/img/old-poweredby-2.png
share/examples/txt2tags/img/photo.jpg
+share/examples/txt2tags/img/t2tbutton.png
share/examples/txt2tags/img/t2tpowered.png
share/examples/txt2tags/img/valid-css.png
share/examples/txt2tags/img/valid-html.png
