Converted Makefiles as much as I could.

(1) Took out INSTALL_MANPAGES (not necessary anymore, porter should set NO_INSTALL_MANPAGES for not calling "make install.man") (2) Replaced most of DEPENDS with EXEC_DEPENDS and LIB_DEPENDS. These are the entries I used: EXEC_DEPENDS: unzip:${PORTSDIR}/archivers/unzip gmake:${PORTSDIR}/devel/gmake wishx:${PORTSDIR}/lang/tclX xli:${PORTSDIR}/graphics/xli gs:${PORTSDIR}/print/ghostscript gunshar:${PORTSDIR}/archivers/gshar+gunshar hfs:${PORTSDIR}/utils/hfs rman:${PORTSDIR}/utils/rman LIB_DEPENDS: tiff\\.3\\.:${PORTSDIR}/graphics/tiff jpeg\\.5\\.:${PORTSDIR}/graphics/jpeg Xpm\\.4\\.:${PORTSDIR}/graphics/xpm tcl\\.7\\.:${PORTSDIR}/lang/tcl tk\\.3\\.:${PORTSDIR}/x11/tk xview\\.1\\.:${PORTSDIR}/x11/xview-lib Xaw3d\\.:${PORTSDIR}/x11/Xaw3d mpeg\\.1\\.:${PORTSDIR}/graphics/mpeg-lib xview\\.3\\.:${PORTSDIR}/x11/xview-lib BLT\\.1\\.:${PORTSDIR}/x11/blt There are still some dependencies I can't figure out what exactly is needed. If your port still has DEPENDS in it, please check it out!
author: Satoshi Asami <asami@FreeBSD.org> 1995-02-11 13:51:48 +0000
committer: Satoshi Asami <asami@FreeBSD.org> 1995-02-11 13:51:48 +0000
commit: 86793c984d6929b0d9d6e2f283fa7a6e24ad8846 (patch)
tree: 514f831b9b79e6406f53b572ee92815f71d23bd0
parent: 9f2b60a3787262636d15fcbbb497df01fcfce1c5 (diff)
download: ports-86793c984d6929b0d9d6e2f283fa7a6e24ad8846.tar.gz
ports-86793c984d6929b0d9d6e2f283fa7a6e24ad8846.zip
48 files changed, 67 insertions, 93 deletions
diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile
index 3ddf70652633..8f7a98209487 100644
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@@ -3,12 +3,11 @@
 # Date created:         30 Sep 1994
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.2 1994/10/06 07:52:04 swallace Exp $
+# $Id: Makefile,v 1.3 1994/12/31 04:17:52 swallace Exp $
 #
 
 DISTNAME=       xcdplayer-2.2
 MASTER_SITES=	ftp://dutepp0.et.tudelft.nl/pub/Unix/Sun/
 USE_IMAKE=      yes
-INSTALL_MANPAGES=     yes
 
 .include <bsd.port.mk>
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index 16693809dfe3..7409eaae72aa 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -4,7 +4,7 @@ MASTER_SITES=   ftp://ftp.cs.uni-sb.de/pub/others/
 EXTRACT_CMD=    (cd ${WRKDIR}; gzcat | /usr/local/bin/gunshar)
 EXTRACT_ARGS=   <
 NO_WRKSUBDIR=   YES
-DEPENDS=        ${PORTSDIR}/archivers/gshar+gunshar
+EXEC_DEPENDS=   gunshar:${PORTSDIR}/archivers/gshar+gunshar
 
 pre-extract: depends
 
diff --git a/benchmarks/iozone21/Makefile b/benchmarks/iozone21/Makefile
index 16693809dfe3..7409eaae72aa 100644
--- a/benchmarks/iozone21/Makefile
+++ b/benchmarks/iozone21/Makefile
@@ -4,7 +4,7 @@ MASTER_SITES=   ftp://ftp.cs.uni-sb.de/pub/others/
 EXTRACT_CMD=    (cd ${WRKDIR}; gzcat | /usr/local/bin/gunshar)
 EXTRACT_ARGS=   <
 NO_WRKSUBDIR=   YES
-DEPENDS=        ${PORTSDIR}/archivers/gshar+gunshar
+EXEC_DEPENDS=   gunshar:${PORTSDIR}/archivers/gshar+gunshar
 
 pre-extract: depends
 
diff --git a/databases/msql/Makefile b/databases/msql/Makefile
index 662bc300a51b..cc2671a6c1a7 100644
--- a/databases/msql/Makefile
+++ b/databases/msql/Makefile
@@ -3,13 +3,12 @@
 # Date created:		?
 # Whom:			mr (original)
 #
-# $Id: Makefile,v 1.1.1.1 1995/01/14 11:01:05 jkh Exp $
+# $Id: Makefile,v 1.2 1995/01/15 05:17:22 gpalmer Exp $
 #
 
 DISTNAME=	msql-1.0
 EXTRACT_SUFX=	.tar.gz
 MASTER_SITES=		ftp://bond.edu.au/pub/Minerva/msql/
-#INSTALL_MANPAGES=	YES
 IS_INTERACTIVE=		YES
 PREFIX=		/usr/local/Minerva
 
diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile
index 662bc300a51b..cc2671a6c1a7 100644
--- a/databases/msql3/Makefile
+++ b/databases/msql3/Makefile
@@ -3,13 +3,12 @@
 # Date created:		?
 # Whom:			mr (original)
 #
-# $Id: Makefile,v 1.1.1.1 1995/01/14 11:01:05 jkh Exp $
+# $Id: Makefile,v 1.2 1995/01/15 05:17:22 gpalmer Exp $
 #
 
 DISTNAME=	msql-1.0
 EXTRACT_SUFX=	.tar.gz
 MASTER_SITES=		ftp://bond.edu.au/pub/Minerva/msql/
-#INSTALL_MANPAGES=	YES
 IS_INTERACTIVE=		YES
 PREFIX=		/usr/local/Minerva
 
diff --git a/emulators/tkhfs/Makefile b/emulators/tkhfs/Makefile
index 945e6d39538c..dfeb90b429db 100644
--- a/emulators/tkhfs/Makefile
+++ b/emulators/tkhfs/Makefile
@@ -1,5 +1,6 @@
 DISTNAME=	tkhfs
 MASTER_SITES=	ftp://ftp.obs-besancon.fr/pub/outgoing/
-DEPENDS=	${PORTSDIR}/utils/hfs ${PORTSDIR}/x11/tk
+EXEC_DEPENDS=	hfs:${PORTSDIR}/utils/hfs
+LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk
 
 .include <bsd.port.mk>
diff --git a/games/jetpack/Makefile b/games/jetpack/Makefile
index 72f3740999ec..f3912f82ff04 100644
--- a/games/jetpack/Makefile
+++ b/games/jetpack/Makefile
@@ -1,7 +1,6 @@
 DISTNAME=	jetpack
 DISTFILES=	jetpack.tar.Z
 USE_IMAKE=	yes
-INSTALL_MANPAGES= yes
 MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/
 MAKE_FLAGS=	PREFIX=${PREFIX} -f
 
diff --git a/games/oneko/Makefile b/games/oneko/Makefile
index cc3e8a5a22c1..5356f4074f0e 100644
--- a/games/oneko/Makefile
+++ b/games/oneko/Makefile
@@ -3,12 +3,11 @@
 # Date created:		5 December 1994
 # Whom:			asami
 #
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1994/12/06 01:46:30 asami Exp $
 #
 
 DISTNAME=	oneko-1.1b
 USE_IMAKE=	yes
-INSTALL_MANPAGES=	yes
 MASTER_SITES=	ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
 WRKSRC=		${WRKDIR}/oneko
 
diff --git a/games/xasteroids/Makefile b/games/xasteroids/Makefile
index 019bc405c3cc..ba9d398b2c7d 100644
--- a/games/xasteroids/Makefile
+++ b/games/xasteroids/Makefile
@@ -2,7 +2,7 @@
 # Date created:         3 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.1.1.1 1995/01/04 08:56:17 swallace Exp $
+# $Id: Makefile,v 1.2 1995/01/29 22:00:24 ats Exp $
 #
 
 DISTNAME=       xasteroids
@@ -11,7 +11,6 @@ EXTRACT_SUFX=	.sh.Z
 EXTRACT_CMD=	( cd ${WRKDIR}; zcat | sh -s )
 EXTRACT_ARGS= <
 USE_IMAKE=	yes
-INSTALL_MANPAGES= yes
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.mk>
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index f3bcd9053fdd..6174eefade01 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -7,7 +7,6 @@
 DISTNAME=	xboing2.2
 EXTRACT_SUFX=	.tar.gz
 USE_IMAKE=	yes
-INSTALL_MANPAGES=	yes
 MASTER_SITES=	ftp://ftp.icm.edu.pl/pub/X11/contrib/games/
 
 .include <bsd.port.mk>
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 32caa4ca28f4..4f4aed32bf14 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -3,12 +3,11 @@
 # Date created:         3 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.3 1994/12/31 04:17:52 swallace Exp $
+# $Id: Makefile,v 1.1.1.1 1995/01/04 08:57:32 swallace Exp $
 #
 
 DISTNAME=       xinvaders
 MASTER_SITES=	ftp://romulus.ucs.uoknor.edu/Linux/games/x11/action/
 USE_IMAKE=	yes
-INSTALL_MANPAGES= yes
 
 .include <bsd.port.mk>
diff --git a/games/xmille/Makefile b/games/xmille/Makefile
index d304a2b8fac6..72d1eeb2f679 100644
--- a/games/xmille/Makefile
+++ b/games/xmille/Makefile
@@ -3,13 +3,12 @@
 # Date created:         30 Dec 1994
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.2 1994/10/06 07:52:04 swallace Exp $
+# $Id: Makefile,v 1.1.1.1 1994/12/31 05:34:26 swallace Exp $
 #
 
 DISTNAME=       xmille
 MASTER_SITES=	ftp://gatekeeper.dec.com/.b/X11-contrib/
 USE_IMAKE=      yes
-INSTALL_MANPAGES=     yes
 EXTRACT_SUFX=   .tar.Z
 NO_WRKSUBDIR=	yes
 
diff --git a/games/xmine/Makefile b/games/xmine/Makefile
index 30daf6cce0de..58d71ac9ff2e 100644
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@@ -3,13 +3,12 @@
 # Date created:		25 December 1994
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.2 1994/12/31 04:07:40 swallace Exp $
+# $Id: Makefile,v 1.3 1995/01/21 17:27:39 ats Exp $
 #
 
 DISTNAME=	xmine-1.0.3-Xaw
 USE_IMAKE=      yes
-INSTALL_MANPAGES=     yes
 
-DEPENDS=        ${PORTSDIR}/x11/Xaw3d
+LIB_DEPENDS=        Xaw3d\\.:${PORTSDIR}/x11/Xaw3d
 
 .include <bsd.port.mk>
diff --git a/games/xminesweep/Makefile b/games/xminesweep/Makefile
index 6d56309c3d4e..d5d4aaefec49 100644
--- a/games/xminesweep/Makefile
+++ b/games/xminesweep/Makefile
@@ -7,7 +7,6 @@
 DISTNAME=	xminesweep3.0
 EXTRACT_SUFX=	.tar.Z
 USE_IMAKE=	yes
-INSTALL_MANPAGES=	yes
 MASTER_SITES=	ftp://ftp.icm.edu.pl/pub/X11/contrib/games/
 
 .include <bsd.port.mk>
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index 09b590474dfe..72b7b204fc20 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -1,7 +1,6 @@
 DISTNAME=	xmris.4.02
 USE_GMAKE=	yes
 USE_IMAKE=      yes
-INSTALL_MANPAGES=     yes
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 
 .include <bsd.port.mk>
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index 32b3184e969d..59fb5efafcde 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -2,14 +2,13 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.3 1994/12/31 04:17:52 swallace Exp $
+# $Id: Makefile,v 1.1.1.1 1995/01/03 08:48:44 swallace Exp $
 #
 
 DISTNAME=       xpipeman
 MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/
 EXTRACT_SUFX=	.tar.Z
 USE_IMAKE=	yes
-INSTALL_MANPAGES= yes
 
 .include <bsd.port.mk>
 
diff --git a/games/xrobots/Makefile b/games/xrobots/Makefile
index 295e4a9d8ba5..6ee728df8395 100644
--- a/games/xrobots/Makefile
+++ b/games/xrobots/Makefile
@@ -2,13 +2,12 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.3 1994/12/31 04:17:52 swallace Exp $
+# $Id: Makefile,v 1.1.1.1 1995/01/03 08:47:58 swallace Exp $
 #
 
 DISTNAME=       xrobots
 MASTER_SITES=	ftp://ftp.cs.orst.edu/pub/src/X11R4/contrib/games/
 USE_IMAKE=	yes
-INSTALL_MANPAGES= yes
 
 .include <bsd.port.mk>
 
diff --git a/games/xsol/Makefile b/games/xsol/Makefile
index 951627b5bd94..c9151d8c9821 100644
--- a/games/xsol/Makefile
+++ b/games/xsol/Makefile
@@ -3,13 +3,12 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.3 1994/12/31 04:17:52 swallace Exp $
+# $Id: Makefile,v 1.1.1.1 1995/01/03 08:46:26 swallace Exp $
 #
 
 DISTNAME=       xsol-new
 MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/games/
 EXTRACT_SUFX=	.tar.Z
 USE_IMAKE=      yes
-INSTALL_MANPAGES=     yes
 
 .include <bsd.port.mk>
diff --git a/graphics/mpeg_play/Makefile b/graphics/mpeg_play/Makefile
index a05cd89ade79..8edb60ecb35a 100644
--- a/graphics/mpeg_play/Makefile
+++ b/graphics/mpeg_play/Makefile
@@ -3,12 +3,11 @@
 # Date created:		17 December 1994
 # Whom:			asami
 #
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1994/12/17 11:54:26 asami Exp $
 #
 
 DISTNAME=	mpeg_play-2.0
 USE_IMAKE=	yes
-INSTALL_MANPAGES=	yes
 MASTER_SITES=	ftp://s2k-ftp.cs.berkeley.edu/pub/multimedia/mpeg/
 EXTRACT_SUFX=	.tar.Z
 NO_WRKSUBDIR=	yes
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 54cbbbd23864..df22641932e8 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -3,14 +3,14 @@
 # Date created:		?
 # Whom:			jmz (original)
 #
-# $Id: Makefile,v 1.2 1995/02/06 10:24:54 asami Exp $
+# $Id: Makefile,v 1.3 1995/02/07 01:32:21 asami Exp $
 #
 
 DISTNAME=	netpbm
 DISTFILES=	netpbm-1mar1994.tar.gz
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 USE_IMAKE=	yes
-INSTALL_MANPAGES=	yes
+
 LIB_DEPENDS=	tiff\\.3\\.:${PORTSDIR}/graphics/tiff
 
 .include <bsd.port.mk>
diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile
index 543c174b7089..b3df6f06379b 100644
--- a/graphics/xfig-devel/Makefile
+++ b/graphics/xfig-devel/Makefile
@@ -4,7 +4,7 @@
 # Whom:			asami
 # Original by:		roberto
 #
-# $Id: Makefile,v 1.3 1995/01/24 05:53:43 asami Exp $
+# $Id: Makefile,v 1.4 1995/01/28 18:29:14 asami Exp $
 #
 
 DISTNAME=	xfig.3.1.3
@@ -12,8 +12,7 @@ PKGNAME=	xfig-3.1.3
 WRKSRC=		${WRKDIR}/xfig
 MASTER_SITES=	ftp://ftp.x.org/contrib/applications/drawing_tools/xfig/ \
 	ftp://crl.dec.com/pub/X11/contrib/applications/drawing_tools/xfig/
-DEPENDS=	${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 USE_IMAKE=	yes
-INSTALL_MANPAGES=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 543c174b7089..b3df6f06379b 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -4,7 +4,7 @@
 # Whom:			asami
 # Original by:		roberto
 #
-# $Id: Makefile,v 1.3 1995/01/24 05:53:43 asami Exp $
+# $Id: Makefile,v 1.4 1995/01/28 18:29:14 asami Exp $
 #
 
 DISTNAME=	xfig.3.1.3
@@ -12,8 +12,7 @@ PKGNAME=	xfig-3.1.3
 WRKSRC=		${WRKDIR}/xfig
 MASTER_SITES=	ftp://ftp.x.org/contrib/applications/drawing_tools/xfig/ \
 	ftp://crl.dec.com/pub/X11/contrib/applications/drawing_tools/xfig/
-DEPENDS=	${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 USE_IMAKE=	yes
-INSTALL_MANPAGES=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 9676472b3e59..36929f7f326a 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -3,15 +3,15 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.2 1995/01/03 00:00:27 swallace Exp $
+# $Id: Makefile,v 1.3 1995/01/13 13:14:24 jkh Exp $
 #
 
 DISTNAME=       xpaint-2.1.1
 MASTER_SITES=	ftp://romulus.ucs.uoknor.edu/X/R5contrib/
-DEPENDS=	${PORTSDIR}/graphics/jpeg ${PORTSDIR}/graphics/tiff \
-		${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	jpeg\\.5\\.:${PORTSDIR}/graphics/jpeg \
+		tiff\\.3\\.:${PORTSDIR}/graphics/tiff \
+		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 USE_IMAKE=      yes
-INSTALL_MANPAGES=     yes
 WRKSRC=		${.CURDIR}/work/xpaint
 
 .include <bsd.port.mk>
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index c875a421b177..55dd2703088c 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -3,13 +3,13 @@
 # Date created:		30 October 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.3 1995/01/13 13:14:30 jkh Exp $
+# $Id: Makefile,v 1.4 1995/02/07 07:40:10 gpalmer Exp $
 #
 
 DISTNAME=	xv-3.10a
 USE_IMAKE=	yes
 MASTER_SITES=	ftp://ftp.cis.upenn.edu/pub/xv/
-DEPENDS=	${PORTSDIR}/graphics/jpeg ${PORTSDIR}/graphics/tiff
-INSTALL_MANPAGES=	yes
+LIB_DEPENDS=	jpeg\\.5\\.:${PORTSDIR}/graphics/jpeg \
+		tiff\\.3\\.:${PORTSDIR}/graphics/tiff
 
 .include <bsd.port.mk>
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index 2353caa58856..048021358826 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -3,13 +3,11 @@
 # Date created:		18 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.0 1994/11/18 00:00:00 asami Exp $
+# $Id: Makefile,v 1.4 1995/01/25 03:40:43 asami Exp $
 #
 
 DISTNAME=	kterm-6.1.0
 USE_IMAKE=	yes
 MASTER_SITES=	ftp://freefall.cdrom.com/pub/FreeBSD/LOCAL_PORTS/
-INSTALL_MANPAGES=	yes
-PKG_CMD=	pkg_create -N
 
 .include <bsd.port.mk>
diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile
index 2353caa58856..048021358826 100644
--- a/japanese/kterm16c/Makefile
+++ b/japanese/kterm16c/Makefile
@@ -3,13 +3,11 @@
 # Date created:		18 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.0 1994/11/18 00:00:00 asami Exp $
+# $Id: Makefile,v 1.4 1995/01/25 03:40:43 asami Exp $
 #
 
 DISTNAME=	kterm-6.1.0
 USE_IMAKE=	yes
 MASTER_SITES=	ftp://freefall.cdrom.com/pub/FreeBSD/LOCAL_PORTS/
-INSTALL_MANPAGES=	yes
-PKG_CMD=	pkg_create -N
 
 .include <bsd.port.mk>
diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index 54c344eb6c63..7b46a6500bae 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -3,7 +3,7 @@
 # Date created:		20 November 1994
 # Whom:			pst
 #
-# $Id: Makefile,v 1.1.1.1 1994/11/15 20:44:51 pst Exp $
+# $Id: Makefile,v 1.2 1995/01/05 03:13:03 jkh Exp $
 #
 
 DISTNAME=	expect-5.13
@@ -12,6 +12,7 @@ DISTFILES=	expect.tar.gz
 HAS_CONFIGURE=	yes
 GNU_CONFIGURE=	yes
 
-DEPENDS=	${PORTSDIR}/lang/tcl ${PORTSDIR}/x11/tk
+LIB_DEPENDS=	tcl\\.7\\.:${PORTSDIR}/lang/tcl \
+		tk\\.3\\.:${PORTSDIR}/x11/tk
 
 .include <bsd.port.mk>
diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index e80b5d37a6a0..cefa698c049a 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -3,13 +3,14 @@
 # Date created:		Mon Oct  3 22:06:21 EDT 1994
 # Whom:			rww
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/06 01:29:34 jkh Exp $
+# $Id: Makefile,v 1.2 1994/11/08 22:50:08 jkh Exp $
 #
 
 DISTNAME=	itcl-1.5
 HAS_CONFIGURE=	yes
 MASTER_SITES=	ftp://ftp.aud.alcatel.com/tcl/extensions/
 PATCH_STRIP=	-p1
-DEPENDS=	${PORTSDIR}/lang/tcl ${PORTSDIR}/x11/tk
+LIB_DEPENDS=	tcl\\.7\\.:${PORTSDIR}/lang/tcl \
+		tk\\.3\\.:${PORTSDIR}/x11/tk
 
 .include <bsd.port.mk>
diff --git a/math/hexcalc/Makefile b/math/hexcalc/Makefile
index 17abf785ce4c..72f17365694b 100644
--- a/math/hexcalc/Makefile
+++ b/math/hexcalc/Makefile
@@ -3,12 +3,11 @@
 # Date created:		5 December 1994
 # Whom:			asami
 #
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1994/12/06 11:55:00 asami Exp $
 #
 
 DISTNAME=	hexcalc
 USE_IMAKE=	yes
-INSTALL_MANPAGES=	yes
 MASTER_SITES=	ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
 
 .include <bsd.port.mk>
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index fb7dc73452c2..2a34b3cce733 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -3,13 +3,13 @@
 # Date created:		13 October 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/13 00:50:38 wollman Exp $
+# $Id: Makefile,v 1.1.1.1 1994/10/14 01:37:11 wollman Exp $
 #
 
 DISTNAME=	imm-3.3
 DISTFILES=	imm-3.3-src.tar.Z
 MASTER_SITES=	ftp://ftp.ucs.ed.ac.uk/pub/videoconference/imm/
 WRKSRC=		${WRKDIR}/src
-DEPENDS=	${PORTSDIR}/x11/tk
+LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk
 
 .include <bsd.port.mk>
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index a0b3a554a783..dfebbf4738ee 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -3,13 +3,13 @@
 # Date created:		14 December 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/13 00:50:38 wollman Exp $
+# $Id: Makefile,v 1.1.1.1 1994/12/14 23:01:26 wollman Exp $
 #
 
 DISTNAME=	vic-2.6
 DISTFILES=	vicsrc-2.6.tar.Z
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/conferencing/vic/
-DEPENDS=	${PORTSDIR}/x11/blt
+LIB_DEPENDS=	BLT\\.1\\.:${PORTSDIR}/x11/blt
 HAS_CONFIGURE=	yes
 INSTALL_TARGET=	MANDIR=${PREFIX}/man/manl install
 
diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index d47d844e82b3..01e85ab55490 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -6,7 +6,8 @@
 
 DISTNAME=	tkman
 MASTER_SITES=	ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/
-DEPENDS=	${PORTSDIR}/x11/tk ${PORTSDIR}/utils/rman
+LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk
+EXEC_DEPENDS=	rman:${PORTSDIR}/utils/rman
 EXTRACT_SUFX=	.tar.Z
 WRKSRC=		${WRKDIR}/tkman-1.6
 
diff --git a/multimedia/mpeg_play/Makefile b/multimedia/mpeg_play/Makefile
index a05cd89ade79..8edb60ecb35a 100644
--- a/multimedia/mpeg_play/Makefile
+++ b/multimedia/mpeg_play/Makefile
@@ -3,12 +3,11 @@
 # Date created:		17 December 1994
 # Whom:			asami
 #
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1994/12/17 11:54:26 asami Exp $
 #
 
 DISTNAME=	mpeg_play-2.0
 USE_IMAKE=	yes
-INSTALL_MANPAGES=	yes
 MASTER_SITES=	ftp://s2k-ftp.cs.berkeley.edu/pub/multimedia/mpeg/
 EXTRACT_SUFX=	.tar.Z
 NO_WRKSUBDIR=	yes
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile
index a0b3a554a783..dfebbf4738ee 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -3,13 +3,13 @@
 # Date created:		14 December 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/13 00:50:38 wollman Exp $
+# $Id: Makefile,v 1.1.1.1 1994/12/14 23:01:26 wollman Exp $
 #
 
 DISTNAME=	vic-2.6
 DISTFILES=	vicsrc-2.6.tar.Z
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/conferencing/vic/
-DEPENDS=	${PORTSDIR}/x11/blt
+LIB_DEPENDS=	BLT\\.1\\.:${PORTSDIR}/x11/blt
 HAS_CONFIGURE=	yes
 INSTALL_TARGET=	MANDIR=${PREFIX}/man/manl install
 
diff --git a/net/imm/Makefile b/net/imm/Makefile
index fb7dc73452c2..2a34b3cce733 100644
--- a/net/imm/Makefile
+++ b/net/imm/Makefile
@@ -3,13 +3,13 @@
 # Date created:		13 October 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/13 00:50:38 wollman Exp $
+# $Id: Makefile,v 1.1.1.1 1994/10/14 01:37:11 wollman Exp $
 #
 
 DISTNAME=	imm-3.3
 DISTFILES=	imm-3.3-src.tar.Z
 MASTER_SITES=	ftp://ftp.ucs.ed.ac.uk/pub/videoconference/imm/
 WRKSRC=		${WRKDIR}/src
-DEPENDS=	${PORTSDIR}/x11/tk
+LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk
 
 .include <bsd.port.mk>
diff --git a/print/ghostview/Makefile b/print/ghostview/Makefile
index f33d671ba07b..633a448d47bb 100644
--- a/print/ghostview/Makefile
+++ b/print/ghostview/Makefile
@@ -3,12 +3,12 @@
 # Date created:		21 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.6 1994/10/06 01:31:54 jkh Exp $
+# $Id: Makefile,v 1.1.1.1 1994/10/22 05:42:22 jkh Exp $
 #
 
 DISTNAME=	ghostview-1.5
 USE_IMAKE=	yes
 MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
-DEPENDS=	${PORTSDIR}/print/ghostscript
+EXEC_DEPENDS=	gs:${PORTSDIR}/print/ghostscript
 
 .include <bsd.port.mk>
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 353f9a26eba1..9d84c66a945d 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -3,7 +3,7 @@
 # Date created:		?
 # Whom:			mr (original)
 #
-# $Id: Makefile,v 1.3 1995/01/24 19:23:04 asami Exp $
+# $Id: Makefile,v 1.4 1995/01/28 18:36:35 asami Exp $
 #
 
 DISTNAME=	transfig.3.1.1
@@ -11,7 +11,6 @@ PKGNAME=	transfig-3.1.1
 MASTER_SITES=	ftp://ftp.x.org/contrib/applications/drawing_tools/transfig/ \
 	ftp://crl.dec.com/pub/X11/contrib/applications/drawing_tools/transfig/
 USE_IMAKE=	yes
-INSTALL_MANPAGES=	yes
 WRKSRC=		${WRKDIR}/transfig
 
 .include <bsd.port.mk>
diff --git a/sysutils/xsysstats/Makefile b/sysutils/xsysstats/Makefile
index 33dc6b4cf133..11ebab756450 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -3,12 +3,11 @@
 # Date created:		12 December 1994
 # Whom:			asami
 #
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1994/12/13 09:07:02 asami Exp $
 #
 
 DISTNAME=	xsysstats1.32
 USE_IMAKE=	yes
-INSTALL_MANPAGES=	yes
 MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/utilities/
 
 .include <bsd.port.mk>
diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index 8adeb05c5525..b9b83bd686ba 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -3,12 +3,11 @@
 # Date created:		26 December 1994
 # Whom:			asami
 #
-# $Id:$
+# $Id: Makefile,v 1.3 1994/12/27 10:43:55 asami Exp $
 #
 
 DISTNAME=	chimera-1.63
 USE_IMAKE=	yes
 MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera/
-INSTALL_MANPAGES=	yes
 
 .include <bsd.port.mk>
diff --git a/www/chimera2/Makefile b/www/chimera2/Makefile
index 8adeb05c5525..b9b83bd686ba 100644
--- a/www/chimera2/Makefile
+++ b/www/chimera2/Makefile
@@ -3,12 +3,11 @@
 # Date created:		26 December 1994
 # Whom:			asami
 #
-# $Id:$
+# $Id: Makefile,v 1.3 1994/12/27 10:43:55 asami Exp $
 #
 
 DISTNAME=	chimera-1.63
 USE_IMAKE=	yes
 MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera/
-INSTALL_MANPAGES=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-fm/xfm/Makefile b/x11-fm/xfm/Makefile
index 120ea2253559..6d38e2238789 100644
--- a/x11-fm/xfm/Makefile
+++ b/x11-fm/xfm/Makefile
@@ -3,13 +3,13 @@
 # Date created:		28 December 1994
 # Whom:			jc@irbs.com John Capo
 #
-# $Id: Makefile,v 1.1.1.1 1995/01/04 07:50:35 jkh Exp $
+# $Id: Makefile,v 1.2 1995/01/13 12:49:39 jkh Exp $
 #
 
 DISTNAME=	xfm-1.3
 DISTFILES=	xfm-1.3.tar.gz
 USE_IMAKE=	yes
 MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/applications/
-DEPENDS=       ${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 8409746ab259..28a7c4fcd833 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -3,13 +3,13 @@
 # Date created:		14 December 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/13 00:50:38 wollman Exp $
+# $Id: Makefile,v 1.1.1.1 1994/12/14 21:21:35 wollman Exp $
 #
 
 DISTNAME=	blt-1.7
 DISTFILES=	BLT-1.7.tar.gz
 MASTER_SITES=	ftp://ftp.aud.alcatel.com/tcl/extensions/
-DEPENDS=	${PORTSDIR}/x11/tk
+LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk
 GNU_CONFIGURE=	yes
 ALL_TARGET=	all sharedlib
 
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index 23a90fa338d8..8944a6ef4a31 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 November 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1994/12/12 04:30:29 gpalmer Exp $
+# $Id: Makefile,v 1.4 1995/01/13 12:48:46 jkh Exp $
 #
 
 DISTNAME=	ctwm-3.2p1
@@ -11,7 +11,7 @@ MASTER_SITES=	ftp://ftp.x.org/contrib/window_managers/
 USE_IMAKE=	YES
 EXTRACT_SUFX=	.tar.Z
 .if !exists(/usr/X11R6/lib/libXpm.a)
-DEPENDS=	${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile
index ffd208d03047..d319ec8454d3 100644
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.10 1994/11/18 04:46:15 jkh Exp $
+# $Id: Makefile,v 1.11 1995/01/13 13:17:41 jkh Exp $
 #
 
 DISTNAME=	fvwm
@@ -12,7 +12,7 @@ DISTFILES=	fvwm-core.tar.gz fvwm-modules.tar.gz \
 		fvwm-icons.tar.gz
 MASTER_SITES=	ftp://spcot.sanders.com/pub/fvwm/
 USE_IMAKE=	yes
-DEPENDS=	${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 PKG_ARGS=	-v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PKGDIR}/PLIST \
 		-r ${PKGDIR}/REQUIRES -p ${PREFIX}
 
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index 1ca19a0f6024..7a0f6e453eac 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tar.Z
 DISTFILES=	olvwm4.tar.Z olvwm4.Patch01.Z
 EXTRACT_ONLY=	olvwm4.tar.Z
 NO_WRKSUBDIR=	yes
-DEPENDS=	${PORTSDIR}/x11/xview-lib
+LIB_DEPENDS=	xview\\.3\\.:${PORTSDIR}/x11/xview-lib
 
 pre-configure:
 	@echo "Applying olvwm4 Patch01"
diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index 3420951ad0fd..dbcdb7cfcc80 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		24 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.4 1995/01/05 05:54:47 asami Exp $
+# $Id: Makefile,v 1.5 1995/01/13 12:49:18 jkh Exp $
 #
 
 DISTNAME=	piewm
@@ -11,7 +11,7 @@ USE_IMAKE=	yes
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.tar.Z
 PKG_CMD=	pkg_create -N
-DEPENDS=        ${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 # piewm.tar.Z includes and old version of xpm, and also a bunch of .o
 #  files plus an executable
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 4d44a2007a88..6d1711c3b301 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -7,7 +7,6 @@
 DISTNAME=	x3270-3.0.3
 DISTFILES=	x3270-3.0.3.4.tar.gz
 USE_IMAKE=	yes
-INSTALL_MANPAGES=	yes
 MASTER_SITES=	ftp://ftp.icm.edu.pl/pub/X11/contrib/applications/x3270/
 
 .include <bsd.port.mk>
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index d8561930eeb0..30f686e2e7da 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -2,7 +2,6 @@ DISTNAME=	xloadimage
 DISTFILES=	xloadimage.3.03.tar.Z
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
-INSTALL_MANPAGES=	yes
 MASTER_SITES=	ftp://gatekeeper.dec.com/pub/X11-contrib/
author	Satoshi Asami <asami@FreeBSD.org>	1995-02-11 13:51:48 +0000
committer	Satoshi Asami <asami@FreeBSD.org>	1995-02-11 13:51:48 +0000
commit	86793c984d6929b0d9d6e2f283fa7a6e24ad8846 (patch)
tree	514f831b9b79e6406f53b572ee92815f71d23bd0
parent	9f2b60a3787262636d15fcbbb497df01fcfce1c5 (diff)
download	ports-86793c984d6929b0d9d6e2f283fa7a6e24ad8846.tar.gz ports-86793c984d6929b0d9d6e2f283fa7a6e24ad8846.zip