zap old readmes infrastructure, replaced by new age databases/ports-readmes

which is ways more accurate anyways.
2012-05-28 09:38:04 +00:00 · 2012-05-28 09:38:04 +00:00 · b6c9f9baf3
parent 3212877063
commit b6c9f9baf3
5 changed files with 9 additions and 121 deletions
--- a/3
+++ b/3
@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.68 2012/03/09 10:57:54 espie Exp $
+# $OpenBSD: Makefile,v 1.69 2012/05/28 09:38:04 espie Exp $
 # $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $
 #

 PKGPATH =
 MIRROR_MK ?= ${.CURDIR}/distfiles/Makefile
-PORTSTOP ?= yes
 DISTFILES_DB ?= ${.CURDIR}/infrastructure/db/locate.database

 .if defined(SUBDIR)
--- a/databases/Makefile
+++ b/databases/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.213 2012/05/18 20:59:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.214 2012/05/28 09:38:04 espie Exp $
 # $FreeBSD: Makefile,v 1.24 1997/10/04 23:32:05 andreas Exp $
 #
     SUBDIR =
@ -136,6 +136,7 @@
     SUBDIR += pgworksheet
     SUBDIR += pkglocatedb
     SUBDIR += pkglocatedb,src
+     SUBDIR += ports-readmes
     SUBDIR += postgresql
     SUBDIR += postgresql-jdbc
     SUBDIR += postgresql-odbc
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@ -1,6 +1,6 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-#	$OpenBSD: bsd.port.mk,v 1.1169 2012/05/26 12:04:35 espie Exp $
+#	$OpenBSD: bsd.port.mk,v 1.1170 2012/05/28 09:38:04 espie Exp $
 #	$FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
 #	$NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
 #
@ -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${EPOCH${_s}}
 .      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_targets} \
 	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 \
--- a/infrastructure/mk/bsd.port.subdir.mk
+++ b/infrastructure/mk/bsd.port.subdir.mk
@ -1,7 +1,7 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
-#	$OpenBSD: bsd.port.subdir.mk,v 1.107 2012/05/07 21:11:44 halex Exp $
+#	$OpenBSD: bsd.port.subdir.mk,v 1.108 2012/05/28 09:38:04 espie Exp $
 #	FreeBSD Id: bsd.port.subdir.mk,v 1.20 1997/08/22 11:16:15 asami Exp
 #
 # The include file <bsd.port.subdir.mk> contains the default targets
@ -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:
--- a/infrastructure/mk/pkgpath.mk
+++ b/infrastructure/mk/pkgpath.mk
@ -1,4 +1,4 @@
-# $OpenBSD: pkgpath.mk,v 1.46 2012/05/15 11:48:07 espie Exp $
+# $OpenBSD: pkgpath.mk,v 1.47 2012/05/28 09:38:04 espie Exp $
 # ex:ts=4 sw=4 filetype=make:
 #	pkgpath.mk - 2003 Marc Espie
 #	This file is in the public domain.
@ -21,11 +21,6 @@ ERRORS += "Fatal: can't figure out PKGPATH"
 PKGPATH =${.CURDIR}
 .  endif
 .endif
-.if empty(PKGPATH)
-PKGDEPTH =
-.else
-PKGDEPTH = ${PKGPATH:C|[^./][^/]*|..|g}/
-.endif

 # Code to invoke to split dir,-multi,flavor