Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Jan 2001 13:45:47 +0200
From:      johann@egenetics.com
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/24600: Port cleanup: textproc/py-martel (MAINTAINER)
Message-ID:  <E14LON1-0007PF-00@fling.sanbi.ac.za>

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

>Number:         24600
>Category:       ports
>Synopsis:       Port cleanup: textproc/py-martel (MAINTAINER)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 24 03:50:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Johann Visagie
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
Electric Genetics
>Environment:
>Description:
- The inclusion of NOPORTODOCS support in PLIST_SUB means this port's
  makefile may be simplified quite a bit (thanks PW!) - much more elegant
  than my "solution"
- If it works OK for this relatively simple port, I'll start cleaning up my
  bigger ports to use %%PORTDOCS%%
>How-To-Repeat:
>Fix:
diff -ruN py-martel.bak/Makefile py-martel/Makefile
--- py-martel.bak/Makefile	Wed Jan 24 13:40:38 2001
+++ py-martel/Makefile	Wed Jan 24 13:40:11 2001
@@ -19,31 +19,15 @@
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/TextTools/__init__.py:${PORTSDIR}/textproc/py-mxTextTools
 
 PYTHON_VERSION=	python2.0
-PLIST=		${WRKDIR}/PLIST
-PKG_PLIST=	${PKGDIR}/pkg-plist
 
 MARTEL_DIR=	${PYTHON_SITELIBDIR}/Martel
 MARTEL_EGDIR=	${PREFIX}/share/examples/martel
 MARTEL_DOCDIR=	${PREFIX}/share/doc/martel
-MARTEL_DOCS=	README HISTORY doc/intro.txt doc/tech_description.txt \
-		doc/writing_a_format.txt
 
 do-build:
 	@ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 	@ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
-pre-install:
-	@ ${CAT} ${PKG_PLIST} > ${PLIST}
-.if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${MARTEL_DOCDIR}
-.for docfile in ${MARTEL_DOCS}
-	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${MARTEL_DOCDIR}/ && \
-	  ${ECHO} ${MARTEL_DOCDIR:S|^${PREFIX}/||}/${docfile:S|^doc/||} \
-	  >> ${PLIST}
-.endfor
-	@ ${ECHO} @dirrm ${MARTEL_DOCDIR:S|^${PREFIX}/||} >> ${PLIST}
-.endif
-
 do-install:
 	@ ${MKDIR} ${MARTEL_DIR}
 	@ (cd ${WRKSRC} && find *.py *.pyc *.pyo formats test \
@@ -51,5 +35,13 @@
 	@ ${MKDIR} ${MARTEL_EGDIR}/builders
 	@ ${INSTALL_DATA} ${WRKSRC}/examples/* ${MARTEL_EGDIR}
 	@ ${INSTALL_DATA} ${WRKSRC}/builders/* ${MARTEL_EGDIR}/builders
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@ ${MKDIR} ${MARTEL_DOCDIR}
+.for docfile in README HISTORY doc/*
+	@ ${INSTALL_MAN} ${WRKSRC}/${docfile} ${MARTEL_DOCDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff -ruN py-martel.bak/pkg-plist py-martel/pkg-plist
--- py-martel.bak/pkg-plist	Wed Jan 24 13:40:38 2001
+++ py-martel/pkg-plist	Wed Jan 24 13:34:13 2001
@@ -1,3 +1,8 @@
+%%PORTDOCS%%share/doc/martel/HISTORY
+%%PORTDOCS%%share/doc/martel/README
+%%PORTDOCS%%share/doc/martel/intro.txt
+%%PORTDOCS%%share/doc/martel/tech_description.txt
+%%PORTDOCS%%share/doc/martel/writing_a_format.txt
 lib/%%PYTHON_VERSION%%/site-packages/Martel/Expression.py
 lib/%%PYTHON_VERSION%%/site-packages/Martel/Expression.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Martel/Expression.pyo
@@ -172,3 +177,4 @@
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Martel/test
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Martel/formats
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Martel
+%%PORTDOCS%%@dirrm share/doc/martel

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


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E14LON1-0007PF-00>