Skip site navigation (1)Skip section navigation (2)
Date:      9 Jun 2003 23:32:26 -0000
From:      Sergei Kolobov <sergei@kolobov.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/53172: [PATCH] Update textproc/txt2tags to 1.5, take maintainership
Message-ID:  <20030609233226.4668.qmail@kolobov.com>
Resent-Message-ID: <200306110010.h5B0A9Yx056563@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         53172
>Category:       ports
>Synopsis:       [PATCH] Update textproc/txt2tags to 1.5, take maintainership
>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:   Tue Jun 10 17:10:08 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Sergei Kolobov
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD elf.chetwood.ru 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Thu Jun  5 02:19:41 MSD
>Description:
In memory of AlanE (R.I.P.)

- Update to 1.5
- Use static pkg-plist instead of dynamically generated (it does not make much
  sense for a port with just 28 files, plus the list does NOT change often)
- Simplify Makefile
- Adopt this orphan
>How-To-Repeat:
>Fix:

--- txt2tags-1.5.patch begins here ---
diff -ruN --exclude=CVS txt2tags.cvs/Makefile txt2tags/Makefile
--- txt2tags.cvs/Makefile	Mon Jun  9 01:13:49 2003
+++ txt2tags/Makefile	Tue Jun 10 03:19:34 2003
@@ -1,5 +1,3 @@
-# ex:ts=8	-*-mode: makefile-*-
-#
 # New ports collection makefile for:	txt2tags
 # Date created:		2002-12-20
 # Whom:			Alan Eldridge <alane@freebsd.org>
@@ -8,83 +6,30 @@
 #
 
 PORTNAME=	txt2tags
-PORTVERSION=	1.3
-PORTREVISION=	0
-PORTEPOCH=	0
+PORTVERSION=	1.5
 CATEGORIES=	textproc
 MASTER_SITES=	http://txt2tags.sourceforge.net/src/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sergei@kolobov.com
 COMMENT=	Utility to turn simply formatted text into markup (e.g., HTML)
 
-NO_BUILD=	yes
 USE_PYTHON=	yes
-PLIST=		${WRKDIR}/plist
-PREFIX=		${LOCALBASE}
-
-.include <bsd.port.pre.mk>
-
-DOCS_SUBDIR=		${DOCSDIR:S|^${PREFIX}/||}
-EXAMPLES_SUBDIR=	${EXAMPLESDIR:S|^${PREFIX}/||}
-
-BIN_SUBDIR=		bin
-BINDIR=			${PREFIX}/${BIN_SUBDIR}
-DATA_SUBDIR=		share
-DATADIR=		${PREFIX}/${DATA_SUBDIR}
-ETC_SUBDIR=		etc
-ETCDIR=			${PREFIX}/${ETC_SUBDIR}
-LIB_SUBDIR=		lib
-LIBDIR=			${PREFIX}/${LIB_SUBDIR}
-PKGDATA_SUBDIR=		share/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-PKGDATADIR=		${PREFIX}/${PKGDATA_SUBDIR}
-PKGETC_SUBDIR=		etc/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-PKGETCDIR=		${PREFIX}/${PKGETC_SUBDIR}
-PKGLIB_SUBDIR=		lib/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-PKGLIBDIR=		${PREFIX}/${PKGLIB_SUBDIR}
-
-post-patch:
-	>${PLIST}
+NO_BUILD=	yes
 
-ADD2PLIST=		${ECHO_CMD} >>${PLIST}
+DOCS=		ChangeLog.txt README.html README.txt RULES TODO userguide/*
+CONTRIB=	contrib/* extras/*
+EXAMPLES=	samples/*
 
 do-install:
-	${MKDIR} ${BINDIR}
-	cd ${WRKSRC};\
-	${INSTALL_SCRIPT} txt2tags ${BINDIR};\
-	${ADD2PLIST} ${BIN_SUBDIR}/txt2tags
+	${INSTALL_SCRIPT} ${WRKSRC}/txt2tags ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${CONTRIB} ${DATADIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${MKDIR} ${DOCSDIR}/userguide
-	${MKDIR} ${EXAMPLESDIR}
-	${MKDIR} ${EXAMPLESDIR}/contrib
-	${MKDIR} ${EXAMPLESDIR}/extras
-	${MKDIR} ${EXAMPLESDIR}/samples
-	cd ${WRKSRC};\
-	for i in ChangeLog.txt README.txt README.html RULES; do\
-		${INSTALL_DATA} $$i ${DOCSDIR};\
-		${ADD2PLIST} ${DOCS_SUBDIR}/$$i;\
-	done
-	cd ${WRKSRC};\
-	${INSTALL_DATA} userguide/* ${DOCSDIR}/userguide;\
-	for i in userguide/*; do\
-		${ADD2PLIST} ${DOCS_SUBDIR}/userguide/$$(basename $$i);\
-	done
-.for dir in contrib extras samples
-	cd ${WRKSRC};\
-	${INSTALL_DATA} ${dir}/* ${EXAMPLESDIR}/${dir};\
-	for i in ${dir}/*; do\
-		${ADD2PLIST} ${EXAMPLES_SUBDIR}/${dir}/$$(basename $$i);\
-	done
-.endfor
-	${ADD2PLIST} "@dirrm" ${EXAMPLES_SUBDIR}/samples
-	${ADD2PLIST} "@dirrm" ${EXAMPLES_SUBDIR}/extras
-	${ADD2PLIST} "@dirrm" ${EXAMPLES_SUBDIR}/contrib
-	${ADD2PLIST} "@dirrm" ${EXAMPLES_SUBDIR}
-	${ADD2PLIST} "@dirrm" ${DOCS_SUBDIR}/userguide
-	${ADD2PLIST} "@dirrm" ${DOCS_SUBDIR}
-.endif # !defined(NOPORTDOCS)
-
-.include <bsd.port.post.mk>
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
 
-#EOF
+.include <bsd.port.mk>
diff -ruN --exclude=CVS txt2tags.cvs/distinfo txt2tags/distinfo
--- txt2tags.cvs/distinfo	Wed Jan  1 19:03:43 2003
+++ txt2tags/distinfo	Tue Jun 10 03:05:06 2003
@@ -1 +1 @@
-MD5 (txt2tags-1.3.tgz) = 114c4b7b1a51565e75ebcbd479166cc2
+MD5 (txt2tags-1.5.tgz) = bb8675a483ba5285403d19c971a016fa
diff -ruN --exclude=CVS txt2tags.cvs/pkg-plist txt2tags/pkg-plist
--- txt2tags.cvs/pkg-plist	Thu Jan  1 03:00:00 1970
+++ txt2tags/pkg-plist	Tue Jun 10 03:23:11 2003
@@ -0,0 +1,31 @@
+bin/txt2tags
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.html
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/RULES
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/userguide.html
+%%PORTDOCS%%%%DOCSDIR%%/userguide.t2t
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/abuseme.html
+%%EXAMPLESDIR%%/abuseme.t2t
+%%EXAMPLESDIR%%/photo.jpg
+%%EXAMPLESDIR%%/pwrbytxt2tags-1.png
+%%EXAMPLESDIR%%/pwrbytxt2tags-2.png
+%%EXAMPLESDIR%%/sample.html
+%%EXAMPLESDIR%%/sample.man
+%%EXAMPLESDIR%%/sample.mgp
+%%EXAMPLESDIR%%/sample.moin
+%%EXAMPLESDIR%%/sample.pm6
+%%EXAMPLESDIR%%/sample.sgml
+%%EXAMPLESDIR%%/sample.t2t
+%%EXAMPLESDIR%%/sample.tex
+%%EXAMPLESDIR%%/sample.txt
+@dirrm %%EXAMPLESDIR%%
+%%DATADIR%%/pagemaker.vim
+%%DATADIR%%/txt2tags-mode.el
+%%DATADIR%%/txt2tags-reverse_title.patch
+%%DATADIR%%/txt2tags.php
+%%DATADIR%%/txt2tags.vim
+%%DATADIR%%/unhtml.vim
+@dirrm %%DATADIR%%
--- txt2tags-1.5.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030609233226.4668.qmail>