From mezz@ns1.mezzweb.com  Mon Apr 12 15:46:02 2004
Return-Path: <mezz@ns1.mezzweb.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A15A916A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 12 Apr 2004 15:46:02 -0700 (PDT)
Received: from ns1.mezzweb.com (ip68-103-32-11.ks.ok.cox.net [68.103.32.11])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1038743D39
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 12 Apr 2004 15:46:02 -0700 (PDT)
	(envelope-from mezz@ns1.mezzweb.com)
Received: from ns1.mezzweb.com (localhost [127.0.0.1])
	by ns1.mezzweb.com (8.12.11/8.12.11) with ESMTP id i3CMI36g025168
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 12 Apr 2004 17:18:04 -0500 (CDT)
	(envelope-from mezz@ns1.mezzweb.com)
Received: (from mezz@localhost)
	by ns1.mezzweb.com (8.12.11/8.12.11/Submit) id i3CMI325025167;
	Mon, 12 Apr 2004 17:18:03 -0500 (CDT)
	(envelope-from mezz)
Message-Id: <200404122218.i3CMI325025167@ns1.mezzweb.com>
Date: Mon, 12 Apr 2004 17:18:03 -0500 (CDT)
From: Jeremy Messenger <mezz7@cox.net>
Reply-To: Jeremy Messenger <mezz7@cox.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Patch port: x11-toolkits/scintilla, change default GTK1 -> GTK2.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         65473
>Category:       ports
>Synopsis:       Patch port: x11-toolkits/scintilla, change default GTK1 -> GTK2.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 12 15:50:24 PDT 2004
>Closed-Date:    Mon Apr 12 20:14:15 PDT 2004
>Last-Modified:  Mon Apr 12 20:14:15 PDT 2004
>Originator:     Mezz
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD ns1.mezzweb.com 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Tue Mar 30
01:17:23 CST 2004 mezz@mezz.mezzweb.com:/usr/src/sys/i386/compile/BSDROCKS i386

>Description:
Change the default build with GTK2 instead GTK1. Why? 1) Because, itself in the
source is already build with GTK2 by default, so need to respect the default.
Also, GTK1 is no longer support by the GTK team. 2) I have two new ports that
need the GTK2.

I think, we will need a new slave port called scintilla-gtk1, then change the
x11-toolkits/gtkscintilla's LIB_DEPENDS. I don't have any patch or shar of
those, so if you want me to create them then just let me know.
>How-To-Repeat:
n/a

>Fix:


--- scintilla.diff begins here ---
diff -ur scintilla.orig/Makefile scintilla/Makefile
--- scintilla.orig/Makefile	Mon Apr 12 14:12:10 2004
+++ scintilla/Makefile	Mon Apr 12 17:33:20 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	scintilla
 PORTVERSION=	1.59
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
@@ -24,12 +25,12 @@
 MAKEFILE=	makefile
 INSTALLS_SHLIB=	yes
 
-.if defined(WITH_GTK2)
-USE_GNOME=	gtk20
-PKGNAMESUFFIX=	-gtk2
-.else
+.if defined(WITH_GTK1)
 USE_GNOME=	gtk12
 MAKE_ARGS=	GTK1=yes
+PKGNAMESUFFIX=	-gtk1
+.else
+USE_GNOME=	gtk20
 .endif
 
 .include <bsd.port.pre.mk>
--- scintilla.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gnome 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Apr 12 20:11:22 PDT 2004 
Responsible-Changed-Why:  
Over to maintainer(s). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65473 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Mon Apr 12 20:13:10 PDT 2004 
State-Changed-Why:  
This can't happen until all the ports that depend on scintilla are updated 
to support gtk20 by default. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65473 
>Unformatted:
