10 files changed, 289 insertions, 40 deletions

diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile
index ef201235e99f..0232843aa679 100644
--- a/x11-toolkits/gnocl/Makefile
+++ b/x11-toolkits/gnocl/Makefile
@@ -3,26 +3,28 @@
 
 PORTNAME=	gnocl
 DISTVERSION=	${BASE_VERSION}-${NIGHTLY_BUILD}
-PORTREVISION=	2
 CATEGORIES=	x11-toolkits devel
 MASTER_SITES=	SF/${PORTNAME}/Gnocl-Nightly-Build/
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	GTK+ and Gnome extension for Tcl
 
-LIB_DEPENDS=	canberra.0:${PORTSDIR}/audio/libcanberra \
-   		notify.4:${PORTSDIR}/devel/libnotify \
-		gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/license.terms
+
+LIB_DEPENDS=	canberra:${PORTSDIR}/audio/libcanberra \
+   		notify:${PORTSDIR}/devel/libnotify \
+		gtkimageview:${PORTSDIR}/x11-toolkits/gtkimageview
 
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gtk20 libglade2 pkgconfig
 USE_TCL=	84+
 USE_LDCONFIG=	yes
-CFLAGS+=	-I${TCL_INCLUDEDIR} -L${TCL_LIBDIR} `pkg-config --cflags libglade-2.0`
+CFLAGS+=	-I${TCL_INCLUDEDIR} -L${TCL_LIBDIR}
 
 BASE_VERSION=	0.9.96
-NIGHTLY_BUILD=	27-06-12
+NIGHTLY_BUILD=	31-01-13
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${BASE_VERSION}
 BUILD_WRKSRC=	${WRKSRC}/src
@@ -34,7 +36,9 @@ PLIST_FILES=	${BASEDIR}/${PORTNAME}.so \
 PLIST_DIRS=	${BASEDIR}
 
 post-patch:
-	${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|;s|$$(TCL_VERSION)|${TCL_VER:S/.//}|g;/fileFilter/d' ${BUILD_WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|; \
+	    s|%%LOCALBASE%%|${LOCALBASE}|' \
+	    ${BUILD_WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|\[info library\]|${PREFIX}/lib|; s|tclsh|${TCLSH}|g;' ${BUILD_WRKSRC}/install.tcl
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gnocl/distinfo b/x11-toolkits/gnocl/distinfo
index 15352ddf0216..10f6a97225c7 100644
--- a/x11-toolkits/gnocl/distinfo
+++ b/x11-toolkits/gnocl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnocl-0.9.96-27-06-12.tar.bz2) = 6537a0b9394f5b85f07947de27657153ce32d5cdad8f928252df76f7ccdb0e5f
-SIZE (gnocl-0.9.96-27-06-12.tar.bz2) = 1037675
+SHA256 (gnocl-0.9.96-31-01-13.tar.bz2) = a3031f8077e9e0cebf55b5b889ba725c44fcf33a144c4106140acb83ba1aa2c6
+SIZE (gnocl-0.9.96-31-01-13.tar.bz2) = 1038185
diff --git a/x11-toolkits/gnocl/files/patch-src_Makefile b/x11-toolkits/gnocl/files/patch-src_Makefile
index bdcbf28852d4..33f49f574ae7 100644
--- a/x11-toolkits/gnocl/files/patch-src_Makefile
+++ b/x11-toolkits/gnocl/files/patch-src_Makefile
@@ -1,20 +1,20 @@
---- src/Makefile.orig	2012-04-20 23:05:25.000000000 +0200
-+++ src/Makefile	2012-04-20 23:05:25.000000000 +0200
-@@ -72,6 +72,7 @@
- 	image.o \
- 	itemGroup.o \
- 	label.o \
-+	labelEntry.o \
- 	language.o \
- 	layout.o \
- 	linkButton.o \
-@@ -88,7 +89,9 @@
- 	pageSetup.o \
- 	pageSetupDialog.o \
- 	paned.o \
-+	parseMarkup.o \
- 	parseOptions.o \
-+	pbar.o \
- 	pixBuf.o \
- 	pixBufFilters.o \
- 	pixMap.o \
+--- src/Makefile.orig	2013-01-31 10:52:21.000000000 +0100
++++ src/Makefile	2013-02-01 14:35:59.000000000 +0100
+@@ -16,13 +16,12 @@
+ TCL_VERSION := $(shell echo 'puts $$tcl_version' | tclsh)
+ 
+ ADDCFLAGS := -DVERSION=\"$(VERSION)\" \
+-	-DUSE_TCL_STUBS $(shell pkg-config --cflags gtk+-2.0) \
+-	-I/usr/include/tcl$(TCL_VERSION) \
+-	-I/usr/include/libglade-2.0
++	-DUSE_TCL_STUBS $(shell pkg-config --cflags gtk+-2.0 libglade-2.0 gtk+-unix-print-2.0) \
++	-I%%LOCALBASE%%/include/tcl$(TCL_VERSION)
+ 
+ LIBS := $(shell pkg-config \
+-	--libs gtk+-2.0 libglade-2.0 libnotify) \
+-	-ltclstub$(TCL_VERSION)
++	--libs gtk+-2.0 gtk+-unix-print-2.0 libglade-2.0 libnotify) \
++	%%LOCALBASE%%/lib/libtclstub86.a
+ 
+ GTK_OBJ := \
+ 	aboutDialog.o \
diff --git a/x11-toolkits/gnocl/files/patch-src_parseMarkup.c b/x11-toolkits/gnocl/files/patch-src_parseMarkup.c
new file mode 100644
index 000000000000..6e17f33be5ab
--- /dev/null
+++ b/x11-toolkits/gnocl/files/patch-src_parseMarkup.c
@@ -0,0 +1,11 @@
+--- src/parseMarkup.c.orig	2013-02-01 12:41:08.000000000 +0100
++++ src/parseMarkup.c	2013-02-01 12:41:30.000000000 +0100
+@@ -27,6 +27,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
++static void applyTags ( GtkTextBuffer *buffer, GtkTextMark *tagStart, GtkTextMark *tagEnd );
++
+ /* list to hold names of applied tags */
+ static GSList *tagList = NULL;
+ 
diff --git a/x11-toolkits/gnocl/files/patch-src_parseOptions.c b/x11-toolkits/gnocl/files/patch-src_parseOptions.c
new file mode 100644
index 000000000000..ab6cea7b787c
--- /dev/null
+++ b/x11-toolkits/gnocl/files/patch-src_parseOptions.c
@@ -0,0 +1,20 @@
+--- src/parseOptions.c.orig	2013-02-01 12:17:16.000000000 +0100
++++ src/parseOptions.c	2013-02-01 12:18:01.000000000 +0100
+@@ -413,7 +413,7 @@
+ int gnoclOptAngle (	Tcl_Interp *interp,	GnoclOption *opt,	GObject *obj,	Tcl_Obj **ret )
+ {
+ 
+-	return ;
++	return 0;
+ 
+ 	const char *txt[] = { "up", "down", "left", "right", "none", NULL };
+ 	const int types[] = { GTK_ARROW_UP, GTK_ARROW_DOWN, GTK_ARROW_LEFT, GTK_ARROW_RIGHT, GTK_ARROW_NONE};
+@@ -443,7 +443,7 @@
+ int gnoclOptArrow ( Tcl_Interp *interp, GnoclOption *opt, GObject *obj, Tcl_Obj **ret )
+ {
+ 
+-	return ;
++	return 0;
+ 
+ 	const char *txt[] = { "up", "down", "left", "right", "none", NULL };
+ 	const int types[] = { GTK_ARROW_UP, GTK_ARROW_DOWN, GTK_ARROW_LEFT, GTK_ARROW_RIGHT, GTK_ARROW_NONE};
diff --git a/x11-toolkits/gnocl/files/patch-src_pixBuf.c b/x11-toolkits/gnocl/files/patch-src_pixBuf.c
new file mode 100644
index 000000000000..8a9637f471d4
--- /dev/null
+++ b/x11-toolkits/gnocl/files/patch-src_pixBuf.c
@@ -0,0 +1,12 @@
+--- src/pixBuf.c.orig	2013-01-31 10:52:21.000000000 +0100
++++ src/pixBuf.c	2013-02-01 14:22:55.000000000 +0100
+@@ -90,6 +90,9 @@
+ /* Key for automated pixbuf updating and destruction */
+ static const cairo_user_data_key_t pixbuf_key;
+ 
++void gdk_pixbuf_get_pixel ( GdkPixbuf * pixbuf, guint x, guint y , guchar * r, guchar * g, guchar * b, guchar * a );
++void gdk_pixbuf_set_pixel ( GdkPixbuf * pixbuf, guint32 pixel, guint x, guint y );
++
+ 
+ /**
+ \brief	This function will initialize new cairo context with contents of
diff --git a/x11-toolkits/gnocl/files/patch-src_pixBufFilters.c b/x11-toolkits/gnocl/files/patch-src_pixBufFilters.c
index a578b4fed663..f24936f6269d 100644
--- a/x11-toolkits/gnocl/files/patch-src_pixBufFilters.c
+++ b/x11-toolkits/gnocl/files/patch-src_pixBufFilters.c
@@ -1,12 +1,92 @@
---- src/pixBufFilters.c.orig	2011-07-18 09:45:14.000000000 +0200
-+++ src/pixBufFilters.c	2011-07-18 09:45:20.000000000 +0200
-@@ -14,9 +14,6 @@
- #include <string.h>
- #include <assert.h>
- 
--static guint32 convertRGBtoPixel ( gchar *clr );
--
--
- int isBlack ( GdkPixbuf *pixbuf, gint x, gint y, gint threshold )
+--- src/pixBufFilters.c.orig	2013-02-01 12:20:37.000000000 +0100
++++ src/pixBufFilters.c	2013-02-01 12:25:56.000000000 +0100
+@@ -16,6 +16,8 @@
+ 
+ #define RADS(var) var * G_PI / 180
+ 
++static void countItems ( int j, int a );
++static void filter_convolute ( GdkPixbuf *pixbuf, int matrix [3][3] );
+ 
+ typedef struct accumulator
  {
- 	guchar *pixels;
+@@ -319,7 +321,7 @@
+ 	gint p = 0;
+ 	gint r, g, b, a;
+ 
+-	g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) );
++	g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ), -1 );
+ 
+ 	/* this method prevents a deferencing error */
+ 	k = gdk_pixbuf_get_width ( pixbuf );
+@@ -384,7 +386,7 @@
+ 	gint p = 0;
+ 	gint r, g, b, a;
+ 
+-	g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) );
++	g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ) , -1 );
+ 
+ 	/* this method prevents a deferencing error */
+ 	k = gdk_pixbuf_get_width ( pixbuf );
+@@ -430,7 +432,7 @@
+ 	gint p = 0;
+ 	gint r, g, b, a;
+ 
+-	g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) );
++	g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ), -1 );
+ 
+ 	/* this method prevents a deferencing error */
+ 	k = gdk_pixbuf_get_width ( pixbuf );
+@@ -502,7 +504,7 @@
+ 	gint p = 0;
+ 	guchar r, g, b, a;
+ 
+-	g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) );
++	g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ), -1 );
+ 
+ 	/* this method prevents a deferencing error */
+ 	k = gdk_pixbuf_get_width ( pixbuf );
+@@ -559,7 +561,7 @@
+ 
+ 	g_print ( "%s 1\n", __FUNCTION__ );
+ 
+-	g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) );
++	g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ), -1 );
+ 
+ 	g_print ( "%s 2\n", __FUNCTION__ );
+ 
+@@ -629,7 +631,7 @@
+ 	gint p = 0;
+ 	gint r, g, b, a;
+ 
+-	g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) );
++	g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ), -1 );
+ 
+ 	/* this method prevents a deferencing error */
+ 	k = gdk_pixbuf_get_width ( pixbuf );
+@@ -675,7 +677,7 @@
+ 	gint p = 0;
+ 	guchar r, g, b, a;
+ 
+-	g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) );
++	g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ), -1 );
+ 
+ 	/* this method prevents a deferencing error */
+ 	k = gdk_pixbuf_get_width ( pixbuf );
+@@ -717,7 +719,7 @@
+ 	gint p = 0;
+ 	guchar r, g, b, a;
+ 
+-	g_return_if_fail ( GDK_IS_PIXBUF ( pixbuf ) );
++	g_return_val_if_fail ( GDK_IS_PIXBUF ( pixbuf ), -1 );
+ 
+ 	/* this method prevents a deferencing error */
+ 	k = gdk_pixbuf_get_width ( pixbuf );
+@@ -777,7 +779,7 @@
+ \note
+ \todo
+ **/
+-void gnoclPixBufFilters ( Tcl_Interp *interp, GdkPixbuf *pixbuf, int objc, Tcl_Obj * const objv[] )
++int gnoclPixBufFilters ( Tcl_Interp *interp, GdkPixbuf *pixbuf, int objc, Tcl_Obj * const objv[] )
+ {
+ 
+ //GdkPixbuf *pixbuf = NULL;
diff --git a/x11-toolkits/gnocl/files/patch-src_printDialog.c b/x11-toolkits/gnocl/files/patch-src_printDialog.c
new file mode 100644
index 000000000000..85e357af95a5
--- /dev/null
+++ b/x11-toolkits/gnocl/files/patch-src_printDialog.c
@@ -0,0 +1,100 @@
+--- src/printDialog.c.orig	2013-01-31 10:52:21.000000000 +0100
++++ src/printDialog.c	2013-02-01 14:25:27.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include "string.h"
+ #include <assert.h>
+ #include <gtk-unix-print-2.0/gtk/gtkprinter.h>
++#include <gtk-unix-print-2.0/gtk/gtkprintunixdialog.h>
+ 
+ /* static declarations */
+ static int gnoclOptPageSetup ( Tcl_Interp *interp, GnoclOption *opt, GObject *obj, Tcl_Obj **ret );
+@@ -63,67 +64,28 @@
+ 
+ 	GtkPrintCapabilities capability;
+ 
+-	switch  ( *opt->propName )
+-	{
+-
+-		case 'page-set':
+-			{
+-				capability = GTK_PRINT_CAPABILITY_PAGE_SET;
+-			}
+-			break;
+-		case 'copies':
+-			{
+-				capability = GTK_PRINT_CAPABILITY_COPIES;
+-			}
+-			break;
+-		case 'collate':
+-			{
+-				capability =  GTK_PRINT_CAPABILITY_COLLATE ;
+-			}
+-			break;
+-		case 'reverse':
+-			{
+-				capability =  GTK_PRINT_CAPABILITY_REVERSE ;
+-			}
+-			break;
+-		case 'scale':
+-			{
+-				capability =  GTK_PRINT_CAPABILITY_SCALE ;
+-			}
+-			break;
+-		case 'generate-pdf':
+-			{
+-				capability =  GTK_PRINT_CAPABILITY_GENERATE_PDF ;
+-			}
+-			break;
+-		case 'generate-ps':
+-			{
+-				capability =  GTK_PRINT_CAPABILITY_GENERATE_PS ;
+-			}
+-			break;
+-		case 'preview':
+-			{
+-				capability = GTK_PRINT_CAPABILITY_PREVIEW ;
+-			}
+-			break;
+-		case 'number-up':
+-			{
+-				capability =  GTK_PRINT_CAPABILITY_NUMBER_UP ;
+-			}
+-			break;
+-		case ' number-up-layout':
+-			{
+-				capability =  GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT ;
+-			}
+-			break;
+-		default:
+-			{
+-				// assert( 0 );
+-				return TCL_ERROR;
+-			}
+-
+-	}
+-
++	if ( ! strcmp ( opt->propName, "page-set" ) )
++		capability = GTK_PRINT_CAPABILITY_PAGE_SET;
++	else if ( ! strcmp ( opt->propName, "copies" ) )
++		capability = GTK_PRINT_CAPABILITY_COPIES;
++	else if ( ! strcmp ( opt->propName, "collate" ) )
++		capability =  GTK_PRINT_CAPABILITY_COLLATE;
++	else if ( ! strcmp ( opt->propName, "reverse" ) )
++		capability =  GTK_PRINT_CAPABILITY_REVERSE ;
++	else if ( ! strcmp ( opt->propName, "scale" ) )
++		capability =  GTK_PRINT_CAPABILITY_SCALE ;
++	else if ( ! strcmp ( opt->propName, "generate-pdf" ) )
++		capability =  GTK_PRINT_CAPABILITY_GENERATE_PDF ;
++	else if ( ! strcmp ( opt->propName, "generate-ps" ) )
++		capability =  GTK_PRINT_CAPABILITY_GENERATE_PS ;
++	else if ( ! strcmp ( opt->propName, "preview" ) )
++		capability = GTK_PRINT_CAPABILITY_PREVIEW ;
++	else if ( ! strcmp ( opt->propName, "number-up" ) )
++		capability =  GTK_PRINT_CAPABILITY_NUMBER_UP ;
++	else if ( ! strcmp ( opt->propName, "number-up-layout" ) )
++		capability =  GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT ;
++	else 
++		return TCL_ERROR;
+ 
+ 	GtkPrintCapabilities tmp = gtk_print_unix_dialog_get_manual_capabilities ( GTK_PRINT_UNIX_DIALOG ( obj ) );
+ 
diff --git a/x11-toolkits/gnocl/files/patch-src_splashScreen.c b/x11-toolkits/gnocl/files/patch-src_splashScreen.c
new file mode 100644
index 000000000000..96ce5c0bf525
--- /dev/null
+++ b/x11-toolkits/gnocl/files/patch-src_splashScreen.c
@@ -0,0 +1,11 @@
+--- src/splashScreen.c.orig	2013-02-01 12:39:35.000000000 +0100
++++ src/splashScreen.c	2013-02-01 12:40:09.000000000 +0100
+@@ -83,7 +83,7 @@
+ /**
+ \brief
+ **/
+-static int getParams ( int objc, Tcl_Obj * const objv[], gchar *f, gchar *c, gchar *p, gchar *w )
++static void getParams ( int objc, Tcl_Obj * const objv[], gchar *f, gchar *c, gchar *p, gchar *w )
+ {
+ 	if ( objc < 5 )
+ 	{
diff --git a/x11-toolkits/gnocl/files/patch-src_text.c b/x11-toolkits/gnocl/files/patch-src_text.c
new file mode 100644
index 000000000000..268517798ca9
--- /dev/null
+++ b/x11-toolkits/gnocl/files/patch-src_text.c
@@ -0,0 +1,11 @@
+--- src/text.c.orig	2013-02-01 12:40:27.000000000 +0100
++++ src/text.c	2013-02-01 12:40:44.000000000 +0100
+@@ -2971,8 +2971,6 @@
+ 
+ 	sprintf ( s1, "" );
+ 	sprintf ( s2, "" );
+-
+-	return TCL_OK;
+ }
+ 
+