From cb60d32d8ced82a84a2996caf6acd7601fdceed0 Mon Sep 17 00:00:00 2001
From: Satoshi Asami <asami@FreeBSD.org>
Date: Tue, 16 Jan 2001 09:25:16 +0000
Subject: (1) Add PKGORIGIN support.  Bump BSDPORTMKVERSION to reflect it.
 Submitted by:	sobomax

(2) Add new variable NO_OPENMOTIF that will disable dependency to
    open-motif (when USE_MOTIF is defined, of course).  Use this if
    you want to make sure your commercial Motif won't get wiped out.
Submitted by:	obrien

(3) Add NOPORTDOCS support to PLIST_SUB.  When NOPORTDOCS is defined,
    PORTDOCS="@comment " will be added to PLIST_SUB.
Prodded by:	steve
---
 Mk/bsd.port.mk | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'Mk/bsd.port.mk')

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index f632b6ba1e70..9dafe6c72f5f 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -739,6 +739,12 @@ INSTALL_WRKSRC?=${WRKSRC}
 
 PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
 
+.if defined(NOPORTDOCS)
+PLIST_SUB+=	        PORTDOCS="@comment "
+.else
+PLIST_SUB+=	        PORTDOCS=""
+.endif
+
 CONFIGURE_ENV+=	PORTOBJFORMAT=${PORTOBJFORMAT}
 SCRIPTS_ENV+=	PORTOBJFORMAT=${PORTOBJFORMAT}
 MAKE_ENV+=		PORTOBJFORMAT=${PORTOBJFORMAT}
@@ -810,8 +816,10 @@ RUN_DEPENDS+=	${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base
 
 .if defined(USE_MOTIF)
 USE_XPM=			yes
+.if !defined(NO_OPENMOTIF)
 LIB_DEPENDS+=		Xm.2:${PORTSDIR}/x11-toolkits/open-motif
 .endif
+.endif
 
 .if defined(USE_FREETYPE)
 LIB_DEPENDS+=			ttf.4:${PORTSDIR}/print/freetype
@@ -1046,6 +1054,15 @@ PKGMESSAGE?=	${PKGDIR}/pkg-message
 
 TMPPLIST?=	${WRKDIR}/.PLIST.mktmp
 
+.if ${OSVERSION} >= 400000
+.for _CATEGORY in ${CATEGORIES}
+PKGCATEGORY?=	${_CATEGORY}
+.endfor
+_PORTDIRNAME!=	${BASENAME} ${.CURDIR}
+PORTDIRNAME?=	${_PORTDIRNAME}
+PKGORIGIN?=		${PKGCATEGORY}/${PORTDIRNAME}
+.endif
+
 PKG_CMD?=		/usr/sbin/pkg_create
 PKG_DELETE?=	/usr/sbin/pkg_delete
 PKG_INFO?=		/usr/sbin/pkg_info
@@ -1066,6 +1083,9 @@ PKG_ARGS+=		-D ${PKGMESSAGE}
 .if !defined(NO_MTREE)
 PKG_ARGS+=		-m ${MTREE_FILE}
 .endif
+.if defined(PKGORIGIN)
+PKG_ARGS+=		-o ${PKGORIGIN}
+.endif
 .endif
 .if defined(PKG_NOCOMPRESS)
 PKG_SUFX?=		.tar
@@ -1382,7 +1402,7 @@ LDCONFIG_RUNLIST!=	${ECHO} ${LDCONFIG_PLIST} | ${SED} -e "s!%D!${PREFIX}!"
 
 .if ${OSVERSION} >= 300000
 # You need an upgrade kit or make world newer than this
-BSDPORTMKVERSION=	20000201
+BSDPORTMKVERSION=	20001103
 .if exists(/var/db/port.mkversion)
 VERSIONFILE=	/var/db/port.mkversion
 .else
-- 
cgit v1.2.3