Date: 8 Jul 2003 10:47:04 -0000 From: Sergei Kolobov <sergei@kolobov.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/54215: [MAINTAINER] textproc/txt2tags: remove overzealous use of NOPORTDOCS Message-ID: <20030708104704.12084.qmail@kolobov.com> Resent-Message-ID: <200307081050.h68AoHaJ061092@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 54215
>Category: ports
>Synopsis: [MAINTAINER] textproc/txt2tags: remove overzealous use of NOPORTDOCS
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 08 03:50:16 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:
- Remove overzealous use of NOPORTDOCS - always install supporting files
in share/txt2tags and examples; only docs are wrapped in NOPORTDOCS
- Use DATADIR, DOCSDIR and EXAMPLESDIR macros in pkg-plist
>How-To-Repeat:
>Fix:
--- txt2tags-1.5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /FreeBSD/cvs/ports/textproc/txt2tags/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 7 Jul 2003 05:32:58 -0000 1.6
+++ Makefile 8 Jul 2003 10:15:20 -0000
@@ -2,7 +2,7 @@
# Date created: 2002-12-20
# Whom: Alan Eldridge <alane@freebsd.org>
#
-# $FreeBSD: ports/textproc/txt2tags/Makefile,v 1.6 2003/07/07 05:32:58 marcus Exp $
+# $FreeBSD: ports/textproc/txt2tags/Makefile,v 1.4 2003/06/08 21:13:49 will Exp $
#
PORTNAME= txt2tags
@@ -25,9 +25,9 @@
${INSTALL_SCRIPT} ${WRKSRC}/txt2tags ${PREFIX}/bin
@${MKDIR} ${DATADIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${CONTRIB} ${DATADIR}
-.if !defined(NOPORTDOCS)
@${MKDIR} ${EXAMPLESDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
.endif
Index: pkg-plist
===================================================================
RCS file: /FreeBSD/cvs/ports/textproc/txt2tags/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist 7 Jul 2003 05:32:58 -0000 1.1
+++ pkg-plist 8 Jul 2003 10:15:20 -0000
@@ -1,31 +1,31 @@
bin/txt2tags
-%%PORTDOCS%%share/doc/txt2tags/ChangeLog.txt
-%%PORTDOCS%%share/doc/txt2tags/README.html
-%%PORTDOCS%%share/doc/txt2tags/README.txt
-%%PORTDOCS%%share/doc/txt2tags/RULES
-%%PORTDOCS%%share/doc/txt2tags/TODO
-%%PORTDOCS%%share/doc/txt2tags/userguide.html
-%%PORTDOCS%%share/doc/txt2tags/userguide.t2t
-%%PORTDOCS%%share/examples/txt2tags/abuseme.html
-%%PORTDOCS%%share/examples/txt2tags/abuseme.t2t
-%%PORTDOCS%%share/examples/txt2tags/photo.jpg
-%%PORTDOCS%%share/examples/txt2tags/pwrbytxt2tags-1.png
-%%PORTDOCS%%share/examples/txt2tags/pwrbytxt2tags-2.png
-%%PORTDOCS%%share/examples/txt2tags/sample.html
-%%PORTDOCS%%share/examples/txt2tags/sample.man
-%%PORTDOCS%%share/examples/txt2tags/sample.mgp
-%%PORTDOCS%%share/examples/txt2tags/sample.moin
-%%PORTDOCS%%share/examples/txt2tags/sample.pm6
-%%PORTDOCS%%share/examples/txt2tags/sample.sgml
-%%PORTDOCS%%share/examples/txt2tags/sample.t2t
-%%PORTDOCS%%share/examples/txt2tags/sample.tex
-%%PORTDOCS%%share/examples/txt2tags/sample.txt
-%%PORTDOCS%%share/txt2tags/pagemaker.vim
-%%PORTDOCS%%share/txt2tags/txt2tags-mode.el
-%%PORTDOCS%%share/txt2tags/txt2tags-reverse_title.patch
-%%PORTDOCS%%share/txt2tags/txt2tags.php
-%%PORTDOCS%%share/txt2tags/txt2tags.vim
-%%PORTDOCS%%share/txt2tags/unhtml.vim
-%%PORTDOCS%%@dirrm share/txt2tags
-%%PORTDOCS%%@dirrm share/examples/txt2tags
-%%PORTDOCS%%@dirrm share/doc/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?20030708104704.12084.qmail>