(1) New directive USE_AUTOMAKE and AUTOMAKE variable for automake

    support.  Implies USE_AUTOCONF.
Submitted by:	kiri@pis.toba-cmt.ac.jp
Reviewed by:	ports

(2) New variable CONFIGURE_WRKSRC (default: ${WRKSRC}) to be set when
    ${CONFIGURE_SCRIPT} needs to be run in some place other than
    ${WRKSRC}.
Submitted by:	Mario Ferreira <lioux@uol.com.br>
Reviewed by:	ports

(3) Slight change in message about the port being too old for
    bsd.port.mk due to missing PORTNAME/PORTVERSION.  Explicitly say
    that the user needs to update the port (although I'm not sure how
    anyone can interpret the old message otherwise ;).

(4) Use NO_CHECKSUM instead of the undocumented FORCE_FETCH to
    override the "distfile missing from files/md5" check.  Also change
    the NO_CHECKSUM message a bit more forceful ("If you are
    absolutely sure...").
Submitted by:	mharo

(5) Refer to the OpenSSL section in handbook by name, not number.
Approved by:	Kris
PR:		17524

(6) New file bsd.emacs.mk that will be automatically be included if
    EMACS_PORT_NAME is defined.  bsd.emacs.mk sets various variables
    to make maintenance of emacs ports easy.
Submitted by:	shige
Reviewed (in spirit) by:	ports, ports-jp

(7) Remove the automatic creation of ${PREFIX}/info/dir from
    /usr/share/info/dir (install-info from 3.1R onwards automatically
    creates the dir file if none exists).  Delete ${PREFIX}/info/dir
    upon deinstallation if it doesn't have any menu entries.
Reviewed by:	ports

(8) Two new targets mtree-file and prefix.  They print ${MTREE_FILE}
    (empty if NO_MTREE is set) and ${PREFIX}, respectively.  They are
    used by package building scripts.

(9) Don't register package dependency in +REQUIRED_BY for
    PKG_IGNORE_DEPENDS ports.  Otherwise you'll end up with bogus
    entries since "pkg_delete oneko" won't delete oneko from
    XFree86/+REQUIRED_BY, etc.
Found by:	bento

2 files changed, 174 insertions, 17 deletions

diff --git a/Mk/bsd.emacs.mk b/Mk/bsd.emacs.mk
new file mode 100644
index 000000000000..2a65699a5e3a
--- /dev/null
+++ b/Mk/bsd.emacs.mk
@@ -0,0 +1,129 @@
+#
+#	$FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.1 2000-05-06 10:45:34 asami Exp $
+#
+#	bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
+#
+
+Emacs_Include=			bsd.emacs.mk
+Emacs_Include_MAINTAINER=	shige@FreeBSD.org
+
+#
+# This file for ports which depend on emacs family.
+# Define EMACS_PORT_NAME variable before bsd.port.[pre.]mk
+# and it will automatically include this file.
+#
+# This file exports the following common variables:
+#
+# EMACS_NAME:
+#		emacsen's command-line basename.
+#		ex.) "emacs" when emacsen is a emacs-20.6.
+#
+# EMACS_VER:
+#		emacsen's version.
+#		ex.) "20.6" when emacsen is a emacs-20.6.
+#
+# EMACS_MAJOR_VER:
+#		emacsen's major version.
+#		ex.) "20" when emacsen is a emacs-20.6.
+#
+# EMACS_LIBDIR:
+#		emacsen's library directory name without ${PREFIX}.
+#		ex.) "share/emacs" when emacsen is a emacs-20.6.
+#
+# EMACS_LIBDIR_WITH_VER:
+#		emacsen's version specific library directory name 
+#		without ${PREFIX}.
+#		ex.) "share/emacs/20.6" when emacsen is a emacs-20.6.
+#
+# EMACS_CMD:
+#		emacsen's command-line filename. (full path)
+#		ex.) "/usr/local/bin/emacs-20.6" when emacsen is a 
+#		     emacs-20.6 and ${PREFIX} is "/usr/local".
+#
+# EMACS_SITE_LISPDIR:
+#		emacsen's site-lisp directory name without ${PREFIX}.
+#		ex.) "share/emacs/site-lisp" when emacsen is a emacs-20.6.
+#
+# EMACS_VERSION_SITE_LISPDIR:
+#		emacsen's version specific site-lisp directory name
+#		without	${PREFIX}.
+#		ex.) "share/emacs/20.6/site-lisp" when emacsen is a
+#		emacs-20.6.
+#
+
+
+# Emacs-19.x
+.if (${EMACS_PORT_NAME} == "emacs19")
+EMACS_NAME=		emacs
+EMACS_VER=		19.34
+EMACS_MAJOR_VER=	19
+EMACS_LIBDIR?=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
+
+# Emacs-20.x
+.elif (${EMACS_PORT_NAME} == "emacs20")
+EMACS_NAME=		emacs
+EMACS_VER=		20.6
+EMACS_MAJOR_VER=	20
+EMACS_LIBDIR?=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
+
+# Mule-19.x
+.elif (${EMACS_PORT_NAME} == "mule19")
+EMACS_NAME=		mule
+EMACS_VER=		19.34
+EMACS_MAJOR_VER=	19
+EMACS_LIBDIR?=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
+
+# XEmacs-19.x
+.elif (${EMACS_PORT_NAME} == "xemacs19")
+EMACS_NAME=		xemacs
+EMACS_VER=		19.16
+EMACS_MAJOR_VER=	19
+EMACS_LIBDIR?=		lib/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
+
+# XEmacs-20.x
+.elif (${EMACS_PORT_NAME} == "xemacs20")
+EMACS_NAME=		xemacs
+EMACS_VER=		20.4
+EMACS_MAJOR_VER=	20
+EMACS_LIBDIR?=		lib/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
+
+# XEmacs-21.x
+.elif (${EMACS_PORT_NAME} == "xemacs21")
+EMACS_NAME=		xemacs
+EMACS_VER=		21.1.9
+EMACS_MAJOR_VER=	21
+EMACS_LIBDIR?=		lib/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
+
+# XEmacs-21.x with Mule
+.elif (${EMACS_PORT_NAME} == "xemacs21-mule")
+EMACS_NAME=		xemacs
+EMACS_VER=		21.1.9
+EMACS_MAJOR_VER=	21
+EMACS_LIBDIR?=		lib/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
+.else
+.BEGIN:
+	@${ECHO} "Error: Bad value of EMACS_PORT_NAME: ${EMACS_PORT_NAME}."
+	@${ECHO} "Valid values are:"
+	@${ECHO} "	Emacs  family: emacs19 mule19 emacs20"
+	@${ECHO} "	XEmacs family: xemacs19 xemacs20 xemacs21 xemacs21-mule"
+	@${FALSE}
+.endif
+
+
+#
+# Common Definitions
+#
+
+# emacsen command-line filename
+EMACS_CMD?=			${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
+
+# emacsen libdir without ${PREFIX}
+EMACS_SITE_LISPDIR?=		${EMACS_LIBDIR}/site-lisp
+EMACS_VERSION_SITE_LISPDIR?=	${EMACS_LIBDIR_WITH_VER}/site-lisp
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index ead6a8c82ebc..c14ef4c9375a 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -126,6 +126,9 @@ FreeBSD_MAINTAINER=	asami@FreeBSD.org
 #				  the system or installed from a port.
 # USE_GMAKE		- Says that the port uses gmake.
 # GMAKE			- Set to path of GNU make if not in $PATH (default: gmake).
+# USE_AUTOMAKE	- Says that the port uses automake.  Implies USE_AUTOCONF.
+# AUTOMAKE		- Set to path of GNU automake if not in $PATH (default:
+#				  automake).
 # USE_AUTOCONF	- Says that the port uses autoconf.  Implies GNU_CONFIGURE.
 # AUTOCONF		- Set to path of GNU autoconf if not in $PATH (default:
 #				  autoconf).
@@ -368,7 +371,8 @@ FreeBSD_MAINTAINER=	asami@FreeBSD.org
 #				  configure stage will not do anything if this is not set.
 # GNU_CONFIGURE	- Set if you are using GNU configure (optional).  Implies
 #				  HAS_CONFIGURE.
-# CONFIGURE_SCRIPT - Name of configure script (defaults: configure).
+# CONFIGURE_WRKSRC - Directory to run configure in (default: ${WRKSRC}).
+# CONFIGURE_SCRIPT - Name of configure script (default: configure).
 # CONFIGURE_TARGET - The name of target to call when GNU_CONFIGURE is
 #				  defined (default: ${MACHINE_ARCH}--freebsd${OSREL}).
 # CONFIGURE_ARGS - Pass these args to configure if ${HAS_CONFIGURE} is set
@@ -514,7 +518,8 @@ MASTERDIR?=	${.CURDIR}
 .if !defined(PORTNAME) || !defined(PORTVERSION) || defined(PKGNAME)
 .BEGIN:
 	@${ECHO} "${PKGNAME}: You need to define PORTNAME and PORTVERSION instead of PKGNAME."
-	@${ECHO} "(This port is too old for your bsd.port.mk.)"
+	@${ECHO} "(This port is too old for your bsd.port.mk, please update it to match"
+	@${ECHO} " your bsd.port.mk.)"
 	@${FALSE}
 .endif
 PKGNAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
@@ -600,8 +605,9 @@ PREFIX?=		${LOCALBASE}
 .BEGIN:
 	@${ECHO} "This port requires the OpenSSL library, which is part of"
 	@${ECHO} "the FreeBSD crypto distribution but not installed on your"
-	@${ECHO} "machine. Please see Chapter 6.5 in the handbook for"
-	@${ECHO} "instructions on how to obtain and install the FreeBSD"
+	@${ECHO} "machine. Please see the \"OpenSSL\" section in the handbook"
+	@${ECHO} "(at \"http://www.FreeBSD.org/handbook/openssl.html\", for instance)"
+	@${ECHO} "for instructions on how to obtain and install the FreeBSD"
 	@${ECHO} "OpenSSL distribution."
 	@${FALSE}
 .else
@@ -637,6 +643,10 @@ MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \
 RESTRICTED=		"Contains cryptography."
 .endif
 
+.if defined(EMACS_PORT_NAME)
+.include "${PORTSDIR}/Mk/bsd.emacs.mk"
+.endif
+
 .endif
 # End of pre-makefile section.
 
@@ -699,6 +709,10 @@ BUILD_DEPENDS+=		unzip:${PORTSDIR}/archivers/unzip
 .if defined(USE_GMAKE)
 BUILD_DEPENDS+=		gmake:${PORTSDIR}/devel/gmake
 .endif
+.if defined(USE_AUTOMAKE)
+USE_AUTOCONF=	yes
+BUILD_DEPENDS+=		automake:${PORTSDIR}/devel/automake
+.endif
 .if defined(USE_AUTOCONF)
 GNU_CONFIGURE=	yes
 BUILD_DEPENDS+=		autoconf:${PORTSDIR}/devel/autoconf
@@ -789,6 +803,7 @@ DO_NADA?=		/usr/bin/true
 
 # Miscellaneous overridable commands:
 GMAKE?=			gmake
+AUTOMAKE?=		automake
 AUTOCONF?=		autoconf
 LIBTOOL?=		libtool
 XMKMF?=			xmkmf -a
@@ -876,6 +891,15 @@ MTREE_FILE=	/etc/mtree/BSD.local.dist
 MTREE_CMD?=	/usr/sbin/mtree
 MTREE_ARGS?=	-U -f ${MTREE_FILE} -d -e -p
 
+.if !target(mtree-file)
+mtree-file:
+.if !defined(NO_MTREE)
+	@${ECHO} ${MTREE_FILE}
+.else
+	@${DO_NADA}
+.endif
+.endif
+
 # A few aliases for *-install targets
 INSTALL_PROGRAM= \
 	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
@@ -1202,6 +1226,7 @@ PKGBASE!=	${ECHO} ${PKGNAME} | ${SED} -e 's/-[^-]*$$//'
 .endif
 PKGLATESTFILE?=		${PKGLATESTREPOSITORY}/${PKGBASE}${PKG_SUFX}
 
+CONFIGURE_WRKSRC?=	${WRKSRC}
 CONFIGURE_SCRIPT?=	configure
 CONFIGURE_TARGET?=	${MACHINE_ARCH}--freebsd${OSREL}
 CONFIGURE_LOG?=		config.log
@@ -1566,7 +1591,7 @@ do-fetch:
 				${ECHO_MSG} ">> Please correct this problem and try again."; \
 				exit 1; \
 			fi ; \
-			if [ -f ${MD5_FILE} -a "x${FORCE_FETCH}" = "x" ]; then \
+			if [ -f ${MD5_FILE} -a "x${NO_CHECKSUM}" = "x" ]; then \
 				if ! ${GREP} -q "^MD5 (.*$$file)" ${MD5_FILE}; then \
 					${ECHO_MSG} ">> $$file is not in ${MD5_FILE}."; \
 					${ECHO_MSG} ">> Either ${MD5_FILE} is out of date, or"; \
@@ -1701,6 +1726,9 @@ do-patch:
 
 .if !target(do-configure)
 do-configure:
+.if defined(USE_AUTOMAKE)
+	@(cd ${WRKSRC} && ${AUTOMAKE})
+.endif
 .if defined(USE_AUTOCONF)
 	@(cd ${WRKSRC} && ${AUTOCONF})
 .endif
@@ -1709,7 +1737,7 @@ do-configure:
 		  ${SCRIPTDIR}/configure; \
 	fi
 .if defined(HAS_CONFIGURE)
-	@(cd ${WRKSRC} && \
+	@(cd ${CONFIGURE_WRKSRC} && \
 		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
 	    CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 	    INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
@@ -1894,9 +1922,6 @@ _PORT_USE: .USE
 		${ECHO_MSG} "You may want to become root and try again to ensure correct permissions."; \
 	fi
 .endif
-	@if [ -d ${PREFIX}/info -a ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
 .endif
 .if make(real-configure) && defined(USE_LIBTOOL)
 	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-libtool
@@ -2207,7 +2232,7 @@ fetch-list:
 
 .if !target(makesum)
 makesum:
-	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} fetch FORCE_FETCH=yes
+	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} fetch NO_CHECKSUM=yes
 	@${MKDIR} ${FILESDIR}
 	@if [ -f ${MD5_FILE} ]; then ${RM} -f ${MD5_FILE}; fi
 	@(cd ${DISTDIR}; \
@@ -2261,8 +2286,8 @@ checksum:
 		  done; \
 		  if [ "$$OK" != "true" ]; then \
 			${ECHO_MSG} "Make sure the Makefile and md5 file (${MD5_FILE})"; \
-			${ECHO_MSG} "are up to date.  If you want to override this check, type"; \
-			${ECHO_MSG} "\"make NO_CHECKSUM=yes [other args]\"."; \
+			${ECHO_MSG} "are up to date.  If you are absolutely sure you want to override this"; \
+			${ECHO_MSG} "\"check, type make NO_CHECKSUM=yes [other args]\"."; \
 			exit 1; \
 		  fi) ; \
 	fi
@@ -2300,6 +2325,11 @@ package-noinstall:
 	-@${RMDIR} ${WRKDIR}
 .endif
 
+.if !target(prefix)
+prefix:
+	@${ECHO} ${PREFIX}
+.endif
+
 ################################################################
 # Dependency checking
 ################################################################
@@ -2700,10 +2730,8 @@ generate-plist:
 	@${ECHO} '@cwd ${PREFIX}' >> ${TMPPLIST}
 .endif
 .endfor
-	@${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} | \
-	 ${SED} -e "/\@exec install-info.*$$/h" \
-		-e "s^^\@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir^g" \
-		-e "t fix" -e "b" -e ":fix" -e "G" >> ${TMPPLIST}
+	@${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}
+	@${ECHO} "@unexec if [ -f %D/info/dir ]; then if sed -e '1,/Menu:/d' %D/info/dir | grep -q '^[*] '; then true; else rm %D/info/dir; fi; fi" >> ${TMPPLIST}
 .if !defined(NO_FILTER_SHLIBS)
 .if (${PORTOBJFORMAT} == "aout")
 	@${SED} -e 's,\(/lib.*\.so\.[0-9]*\)$$,\1.0,' ${TMPPLIST} > ${TMPPLIST}.tmp
@@ -2775,7 +2803,7 @@ fake-pkg:
 			${CP} ${PKGMESSAGE} ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \
 		fi; \
 		for dep in `${MAKE} ${__softMAKEFLAGS} package-depends ECHO_MSG=/usr/bin/true | sort -u`; do \
-			if [ -d ${PKG_DBDIR}/$$dep ]; then \
+			if [ -d ${PKG_DBDIR}/$$dep -a -z `echo $$dep | ${GREP} -E ${PKG_IGNORE_DEPENDS}` ]; then \
 				if ! ${GREP} ^${PKGNAME}$$ ${PKG_DBDIR}/$$dep/+REQUIRED_BY \
 					>/dev/null 2>&1; then \
 					${ECHO} ${PKGNAME} >> ${PKG_DBDIR}/$$dep/+REQUIRED_BY; \