Okay ?
Index: Makefile
===================================================================
RCS file: /cvs/ports/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- Makefile 9 Mar 2012 10:57:54 -0000 1.68
+++ Makefile 26 May 2012 12:28:49 -0000
@@ -4,7 +4,6 @@
PKGPATH =
MIRROR_MK ?= ${.CURDIR}/distfiles/Makefile
-PORTSTOP ?= yes
DISTFILES_DB ?= ${.CURDIR}/infrastructure/db/locate.database
.if defined(SUBDIR)
Index: databases/Makefile
===================================================================
RCS file: /cvs/ports/databases/Makefile,v
retrieving revision 1.212
diff -u -p -r1.212 Makefile
--- databases/Makefile 10 May 2012 10:46:54 -0000 1.212
+++ databases/Makefile 26 May 2012 12:28:49 -0000
@@ -136,6 +136,7 @@
SUBDIR += pgworksheet
SUBDIR += pkglocatedb
SUBDIR += pkglocatedb,src
+ SUBDIR += ports-readmes
SUBDIR += postgresql
SUBDIR += postgresql-jdbc
SUBDIR += postgresql-odbc
Index: infrastructure/mk/bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1169
diff -u -p -r1.1169 bsd.port.mk
--- infrastructure/mk/bsd.port.mk 26 May 2012 12:04:35 -0000 1.1169
+++ infrastructure/mk/bsd.port.mk 26 May 2012 12:28:49 -0000
@@ -137,7 +137,6 @@ X11BASE ?= /usr/X11R6
DISTDIR ?= ${PORTSDIR}/distfiles
BULK_COOKIES_DIR ?= ${PORTSDIR}/bulk/${MACHINE_ARCH}
UPDATE_COOKIES_DIR ?= ${PORTSDIR}/update/${MACHINE_ARCH}
-TEMPLATES ?= ${PORTSDIR}/infrastructure/templates
PLIST_DB ?= ${PORTSDIR}/plist/${MACHINE_ARCH}
PACKAGE_REPOSITORY ?= ${PORTSDIR}/packages
@@ -234,7 +233,7 @@ _clean += -f
.endif
# check that clean is clean
_okay_words = depends work fake -f flavors dist install sub packages package \
- readmes bulk force plist build all
+ bulk force plist build all
.for _w in ${_clean:L}
. if !${_okay_words:M${_w}}
ERRORS += "Fatal: unknown clean command: ${_w}\n(not in ${_okay_words})"
@@ -492,8 +491,6 @@ FULLPKGNAME ?= ${PKGNAME}${FLAVOR_EXT}
_MASTER ?=
_SOLVING_DEP ?= No
-_READMES =
-
.if ${MULTI_PACKAGES} == "-"
# XXX "parse" FULLPKGNAME: is there a flavor after the version number
. if ${FULLPKGNAME:M*-[0-9]*-*}
@@ -515,7 +512,6 @@ FULLPKGNAME := ${FULLPKGNAME}v${EPOCH}
PKGSPEC ?= ${FULLPKGNAME:C/-[0-9].*/-*/}
PKGSPEC- = ${PKGSPEC}
FULLPKGNAME- = ${FULLPKGNAME}
-_READMES += ${READMES_TOP}/${PKGPATH}/${FULLPKGNAME}.html
.else
. for _s in ${MULTI_PACKAGES}
. if defined(FULLPKGNAME${_s})
@@ -546,7 +542,6 @@ FULLPKGNAME${_s} := ${FULLPKGNAME${_s}}v
. endif
. endif
PKGSPEC${_s} ?= ${FULLPKGNAME${_s}:C/-[0-9].*/-*/}
-_READMES += ${READMES_TOP}/${PKGPATH}/${FULLPKGNAME${_s}}.html
. endfor
.endif
@@ -1497,8 +1492,6 @@ _BUILD_DEP = ${_BUILD_DEP2:C,^[^:/]*:,,}
_RUN_DEP = ${_RUN_DEP2:C,^[^:/]*:,,}
_REGRESS_DEP = ${_REGRESS_DEP2:C,^[^:/]*:,,}
-README_NAME ?= ${TEMPLATES}/README.port
-
REORDER_DEPENDENCIES ?=
ECHO_REORDER ?= :
@@ -2741,9 +2734,6 @@ _internal-clean:
.elif ${_clean:L:Mpackage}
rm -f ${_PACKAGE_COOKIES${SUBPACKAGE}} ${_UPDATE_COOKIE${SUBPACKAGE}}
.endif
-.if ${_clean:L:Mreadmes}
- rm -f ${_READMES}
-.endif
.if ${_clean:L:Mbulk}
rm -f ${_BULK_COOKIE}
.endif
@@ -2814,63 +2804,6 @@ describe:
. endif
.endfor
-readme:
- @tmpdir=`mktemp -d ${TMPDIR}/readme.XXXXXX`; \
- trap "rm -r $$tmpdir" 0; \
- trap 'exit 1' 1 2 3 13 15; \
- cd ${.CURDIR} && PKGPATH=${PKGPATH} ${MAKE} TMPDIR=$$tmpdir
README_NAME=${README_NAME} \
- ${READMES_TOP}/${PKGPATH}/${FULLPKGNAME${SUBPACKAGE}}.html
-
-readmes:
- @tmpdir=`mktemp -d ${TMPDIR}/readme.XXXXXX`; \
- trap "rm -r $$tmpdir" 0; \
- trap 'exit 1' 1 2 3 13 15; \
- cd ${.CURDIR} && PKGPATH=${PKGPATH} ${MAKE} TMPDIR=$$tmpdir
README_NAME=${README_NAME} \
- ${_READMES}
-
-.for _S in ${MULTI_PACKAGES}
-${READMES_TOP}/${PKGPATH}/${FULLPKGNAME${_S}}.html:
- @mkdir -p ${@D}
- @echo ${_COMMENT${_S}:Q} | ${HTMLIFY} >${TMPDIR}/comment${_S}
- @echo ${FULLPKGNAME${_S}} | ${HTMLIFY} > ${TMPDIR}/pkgname${_S}
-. if defined(HOMEPAGE)
- @echo 'See <a href="${HOMEPAGE}">${HOMEPAGE}</a> for details.'
>${TMPDIR}/home${_S}
-. else
- @echo "" >${TMPDIR}/home${_S}
-. endif
-. if ${MULTI_PACKAGES} != "-"
- @echo "<h2>Part of a Multi-Package set</h2>" >${TMPDIR}/subpackages${_S}
- @echo "<ul>" >>${TMPDIR}/subpackages${_S}
-. for _T in ${MULTI_PACKAGES}
- @echo "<li><a
href=\"${FULLPKGNAME${_T}}.html\">${FULLPKGNAME${_T}}</a>"
>>${TMPDIR}/subpackages${_S}
-. endfor
- @echo "</ul>" >>${TMPDIR}/subpackages${_S}
-. else
- @>${TMPDIR}/subpackages${_S}
-. endif
-. for _I in build run
-. if !empty(_${_I:U}_DEP)
- @cd ${.CURDIR} && SUBPACKAGE=${_S} PKGPATH=${PKGPATH} ${MAKE}
full-${_I}-depends _FULL_PACKAGE_NAME=Yes| \
- while read n; do \
- j=`dirname $$n|${HTMLIFY}`; k=`basename
$$n|${HTMLIFY}`; \
- echo "<li><a href=\"${PKGDEPTH}$$j/$$k.html\">$$k</a>";
\
- done >${TMPDIR}/${_I}${_S}
-. else
- @echo "<li>none" >${TMPDIR}/${_I}${_S}
-. endif
-. endfor
- @sed -e 's|%%PORT%%|'"`echo ${FULLPKGPATH${_S}} | ${HTMLIFY}`"'|g' \
- -e '/%%PKG%%/r${TMPDIR}/pkgname${_S}' -e '//d' \
- -e '/%%COMMENT%%/r${TMPDIR}/comment${_S}' -e '//d' \
- -e '/%%DESCR%%/r${DESCR${_S}}' -e '//d' \
- -e '/%%HOMEPAGE%%/r${TMPDIR}/home${_S}' -e '//d' \
- -e '/%%BUILD_DEPENDS%%/r${TMPDIR}/build${_S}' -e '//d' \
- -e '/%%RUN_DEPENDS%%/r${TMPDIR}/run${_S}' -e '//d' \
- -e '/%%SUBPACKAGES%%/r${TMPDIR}/subpackages${_S}' -e '//d' \
- ${README_NAME} > $@
- @rm -f ${TMPDIR}/*${_S}
-.endfor
-
print-build-depends:
.if !empty(_BUILD_DEP)
@echo -n 'This port requires package(s) "'
@@ -3329,7 +3262,7 @@ _all_phony = ${_recursive_depends_target
post-distpatch post-extract post-install \
post-patch post-regress pre-build pre-configure pre-extract pre-fake \
pre-install pre-patch pre-regress prepare \
- print-build-depends print-run-depends readme readmes rebuild \
+ print-build-depends print-run-depends rebuild \
regress-depends regress-depends-list run-depends run-depends-list \
show-required-by subpackage uninstall _print-metadata \
lock unlock \
Index: infrastructure/mk/bsd.port.subdir.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.subdir.mk,v
retrieving revision 1.107
diff -u -p -r1.107 bsd.port.subdir.mk
--- infrastructure/mk/bsd.port.subdir.mk 7 May 2012 21:11:44 -0000
1.107
+++ infrastructure/mk/bsd.port.subdir.mk 26 May 2012 12:28:49 -0000
@@ -25,12 +25,9 @@
#
# +++ targets +++
#
-# README.html:
-# Creating README.html for package.
-#
# afterinstall, all, beforeinstall, build, checksum, clean,
# configure, depend, describe, extract, fetch, fetch-list,
-# install, package, readmes, deinstall, reinstall,
+# install, package, deinstall, reinstall,
# tags
#
@@ -104,12 +101,6 @@ _SKIP_STUFF+= ; case "$${subdir}" in \
${MATCHDIR}) ;; \
*) continue ;; esac
.endif
-TEMPLATES ?= ${PORTSDIR}/infrastructure/templates
-.if defined(PORTSTOP)
-README = ${TEMPLATES}/README.top
-.else
-README = ${TEMPLATES}/README.category
-.endif
_subdir_fragment = \
: $${echo_msg:=${ECHO_MSG:Q}}; \
@@ -186,37 +177,6 @@ clean:
.else
@${_subdir_fragment}
.endif
-.if defined(clean) && ${clean:L:Mreadmes}
- rm -f ${READMES_TOP}/${PKGPATH}/README.html
-.endif
-
-readmes:
- @${_subdir_fragment}
- @tmpdir=`mktemp -d ${TMPDIR}/readme.XXXXXX`; \
- trap 'rm -r $$tmpdir' 0; \
- trap 'exit 1' 1 2 3 13 15; \
- cd ${.CURDIR} && ${MAKE} TMPDIR=$$tmpdir \
- ${READMES_TOP}/${PKGPATH}/README.html
-
-${READMES_TOP}/${PKGPATH}/README.html:
- @mkdir -p ${@D}
- @>${TMPDIR}/subdirs
-.for d in ${_FULLSUBDIR}
- @subdir=$d; \
- ${_flavor_fragment}; \
- if name=`eval $$toset ${MAKE} _print-packagename`; then \
- comment=`eval $$toset ${MAKE} show=_COMMENT|sed -e 's,^",,' -e
's,"$$,,' |${HTMLIFY}`; \
- else \
- comment=''; \
- fi; \
- cd ${.CURDIR}; \
- echo "<dt><a href=\"${PKGDEPTH}$$dir/$$name.html\">$d</a><dd>$$comment"
>>${TMPDIR}/subdirs
-.endfor
- @sed -e 's%%CATEGORY%%'`echo ${.CURDIR} | sed -e
's.*/\([^/]*\)$$\1'`'g' \
- -e '/%%DESCR%%/r${.CURDIR}/pkg/DESCR' -e '//d' \
- -e '/%%SUBDIR%%/r${TMPDIR}/subdirs' -e '//d' \
- ${README} > $@
- @rm ${TMPDIR}/subdirs
.if defined(ERRORS)
.BEGIN:
Index: infrastructure/mk/pkgpath.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/pkgpath.mk,v
retrieving revision 1.46
diff -u -p -r1.46 pkgpath.mk
--- infrastructure/mk/pkgpath.mk 15 May 2012 11:48:07 -0000 1.46
+++ infrastructure/mk/pkgpath.mk 26 May 2012 12:28:49 -0000
@@ -21,11 +21,6 @@ ERRORS += "Fatal: can't figure out PKGPA
PKGPATH =${.CURDIR}
. endif
.endif
-.if empty(PKGPATH)
-PKGDEPTH =
-.else
-PKGDEPTH = ${PKGPATH:C|[^./][^/]*|..|g}/
-.endif
# Code to invoke to split dir,-multi,flavor
Index: infrastructure/templates/README.category
===================================================================
RCS file: infrastructure/templates/README.category
diff -N infrastructure/templates/README.category
--- infrastructure/templates/README.category 13 Dec 2001 15:40:27 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head><title>Ports in Category %%CATEGORY%%</title></head>
-<body>
-
-<h1>Ports in Category %%CATEGORY%%</h1>
-
-<h2>Description</h2>
-%%DESCR%%
-
-<h2>Sub directories</h2>
-<dl>
-%%SUBDIR%%
-</dl>
-
-</body></html>
Index: infrastructure/templates/README.port
===================================================================
RCS file: infrastructure/templates/README.port
diff -N infrastructure/templates/README.port
--- infrastructure/templates/README.port 2 Aug 2003 09:53:28 -0000
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html><head><title>The %%PORT%% port</title></head>
-<body>
-
-<h1>The %%PORT%% port</h1>
-
-<H2>
-%%PKG%%
---
-%%COMMENT%%
-</H2>
-
-%%SUBPACKAGES%%
-<H2>Description</H2>
-
-<pre>
-%%DESCR%%
-</pre>
-<p>
-%%HOMEPAGE%%
-</p>
-
-<H2>Build dependencies</H2>
-<ul>
-%%BUILD_DEPENDS%%
-</ul>
-
-<H2>Run dependencies</H2>
-<ul>
-%%RUN_DEPENDS%%
-</ul>
-
-</body></html>
Index: infrastructure/templates/README.top
===================================================================
RCS file: infrastructure/templates/README.top
diff -N infrastructure/templates/README.top
--- infrastructure/templates/README.top 13 Dec 2001 15:40:27 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head><title>OpenBSD ports collection</title></head>
-<body>
-
-<h1>OpenBSD ports collection</h1>
-
-<h2>Description</h2>
-%%DESCR%%
-
-<h2>Sub directories</h2>
-<dl COMPACT>
-%%SUBDIR%%
-</dl>
-
-</body></html>
