* pkg-comment removal, take 2: introduce the COMMENTFILE variable

  with the same semantics as the current COMMENT variable (location
  of the pkg-comment file), and reclaim COMMENT for the comment string
  itself.  To work around the problems with metacharacters in comment
  strings, comments are written to a temporary comment file as needed. [1]

* Support regexps in LIB_DEPENDS [2]

* Move the CD_MOUNTPTS variable to <bsd.port.pre.mk> [3]

* Improve 'make readmes' target [4]:
  - ^A and ^B have been replaced by | to avoid printing problems in
    'make readme'.
  - Add %%EMAIL%%, %%MAINTAINER%% (not used yet) and %%WEBSITE%%
    substitutions
  - Add pretty-print-www-site target.

* Add support for USE_GCC=3.2 [5]

* Use 'uname -p' instead of 'uname -m' to set the ARCH variable. [6]

* Add a ${YACC} variable [7]

* Path MANPREFIX in MAKE_ENV [8]

* Use the full patch to mkhtmlindex in MKHTMLINDEX [9]

* Avoid overflowing the commandline when constructing the _TMLINKS
  variable (fixes 'make index'). [10]

Submitted by:	lioux [1], mi [2], mbr [3][5],
		Cyrille Lefevre <clefevre@citeweb.net> [4],
		nyan [6], cy [7], dougb [8], anholt [9],
		fenner [10] (based on)
PR:		ports/34126 [2], ports/30983 [3] (based on),
		ports/31389 [4], ports/47306 [5] (based on),
		ports/35514 [6], ports/44496 [7],
		ports/44895 [8], ports/45549 [9]

3 files changed, 121 insertions, 69 deletions

diff --git a/Mk/bsd.emacs.mk b/Mk/bsd.emacs.mk
index eb2e7057acad..38fd68ff222e 100644
--- a/Mk/bsd.emacs.mk
+++ b/Mk/bsd.emacs.mk
@@ -1,5 +1,5 @@
 #
-#	$FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.21 2003-01-23 15:55:36 shige Exp $
+#	$FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.22 2003-02-10 07:59:22 kris Exp $
 #
 #	bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
 #
@@ -73,7 +73,7 @@ EMACS_COMMON_PORT=	NO
 EMACS_HAS_MULE=		NO
 EMACS_NO_SUBDIRSEL=	YES
 .if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENT?=		${PKGDIR}/pkg-comment.emacs19
+COMMENTFILE?=		${PKGDIR}/pkg-comment.emacs19
 DESCR?=                 ${PKGDIR}/pkg-descr.emacs19
 PLIST?=                 ${PKGDIR}/pkg-plist.emacs19
 .endif
@@ -90,7 +90,7 @@ EMACS_COMMON_PORT=	NO
 EMACS_HAS_MULE=		YES
 EMACS_NO_SUBDIRSEL=	NO
 .if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENT?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
+COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
 DESCR?=                 ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
 PLIST?=                 ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 .endif
@@ -107,7 +107,7 @@ EMACS_COMMON_PORT=	NO
 EMACS_HAS_MULE=		YES
 EMACS_NO_SUBDIRSEL=	NO
 .if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENT?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
+COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
 DESCR?=                 ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
 PLIST?=                 ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 .endif
@@ -124,7 +124,7 @@ EMACS_COMMON_PORT=	YES
 EMACS_HAS_MULE=		YES
 EMACS_NO_SUBDIRSEL=	YES
 .if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENT?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
+COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
 DESCR?=                 ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
 PLIST?=                 ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 .endif
@@ -141,7 +141,7 @@ EMACS_COMMON_PORT=	NO
 EMACS_HAS_MULE=		NO
 EMACS_NO_SUBDIRSEL=	NO
 .if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENT?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
+COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
 DESCR?=                 ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
 PLIST?=                 ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 .endif
@@ -158,7 +158,7 @@ EMACS_COMMON_PORT=	YES
 EMACS_HAS_MULE=		YES
 EMACS_NO_SUBDIRSEL=	NO
 .if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENT?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
+COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
 DESCR?=                 ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
 PLIST?=                 ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 .endif
@@ -175,7 +175,7 @@ EMACS_COMMON_PORT=	NO
 EMACS_HAS_MULE=		NO
 EMACS_NO_SUBDIRSEL=	NO
 .if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENT?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
+COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
 DESCR?=                 ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
 PLIST?=                 ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 .endif
@@ -192,7 +192,7 @@ EMACS_COMMON_PORT=	NO
 EMACS_HAS_MULE=		YES
 EMACS_NO_SUBDIRSEL=	NO
 .if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENT?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
+COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
 DESCR?=                 ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
 PLIST?=                 ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 .endif
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 2b9cfd3d29ce..4c37df6b975a 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -32,7 +32,7 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 # These are meta-variables that are automatically set to the system
 # you are running on.
 # 
-# ARCH			- The architecture, as returned by "uname -m".
+# ARCH			- The architecture, as returned by "uname -p".
 # OPSYS			- Portability clause.  This is the operating system the
 #				  makefile is being used on.  Automatically set to
 #				  "FreeBSD," "NetBSD," or "OpenBSD" as appropriate.
@@ -628,6 +628,7 @@ TRUE?=		true				# Shell builtin
 UNAME?=		/usr/bin/uname
 WHICH?=		/usr/bin/which
 XARGS?=		/usr/bin/xargs
+YACC?=		/usr/bin/yacc
 
 # ECHO is defined in /usr/share/mk/sys.mk, which can either be "echo",
 # or "true" if the make flag -s is given.  Use ECHO_CMD where you mean
@@ -639,7 +640,7 @@ ECHO_MSG?=		${ECHO_CMD}
 
 # Get the architecture
 .if !defined(ARCH)
-ARCH!=	${UNAME} -m
+ARCH!=	${UNAME} -p
 .endif
 
 # Kludge for pre-3.0 systems
@@ -865,6 +866,9 @@ XFREE86_VERSION?=	4
 XFREE86_VERSION?=	3
 .endif
 
+# Location of mounted CDROM(s) to search for files
+CD_MOUNTPTS?=	/cdrom ${CD_MOUNTPT}
+
 .endif
 # End of pre-makefile section.
 
@@ -1104,12 +1108,17 @@ CXX=			g++295
 BUILD_DEPENDS+=	gcc295:${PORTSDIR}/lang/gcc295
 MAKE_ENV+=		CC=${CC} CXX=${CXX}
 .endif
-.if defined(USE_GCC) && ${USE_GCC} == 3.1 && ${OSVERSION} < 500035
+.if defined(USE_GCC) && ${USE_GCC} == 3.1 && ( ${OSVERSION} < 500035 || ${OSVERSION} > 500038 )
 CC=				gcc31
 CXX=			g++31
 BUILD_DEPENDS+=	gcc31:${PORTSDIR}/lang/gcc31
 MAKE_ENV+=		CC=${CC} CXX=${CXX}
 .endif
+.if defined(USE_GCC) && ${USE_GCC} == 3.2 && ${OSVERSION} < 500039
+CC=				gcc32
+CXX=			g++32
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
+.endif
 
 .if defined(USE_LINUX)
 RUN_DEPENDS+=	${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base
@@ -1272,7 +1281,7 @@ NONEXISTENT?=	/nonexistent
 GMAKE?=			gmake
 LIBTOOL?=		libtool
 XMKMF?=			xmkmf -a
-MKHTMLINDEX?=		mkhtmlindex
+MKHTMLINDEX?=		${X11BASE}/bin/mkhtmlindex
 .if exists(/sbin/md5)
 MD5?=			/sbin/md5
 .elif exists(/bin/md5)
@@ -1286,7 +1295,7 @@ MD5_FILE?=		${MASTERDIR}/distinfo
 
 MAKE_FLAGS?=	-f
 MAKEFILE?=		Makefile
-MAKE_ENV+=		PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV+=		PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}"
 
 .if ${OSVERSION} < 500016
 PTHREAD_CFLAGS=	-D_THREAD_SAFE
@@ -1413,7 +1422,7 @@ SCRIPTS_ENV+=	${INSTALL_MACROS}
 .undef NO_PACKAGE
 .endif
 
-COMMENT?=		${PKGDIR}/pkg-comment
+COMMENTFILE?=		${PKGDIR}/pkg-comment
 DESCR?=			${PKGDIR}/pkg-descr
 PLIST?=			${PKGDIR}/pkg-plist
 PKGINSTALL?=	${PKGDIR}/pkg-install
@@ -1436,11 +1445,7 @@ PKG_CMD?=		/usr/sbin/pkg_create
 PKG_DELETE?=	/usr/sbin/pkg_delete
 PKG_INFO?=		/usr/sbin/pkg_info
 .if !defined(PKG_ARGS)
-.if exists(${COMMENT})
-PKG_ARGS=		-v -c ${COMMENT} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | sort -u`" ${EXTRA_PKG_ARGS}
-.else
-PKG_ARGS=		-v -c -"${PORTCOMMENT}" -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | sort -u`" ${EXTRA_PKG_ARGS}
-.endif
+PKG_ARGS=		-v -c ${COMMENTFILE} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | sort -u`" ${EXTRA_PKG_ARGS}
 .if exists(${PKGINSTALL})
 PKG_ARGS+=		-i ${PKGINSTALL}
 .endif
@@ -1477,6 +1482,30 @@ MOTIFLIB?=	-L${X11BASE}/lib -lXm -lXp
 ALL_TARGET?=		all
 INSTALL_TARGET?=	install
 
+# This is a mid-term solution patch while pkg-comment files are
+# phased out.
+# The final simpler patch will come afterwards
+.if defined(COMMENT)
+COMMENTFILE=	${WRKDIR}/.comment.${PKGNAME}
+COMMENTFILE_DEFAULT_CMD=	${RM} -Rf ${COMMENTFILE} && ${MKDIR} ${WRKDIR} && ${ECHO_CMD} ${COMMENT:Q} > ${COMMENTFILE}
+.else
+.if !exists(${COMMENTFILE})
+.BEGIN:
+		@${ECHO_CMD} 'There is no COMMENT variable defined'
+		@${ECHO_CMD} 'for this port, please rectify this.'
+		@${FALSE}
+.else
+
+COMMENT!=	${CAT} ${COMMENTFILE}
+COMMENTFILE_DEFAULT_CMD=	${DO_NADA}
+.endif
+.endif
+
+.if !target(generate-commentfile)
+generate-commentfile:
+	@${COMMENTFILE_DEFAULT_CMD}
+.endif
+
 # Popular master sites
 .include "bsd.sites.mk"
 
@@ -1692,7 +1721,6 @@ _MASTER_SITE_BACKUP=	${MASTER_SITE_BACKUP}
 
 # Search CDROM first if mounted, symlink instead of copy if
 # FETCH_SYMLINK_DISTFILES is set
-CD_MOUNTPTS?=	/cdrom ${CD_MOUNTPT}
 .for MOUNTPT in ${CD_MOUNTPTS}
 .if exists(${MOUNTPT}/ports/distfiles)
 _MASTER_SITE_OVERRIDE:=	file:${MOUNTPT}/ports/distfiles/${DIST_SUBDIR}/ ${_MASTER_SITE_OVERRIDE}
@@ -1997,6 +2025,15 @@ _MLINKS+=	${___pmlinks:S// /g}
 .endfor
 .endfor
 .endif
+_COUNT=0
+.for ___tpmlinks in ${_MLINKS}
+.if ${_COUNT} == "1"
+_TMLINKS+=	${___tpmlinks}
+_COUNT=0
+.else
+_COUNT=1
+.endif
+.endfor
 
 .for lang in ${MANLANG}
 
@@ -2016,9 +2053,7 @@ _MANPAGES+=	${MANN:S%^%${MANNPREFIX}/man/${lang}/mann/%}
 
 .endfor
 
-.if defined(_MLINKS)
-_TMLINKS!=	${ECHO_CMD} ${_MLINKS} | ${AWK} '{for (i=2; i<=NF; i+=2) print $$i}'
-.else
+.if !defined(_MLINKS)
 _TMLINKS=
 .endif
 
@@ -2594,7 +2629,7 @@ do-install:
 # Package
 
 .if !target(do-package)
-do-package: ${TMPPLIST}
+do-package: ${TMPPLIST} generate-commentfile
 	@if [ -d ${PACKAGES} ]; then \
 		if [ ! -d ${PKGREPOSITORY} ]; then \
 			if ! ${MKDIR} ${PKGREPOSITORY}; then \
@@ -2977,6 +3012,16 @@ patch-libtool:
 .endif
 .endif
 
+.if !target(pretty-print-www-site)
+pretty-print-www-site:
+	@www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \
+	if [ -n "$${www_site}" ]; then \
+		${ECHO} -n " and/or visit the "; \
+		${ECHO} -n "<a href=\"$${www_site}\">web site</a>"; \
+		${ECHO} " for futher informations"; \
+	fi
+.endif
+
 ################################################################
 # Some more targets supplied for users' convenience
 ################################################################
@@ -3324,20 +3369,25 @@ ${deptype:L}-depends:
 .endfor
 
 lib-depends:
-.if defined(LIB_DEPENDS)
-.if !defined(NO_DEPENDS)
+.if defined(LIB_DEPENDS) && !defined(NO_DEPENDS)
 	@for i in ${LIB_DEPENDS}; do \
-		lib=`${ECHO_CMD} $$i | ${SED} -e 's/:.*//'`; \
-		dir=`${ECHO_CMD} $$i | ${SED} -e 's/[^:]*://'`; \
-		if ${EXPR} "$$dir" : '.*:' > /dev/null; then \
-			target=`${ECHO_CMD} $$dir | ${SED} -e 's/.*://'`; \
-			dir=`${ECHO_CMD} $$dir | ${SED} -e 's/:.*//'`; \
-		else \
+		lib=$${i%%:*}; \
+		case $$lib in \
+			*.*.*)	pattern=$$lib ;;\
+			*.*)	pattern="$${lib%%.*}\.$${lib#*.}" ;;\
+			*)		pattern=$$lib ;;\
+		esac; \
+		dir=$${i#*:}; \
+		target=$${i##*:}; \
+		if ${TEST} $$dir = $$target; then \
 			target="${DEPENDS_TARGET}"; \
 			depends_args="${DEPENDS_ARGS}"; \
+		else \
+			dir=$${dir%%:*}; \
 		fi; \
-		if ${LDCONFIG} -r | ${GREP} -qwF -e "-l$$lib"; then \
-			${ECHO_MSG} "===>   ${PKGNAME} depends on shared library: $$lib - found"; \
+		${ECHO_MSG} -n "===>   ${PKGNAME} depends on shared library: $$lib"; \
+		if ${LDCONFIG} -r | ${GREP} -qwE -e "-l$$pattern"; then \
+			${ECHO_MSG} " - found"; \
 			if [ ${_DEPEND_ALWAYS} = 1 ]; then \
 				${ECHO_MSG} "       (but building it anyway)"; \
 				notfound=1; \
@@ -3345,7 +3395,7 @@ lib-depends:
 				notfound=0; \
 			fi; \
 		else \
-			${ECHO_MSG} "===>   ${PKGNAME} depends on shared library: $$lib - not found"; \
+			${ECHO_MSG} " - not found"; \
 			notfound=1; \
 		fi; \
 		if [ $$notfound != 0 ]; then \
@@ -3355,9 +3405,7 @@ lib-depends:
 			else \
 				(cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
 				${ECHO_MSG} "===>   Returning to build of ${PKGNAME}"; \
-				if ${LDCONFIG} -r | ${GREP} -qwF -e "-l$$lib"; then \
-					${TRUE}; \
-				else \
+				if ! ${LDCONFIG} -r | ${GREP} -qwE -e "-l$$pattern"; then \
 					${ECHO_MSG} "Error: shared library \"$$lib\" does not exist"; \
 					${FALSE}; \
 				fi; \
@@ -3365,9 +3413,6 @@ lib-depends:
 		fi; \
 	done
 .endif
-.else
-	@${DO_NADA}
-.endif
 
 misc-depends:
 .if defined(DEPENDS)
@@ -3539,15 +3584,13 @@ package-depends:
 #  description-file|maintainer|categories|build deps|run deps|www site
 
 .if !target(describe)
-describe:
+describe: generate-commentfile
 	@${ECHO_CMD} "`perl -e ' \
 		print q{${PKGNAME}|${.CURDIR}|${PREFIX}|}; \
-		if (open(COMMENT, q{${COMMENT}})) { \
+		if (open(COMMENT, q{${COMMENTFILE}})) { \
 			$$_ = <COMMENT>; \
 			chomp; \
 			print; \
-		} elsif (not // =~ q{${PORTCOMMENT}}) { \
-			print q{${PORTCOMMENT}}; \
 		} else { \
 			print q{** No Description}; \
 		} \
@@ -3610,18 +3653,27 @@ readme:
 	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} ${.CURDIR}/README.html
 .endif
 
-${.CURDIR}/README.html:
+${.CURDIR}/README.html:	generate-commentfile
 	@${ECHO_MSG} "===>   Creating README.html for ${PKGNAME}"
-	@${CAT} ${TEMPLATES}/README.port | \
-		${SED} -e 's
%%PORT%%
'`${ECHO_CMD} ${.CURDIR} | ${SED} -e 's.*/\([^/]*/[^/]*\)$$\1'`'
g' \
-			-e 's
%%PKG%%
${PKGNAME}
g' \
-			-e '/%%COMMENT%%/r${COMMENT}' \
+	@${SED} -e 's|%%PORT%%|'$$(${ECHO_CMD} ${.CURDIR} | \
+							  ${SED} -e 's|.*/\([^/]*/[^/]*\)$$|\1|')'|g' \
+			-e 's|%%PKG%%|${PKGNAME}|g' \
+			-e '/%%COMMENT%%/r${COMMENTFILE}' \
 			-e '/%%COMMENT%%/d' \
-			-e 's
%%DESCR%%
'"`${ECHO_CMD} ${DESCR} | ${SED} -e 's${.CURDIR}/'`"'
' \
-			-e 's
%%BUILD_DEPENDS%%
'"`cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} pretty-print-build-depends-list`"'
' \
-			-e 's
%%RUN_DEPENDS%%
'"`cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} pretty-print-run-depends-list`"'
' \
-			-e 's
%%TOP%%
'"`${ECHO_CMD} ${CATEGORIES} | ${SED} -e 'sa .*aa' -e 'sa[^/]*a..ag'`"'/..
' \
-		>> $@
+			-e 's|%%DESCR%%|'"$$(${ECHO_CMD} ${DESCR} | \
+								 ${SED} -e 's|${.CURDIR}/||')"'|' \
+			-e 's|%%EMAIL%%|'"$$(${ECHO_CMD} "${MAINTAINER}" | \
+								 ${SED} -e 's/([^)]*)//;s/.*<//;s/>.*//')"'|g' \
+			-e 's|%%MAINTAINER%%|${MAINTAINER}|g' \
+			-e 's|%%WEBSITE%%|'"$$(cd ${.CURDIR} && ${MAKE} \
+					${__softMAKEFLAGS} pretty-print-www-site)"'|' \
+			-e 's|%%BUILD_DEPENDS%%|'"$$(cd ${.CURDIR} && ${MAKE} \
+					${__softMAKEFLAGS} pretty-print-build-depends-list)"'|' \
+			-e 's|%%RUN_DEPENDS%%|'"$$(cd ${.CURDIR} && ${MAKE} \
+					${__softMAKEFLAGS} pretty-print-run-depends-list)"'|' \
+			-e 's|%%TOP%%|'"$$(${ECHO_CMD} ${CATEGORIES} | \
+							   ${SED} -e 's| .*||' -e 's|[^/]*|..|g')"'/..|' \
+		${TEMPLATES}/README.port >> $@
 
 # The following two targets require an up-to-date INDEX in ${PORTSDIR}
 
@@ -3737,7 +3789,7 @@ compress-man:
 # accordance to the @pkgdep directive in the packing lists
 
 .if !target(fake-pkg)
-fake-pkg:
+fake-pkg: generate-commentfile
 .if !defined(NO_PKG_REGISTER)
 	@if [ ! -d ${PKG_DBDIR} ]; then ${RM} -f ${PKG_DBDIR}; ${MKDIR} ${PKG_DBDIR}; fi
 	@${RM} -f /tmp/${PKGNAME}-required-by
@@ -3752,11 +3804,7 @@ fake-pkg:
 		${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \
 		${PKG_CMD} ${PKG_ARGS} -O ${PKGFILE} > ${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \
 		${CP} ${DESCR} ${PKG_DBDIR}/${PKGNAME}/+DESC; \
-		if [ -f ${COMMENT} ]; then \
-			${CP} ${COMMENT} ${PKG_DBDIR}/${PKGNAME}/+COMMENT; \
-		else \
-			${ECHO_CMD} ${PORTCOMMENT} > ${PKG_DBDIR}/${PKGNAME}/+COMMENT; \
-		fi; \
+		${CP} ${COMMENTFILE} ${PKG_DBDIR}/${PKGNAME}/+COMMENT; \
 		if [ -f ${PKGINSTALL} ]; then \
 			${CP} ${PKGINSTALL} ${PKG_DBDIR}/${PKGNAME}/+INSTALL; \
 		fi; \
diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk
index ecb81bad33e5..2645e0f501d9 100644
--- a/Mk/bsd.port.subdir.mk
+++ b/Mk/bsd.port.subdir.mk
@@ -47,7 +47,7 @@ STRIP?=	-s
 
 .if !defined(NOPRECIOUSMAKEVARS)
 .if !defined(ARCH)
-ARCH!=	/usr/bin/uname -m
+ARCH!=	/usr/bin/uname -p
 .endif
 .if !defined(OSREL)
 OSREL!=	/usr/bin/uname -r | sed -e 's/[-(].*//'
@@ -118,8 +118,8 @@ _SUBDIRUSE: .USE
 			${ECHO_MSG} "===> ${DIRPRFX}$$sub skipped"; \
 		fi; \
 	done; \
-	if test -d ${.CURDIR}/${.TARGET:R}.${MACHINE}; then \
-		edir=$${sub}.${MACHINE}; \
+	if test -d ${.CURDIR}/${.TARGET:R}.${MACHINE_ARCH}; then \
+		edir=$${sub}.${MACHINE_ARCH}; \
 	elif test -d ${.CURDIR}/$${sub}; then \
 		edir=$${sub}; \
 	else \
@@ -203,7 +203,7 @@ README=	${TEMPLATES}/README.top
 .else
 README=	${TEMPLATES}/README.category
 .endif
-COMMENT?=	${.CURDIR}/pkg/COMMENT
+COMMENTFILE?=	${.CURDIR}/pkg/COMMENT
 DESCR?=		${.CURDIR}/pkg/DESCR
 .if ${OSVERSION} >= 500036
 INDEXFILE?=	INDEX-5
@@ -226,7 +226,7 @@ README.html:
 .else
 	@echo -n '<a href="'${entry}/README.html'">'"`cd ${entry}; make package-name | ${HTMLIFY}`</a>: " >> $@.tmp
 .endif
-	@cat `cd ${entry}; make -V COMMENT` | ${HTMLIFY} >> $@.tmp
+	@echo `cd ${entry}; make -V COMMENT` | ${HTMLIFY} >> $@.tmp
 .endif
 .endfor
 	@sort -t '>' +1 -2 $@.tmp > $@.tmp2
@@ -235,11 +235,15 @@ README.html:
 .else
 	@> $@.tmp3
 .endif
-.if exists(${COMMENT})
-	@${HTMLIFY} ${COMMENT} > $@.tmp4
+.if defined(COMMENT)
+	@echo "${COMMENT:Q}" | ${HTMLIFY} > $@.tmp4
+.else
+.if exists(${COMMENTFILE})
+	@${HTMLIFY} ${COMMENTFILE} > $@.tmp4
 .else
 	@> $@.tmp4
 .endif
+.endif
 	@cat ${README} | \
 		sed -e 's/%%CATEGORY%%/'"`basename ${.CURDIR}`"'/g' \
 			-e '/%%COMMENT%%/r$@.tmp4' \