4 files changed, 51 insertions, 8 deletions

diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile
index 8be75e2f1d51..6d0c076b6953 100644
--- a/x11-toolkits/gnocl/Makefile
+++ b/x11-toolkits/gnocl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnocl
-PORTVERSION=	0.5.12
+PORTVERSION=	0.5.15
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel
 MASTER_SITES=	http://www.dr-baum.net/gnocl/
@@ -18,13 +18,14 @@ BUILD_DEPENDS=	${LOCALBASE}/include/tcl8.4/tcl.h:${PORTSDIR}/lang/tcl84
 
 USE_GMAKE=	yes
 USE_BZIP2=	yes
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/src
 CFLAGS+=	-I${LOCALBASE}/include/tcl8.4
 
 USE_X_PREFIX=	yes
-USE_GNOME=	libgnomecanvas gconf2
+USE_GNOME=	gtk20
 
 .include <bsd.port.pre.mk>
 
@@ -33,24 +34,52 @@ CFLAGS+=	-fPIC
 .endif
 
 GNOCL_CANVAS_FILE="lib/libgnoclCanvas.so.1"
+GNOCL_GCONF_FILE="lib/libgnoclGconf.so.1"
+GNOCL_GNOME_FILE="lib/libgnoclGnome.so.1"
 
 .if defined(WITHOUT_CANVAS)
-ALL_TARGET=	gnocl
-USE_GNOME=	gtk20 gconf2
 GNOCL_CANVAS_FILE=	"@comment "
+.else
+USE_GNOME+=	libgnomecanvas
 .endif
 
-.if defined(WITH_GNOME)
-GNOCL_USE_GNOME:=1
-USE_GNOME+=	libgnomeui
+.if defined(WITHOUT_GCONF)
+GNOCL_GCONF_FILE=	"@comment "
+.else
+USE_GNOME+=	gconf2
+.endif
+
+.if defined(WITHOUT_GNOME)
+GNOCL_GNOME_FILE=	"@comment "
+.else
+USE_GNOME+=	libgnomeui gnomepanel
 .endif
 
 PLIST_SUB+=	GNOCL_CANVAS_FILE=${GNOCL_CANVAS_FILE}
+PLIST_SUB+=	GNOCL_GCONF_FILE=${GNOCL_GCONF_FILE}
+PLIST_SUB+=	GNOCL_GNOME_FILE=${GNOCL_GNOME_FILE}
+
+post-patch:
+.if defined(WITHOUT_CANVAS)
+	${REINPLACE_CMD} -e 's=^USE_CANVAS=#USE_CANVAS=' ${BUILD_WRKSRC}/Makefile
+.endif
+.if defined(WITHOUT_GCONF)
+	${REINPLACE_CMD} -e 's=^USE_GCONF=#USE_GCONF=' ${BUILD_WRKSRC}/Makefile
+.endif
+.if defined(WITHOUT_GNOME)
+	${REINPLACE_CMD} -e 's=^USE_GNOME=#USE_GNOME=' ${BUILD_WRKSRC}/Makefile
+.endif
 
 do-install:
 	${INSTALL_DATA} ${BUILD_WRKSRC}/gnocl.so ${PREFIX}/lib/libgnocl.so.1
 	if ${TEST} -f ${BUILD_WRKSRC}/gnoclCanvas.so; then \
 		${INSTALL_DATA} ${BUILD_WRKSRC}/gnoclCanvas.so ${PREFIX}/lib/libgnoclCanvas.so.1; \
 	fi; \
+	if ${TEST} -f ${BUILD_WRKSRC}/gnoclGconf.so; then \
+		${INSTALL_DATA} ${BUILD_WRKSRC}/gnoclGconf.so ${PREFIX}/lib/libgnoclGconf.so.1; \
+	fi; \
+	if ${TEST} -f ${BUILD_WRKSRC}/gnoclGnome.so; then \
+		${INSTALL_DATA} ${BUILD_WRKSRC}/gnoclGnome.so ${PREFIX}/lib/libgnoclGnome.so.1; \
+	fi; \
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/gnocl/distinfo b/x11-toolkits/gnocl/distinfo
index 92105677af6d..4d9219bf8bfe 100644
--- a/x11-toolkits/gnocl/distinfo
+++ b/x11-toolkits/gnocl/distinfo
@@ -1 +1,2 @@
-MD5 (gnocl-0.5.12.tar.bz2) = 2d9894ff9ee3c23fdf89594fb7fc7d18
+MD5 (gnocl-0.5.15.tar.bz2) = c48a8e7e9fc0bedc69b0cf254ebd99ac
+SIZE (gnocl-0.5.15.tar.bz2) = 335269
diff --git a/x11-toolkits/gnocl/files/patch-Makefile b/x11-toolkits/gnocl/files/patch-Makefile
new file mode 100644
index 000000000000..01eb1244cb76
--- /dev/null
+++ b/x11-toolkits/gnocl/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- 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
+ 
+ ADDCFLAGS += $(shell pkg-config --cflags gtk+-2.0)
+-export TCL_VERSION := $(shell echo 'puts $$tcl_version' | tclsh)
++export TCL_VERSION := 84
+ 
+ LIBS := $(shell pkg-config --libs gtk+-2.0) -ltclstub$(TCL_VERSION)
+ 
diff --git a/x11-toolkits/gnocl/pkg-plist b/x11-toolkits/gnocl/pkg-plist
index 8bad19df9b9e..16976eb287d2 100644
--- a/x11-toolkits/gnocl/pkg-plist
+++ b/x11-toolkits/gnocl/pkg-plist
@@ -1,2 +1,4 @@
 lib/libgnocl.so.1
 %%GNOCL_CANVAS_FILE%%
+%%GNOCL_GCONF_FILE%%
+%%GNOCL_GNOME_FILE%%