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!

6 files changed, 14 insertions, 17 deletions

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>