--- mk/bsd.pkg.mk.orig	Mon Sep  2 15:33:28 2002
+++ mk/bsd.pkg.mk	Wed Sep  4 02:01:50 2002
@@ -2211,6 +2211,24 @@
 	@# depending on it somewhere earlier), as the
 	@# pre/do/post-install aren't run then yet:
 	@${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} ${PLIST}
+.if !defined(NO_MENU) && (defined(MENU) || exists(${PKGDIR}/MENU))
+	${TEST} -d ${MENU_CONF_DIR} || ${MKDIR} ${MENU_CONF_DIR}
+.if defined(MENU)
+	${ECHO} "@menu ${MENU}" >> ${PLIST}.menutmp
+	${ECHO} ${MENU} >> ${MENU_CONF_DIR}/${PKGNAME}
+.endif
+.if exists(${PKGDIR}/MENU)
+	${TEST} -f ${PKGDIR}/MENU && ${CAT} ${PKGDIR}/MENU | \
+	${SED} s,\$${PREFIX},${PREFIX},g | \
+	while read menuline ; do \
+		${ECHO} "@menu $$menuline" >> ${PLIST}.menutmp; \
+		${ECHO} "$$menuline" >> ${MENU_CONF_DIR}/${PKGNAME}; \
+	done
+.endif
+	${CAT} ${PLIST}.menutmp ${PLIST} >${PLIST}.tmp 
+	${MV} ${PLIST}.tmp ${PLIST}
+	${RM} ${PLIST}.menutmp
+.endif # !NO_MENU
 	${_PKG_SILENT}${_PKG_DEBUG}newmanpages=`${EGREP} -h		\
 		'^([^@/]*/)*man/([^/]*/)?(man[1-9ln]/.*\.[1-9ln]|cat[1-9ln]/.*\.0)(\.gz)?$$' \
 		${PLIST} 2>/dev/null || ${TRUE}`;			\