ports/68421: [maintainer-update] Unbreak and update x11-toolkits/gnocl

[Stephane Legrand]

>Number:         68421
>Category:       ports
>Synopsis:       [maintainer-update] Unbreak and update x11-toolkits/gnocl
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 27 14:20:15 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Stephane Legrand <stephane at freebsd.org>
>Release:        FreeBSD 4.10-BETA i386
>Organization:
>Environment:
  System: FreeBSD 4.10-BETA i386

>Description:
  Unbreak and update x11-toolkits/gnocl to 0.5.16.
  Many thanks to "Jochem Huhmann" <joh at revier.com> for his help.
  He sent me the solution to unbreak this port with gtk+-2.4 and helped me to clean my Gnome 2 installation.
	
>How-To-Repeat:
>Fix:

diff -ruN gnocl-orig/Makefile gnocl/Makefile
--- gnocl-orig/Makefile	Sun Apr 11 04:46:10 2004
+++ gnocl/Makefile	Tue Jun 15 14:03:51 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnocl
-PORTVERSION=	0.5.15
+PORTVERSION=	0.5.16
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits devel
 MASTER_SITES=	http://www.dr-baum.net/gnocl/
@@ -26,8 +26,6 @@
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
-
-BROKEN=	"Does not build with gtk+-2.4"
 
 .include <bsd.port.pre.mk>
 
diff -ruN gnocl-orig/distinfo gnocl/distinfo
--- gnocl-orig/distinfo	Fri Mar 26 19:00:48 2004
+++ gnocl/distinfo	Tue Jun 15 14:04:03 2004
@@ -1,2 +1,2 @@
-MD5 (gnocl-0.5.15.tar.bz2) = c48a8e7e9fc0bedc69b0cf254ebd99ac
-SIZE (gnocl-0.5.15.tar.bz2) = 335269
+MD5 (gnocl-0.5.16.tar.bz2) = fc54925e553a0998d96e812ec57cd843
+SIZE (gnocl-0.5.16.tar.bz2) = 341170
diff -ruN gnocl-orig/files/patch-Makefile gnocl/files/patch-Makefile
--- gnocl-orig/files/patch-Makefile	Fri Mar 26 19:00:49 2004
+++ gnocl/files/patch-Makefile	Tue Jun 15 14:06:14 2004
@@ -1,11 +1,14 @@
---- src/Makefile.orig	Fri Feb 13 18:08:35 2004
-+++ src/Makefile	Fri Feb 13 18:08:59 2004
-@@ -19,7 +19,7 @@
- export CFLAGS += -Wall -DVERSION=\"$(VERSION)\" -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DUSE_TCL_STUBS
+--- src/Makefile.orig	Tue Jun 15 14:05:05 2004
++++ src/Makefile	Tue Jun 15 14:05:49 2004
+@@ -18,9 +18,9 @@
+ # for releases use -Os, this makes the lib 15% smaller 
+ CFLAGS += -Wall 
  
- ADDCFLAGS += $(shell pkg-config --cflags gtk+-2.0)
--export TCL_VERSION := $(shell echo 'puts $$tcl_version' | tclsh)
-+export TCL_VERSION := 84
+-TCL_VERSION := $(shell echo 'puts $$tcl_version' | tclsh)
++TCL_VERSION := 84
  
- LIBS := $(shell pkg-config --libs gtk+-2.0) -ltclstub$(TCL_VERSION)
+-export ADDCFLAGS := -DVERSION=\"$(VERSION)\" -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DUSE_TCL_STUBS $(shell pkg-config --cflags gtk+-2.0) 
++export ADDCFLAGS := -DVERSION=\"$(VERSION)\" -DUSE_TCL_STUBS $(shell pkg-config --cflags gtk+-2.0) 
+ 
+ export LIBS := $(shell pkg-config --libs gtk+-2.0) -ltclstub$(TCL_VERSION)
  
>Release-Note:
>Audit-Trail:
>Unformatted: