ports/59585: Update: bluefish fix build with new gcc and add conflicts

[Koop Mast]

>Number:         59585
>Category:       ports
>Synopsis:       Update: bluefish fix build with new gcc and add conflicts
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 22 06:40:15 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Koop Mast
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD prisma.rainbow-runner.nl 5.1-CURRENT FreeBSD 5.1-CURRENT #5: Sat Oct 11 05:31:30 CEST 2003 root at prisma.rainbow-runner.nl:/usr/obj/usr/src/sys/RainBow i386


	
>Description:
	Fix the build of bluefish, build failure noticed by bento.
	Add the a conflict line to the makefile of bluefish and bluefish-devel.
	
>How-To-Repeat:
	
>Fix:

	

--- bluefish-conflicts.diff begins here ---
diff -ruN bluefish.orig/Makefile bluefish/Makefile
--- bluefish.orig/Makefile	Thu Nov 20 16:06:10 2003
+++ bluefish/Makefile	Sat Nov 22 15:22:08 2003
@@ -7,7 +7,7 @@
 
 PORTNAME=	bluefish
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www editors
 MASTER_SITES=	http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/ \
 		ftp://bluefish.advancecreations.com/pub/bluefish/downloads/ \
@@ -19,6 +19,8 @@
 COMMENT=	HTML editor designed for the experienced web designer
 
 RUN_DEPENDS=	weblint:${PORTSDIR}/www/weblint
+
+CONFLICTS=	bluefish-*
 
 USE_GMAKE=	yes
 USE_BZIP2=	yes
diff -ruN bluefish.orig/files/patch-src_parsedtd.h bluefish/files/patch-src_parsedtd.h
--- bluefish.orig/files/patch-src_parsedtd.h	Thu Jan  1 01:00:00 1970
+++ bluefish/files/patch-src_parsedtd.h	Sat Nov 22 15:00:35 2003
@@ -0,0 +1,15 @@
+--- src/parsedtd.h.orig	Sat Nov 17 15:32:46 2001
++++ src/parsedtd.h	Sat Nov 22 14:58:35 2003
+@@ -135,10 +135,8 @@
+ #define DTD_HTML_4_01T "!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\""
+ #define DTD_XHTML_1_0 "!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0//EN\""
+ #define DTD_XHTML_1_0S "!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"DTD/xhtml1-strict.dtd\""
+-#define DTD_XHTML_1_0F "!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\"
+-\"DTD/xhtml1-frameset.dtd\""
+-#define DTD_XHTML_1_0T "!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"
+-\"DTD/xhtml1-transitional.dtd\""
++#define DTD_XHTML_1_0F "!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\" \"DTD/xhtml1-frameset.dtd\""
++#define DTD_XHTML_1_0T "!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"DTD/xhtml1-transitional.dtd\""
+ #define DTD_XHTML_1_1 "!DOCTYPE html PUBLIC \"-//IETF//DTD XHTML 1.1//EN\""
+ 
+ extern SGML_doctype HTML_doctypes[];
diff -ruN bluefish-devel.orig/Makefile bluefish-devel/Makefile
--- bluefish-devel.orig/Makefile	Mon Nov 17 13:29:05 2003
+++ bluefish-devel/Makefile	Sat Nov 22 15:21:50 2003
@@ -18,6 +18,8 @@
 MAINTAINER=	einekoai at chello.nl
 COMMENT=	HTML editor designed for the experienced web designer
 
+CONFLICTS=	bluefish-*
+
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
 		aspell.15:${PORTSDIR}/textproc/aspell
 RUN_DEPENDS=	weblint:${PORTSDIR}/www/weblint
--- bluefish-conflicts.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: