From 465d85bdaea96a0db6d9b37bd5fa1ea598f1ef63 Mon Sep 17 00:00:00 2001
From: pav <pav@FreeBSD.org>
Date: Fri, 12 Dec 2003 22:55:09 +0000
Subject: - Update to 1.0.48 - Use CONFLICTS macro - Add a working MASTER_SITE

PR:		ports/60047
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org>
---
 x11-toolkits/fox10/Makefile | 16 +++++-----------
 x11-toolkits/fox10/distinfo |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'x11-toolkits/fox10')

diff --git a/x11-toolkits/fox10/Makefile b/x11-toolkits/fox10/Makefile
index b1dd473a011..34e90e0d5ce 100644
--- a/x11-toolkits/fox10/Makefile
+++ b/x11-toolkits/fox10/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	fox
-PORTVERSION=	1.0.47
+PORTVERSION=	1.0.48
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://ftp.fox-toolkit.org/pub/ \
+		ftp://ftp.uni-koeln.de/windows/xcontrib/ \
 		ftp://ftp.cfdrc.com/pub/FOX/ \
 		ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/
 
@@ -20,6 +21,8 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
+CONFLICTS=	fox-1.1.*
+
 USE_GL=		yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
@@ -142,13 +145,4 @@ pre-everything::
 .endif
 	@${ECHO_MSG}
 
-.include <bsd.port.pre.mk>
-
-##
-## Port conflict management
-##
-.if exists(${LOCALBASE}/lib/libFOX-1.1.so)
-IGNORE=	Conflict: this port is mutually exclusive with x11-toolkits/fox-devel
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/fox10/distinfo b/x11-toolkits/fox10/distinfo
index 3cbc77398f2..836623b9048 100644
--- a/x11-toolkits/fox10/distinfo
+++ b/x11-toolkits/fox10/distinfo
@@ -1 +1 @@
-MD5 (fox-1.0.47.tar.gz) = b8d3397ef2f56d4017d9119036e70720
+MD5 (fox-1.0.48.tar.gz) = 55b37dce548d650099b59a52fb7b5d06
-- 
cgit