- Update to 0.9.94

- Unbreak on sparc64 and (possibly) ia64

4 files changed, 182 insertions, 161 deletions

diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile
index 1ae8f7dac6c8..2847bd77f064 100644
--- a/x11-toolkits/gnocl/Makefile
+++ b/x11-toolkits/gnocl/Makefile
@@ -6,29 +6,26 @@
 #
 
 PORTNAME=	gnocl
-PORTVERSION=	0.9.91
-PORTREVISION=	4
+PORTVERSION=	0.9.94
 CATEGORIES=	x11-toolkits devel
 MASTER_SITES=	SF/gnocl
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	GTK+ and Gnome extension for Tcl
 
 USE_GMAKE=	yes
-USE_BZIP2=	yes
-USE_GNOME=	gtk20
+USE_ZIP=	yes
+USE_GNOME=	gtk20 libglade2 gtksourceview2 gtkhtml3
 USE_TCL=	84
 USE_LDCONFIG=	yes
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/src
 CFLAGS+=	-I${LOCALBASE}/include/tcl8.4
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "sparc64" || ${ARCH} == "ia64"
-BROKEN=		Does not compile on sparc64 or ia64
-.endif
-
 .if ${ARCH} == amd64
 CFLAGS+=	-fPIC
 .endif
@@ -44,12 +41,6 @@ GNOCL_CANVAS_FILE=	"@comment "
 USE_GNOME+=	libgnomecanvas
 .endif
 
-.if defined(WITHOUT_GCONF)
-GNOCL_GCONF_FILE=	"@comment "
-.else
-USE_GNOME+=	gconf2
-.endif
-
 .if defined(WITHOUT_GNOME)
 GNOCL_GNOME_FILE=	"@comment "
 .else
@@ -67,18 +58,22 @@ PLIST_SUB+=	GNOCL_GCONF_FILE=${GNOCL_GCONF_FILE}
 PLIST_SUB+=	GNOCL_GNOME_FILE=${GNOCL_GNOME_FILE}
 PLIST_SUB+=	GNOCL_VFS_FILE=${GNOCL_VFS_FILE}
 
+post-extract:
+	${FIND} ${WRKSRC} -name "*.o" -delete
+	${RMDIR} ${WRKSRC}/doc/html		# Remove empty/stale directory
+
 post-patch:
-.if defined(WITHOUT_CANVAS)
-	${REINPLACE_CMD} -e 's=^USE_CANVAS=#USE_CANVAS=' ${BUILD_WRKSRC}/Makefile
+.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
+.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
+.if !defined(WITHOUT_GNOME)
+	${REINPLACE_CMD} -e 's=^#USE_GNOME=USE_GNOME=' ${BUILD_WRKSRC}/Makefile
 .endif
-.if defined(WITHOUT_GNOMEVFS2)
-	${REINPLACE_CMD} -e 's=^USE_VFS=#USE_VFS=' ${BUILD_WRKSRC}/Makefile
+.if !defined(WITHOUT_GNOMEVFS2)
+	${REINPLACE_CMD} -e 's=^#USE_VFS=USE_VFS=' ${BUILD_WRKSRC}/Makefile
 .endif
 	${FIND} ${WRKSRC}/demos -name "*.tcl" | ${XARGS} \
 		${REINPLACE_CMD} -i "" -e 's|tclsh|${TCLSH}|g; \
diff --git a/x11-toolkits/gnocl/distinfo b/x11-toolkits/gnocl/distinfo
index 533fd975c0a9..e548021f213b 100644
--- a/x11-toolkits/gnocl/distinfo
+++ b/x11-toolkits/gnocl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnocl-0.9.91.tar.bz2) = 14a8f80b1651f2c4b5c6a3b4e7169775
-SHA256 (gnocl-0.9.91.tar.bz2) = 67cf290151ab4abc5c1de9d2b2fd94e53c6def49938ecb9578177782ba8d7f4e
-SIZE (gnocl-0.9.91.tar.bz2) = 549134
+MD5 (gnocl0.9.94.zip) = 98cc57435767d5e795f0cdff71eb2cc9
+SHA256 (gnocl0.9.94.zip) = fb8f3f59823730eec2a8545c350ef8b2e1868240f96f92c5d9c47114fa7f4584
+SIZE (gnocl0.9.94.zip) = 2827319
diff --git a/x11-toolkits/gnocl/files/patch-Makefile b/x11-toolkits/gnocl/files/patch-Makefile
index d971fd64d605..6d52ff720535 100644
--- a/x11-toolkits/gnocl/files/patch-Makefile
+++ b/x11-toolkits/gnocl/files/patch-Makefile
@@ -1,22 +1,41 @@
---- src/Makefile.orig	2006-02-27 21:27:55.000000000 +0100
-+++ src/Makefile	2008-05-30 16:17:43.000000000 +0200
-@@ -19,16 +19,16 @@
+--- src/Makefile.orig	2009-07-06 09:07:59.000000000 +0200
++++ src/Makefile	2009-07-06 09:10:12.000000000 +0200
+@@ -45,7 +45,7 @@
  
- # for releases use -Os, this makes the lib 15% smaller 
+ # for releases use -Os, this makes the lib 15% smaller
  # amd64 need -fPIC, x86 works with and without
 -CFLAGS += -Wall -pedantic -fPIC
 +CFLAGS += -Wall -fPIC
  GTK_24 := $(shell pkg-config --atleast-version=2.4 'gtk+-2.0' && echo yes)
  GTK_26 := $(shell pkg-config --atleast-version=2.6 'gtk+-2.0' && echo yes)
  
+@@ -55,22 +55,23 @@
+ GTK_212 := $(shell pkg-config --atleast-version=2.12 'gtk+-2.0' && echo yes)
+ 
+ # get tclsh to tell us which version of Tcl is installed on the system
 -TCL_VERSION := $(shell echo 'puts $$tcl_version' | tclsh)
 +TCL_VERSION := 84
  
- # this breaks build on GTK 2.4 
- # -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED 
- export ADDCFLAGS := -DVERSION=\"$(VERSION)\" -DUSE_TCL_STUBS $(shell pkg-config --cflags gtk+-2.0) -I/usr/include/tcl$(TCL_VERSION)/
--export LIBS := $(shell pkg-config --libs gtk+-2.0) -ltclstub$(TCL_VERSION)
-+export LIBS := $(shell pkg-config --libs gtk+-2.0) -ltclstub$(TCL_VERSION) -L$(LOCALBASE)/lib
+ # this breaks build on GTK 2.4
+ # -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
+ export ADDCFLAGS := -DVERSION=\"$(VERSION)\" \
+ 	-DUSE_TCL_STUBS $(shell pkg-config \
+ 	--cflags gtk+-2.0) \
+-	-I/usr/include/tcl$(TCL_VERSION) \
+-	-I/usr/local/include/gtksourceview-2.0 \
+-	-I/usr/include/libglade-2.0/  \
+-	-I/usr/local/include/gtkhtml /
++	-I${LOCALBASE}/tcl$(TCL_VERSION) \
++	-I${LOCALBASE}/include/gtksourceview-2.0 \
++	-I${LOCALBASE}/include/libglade-2.0/  \
++	-I${LOCALBASE}/include/gtkhtml /
+ 
+ # don't forget to add libs for new widgets!!
+ export LIBS := $(shell pkg-config \
+ 	--libs gtk+-2.0 libglade-2.0 vte) \
+-	-ltclstub$(TCL_VERSION)
++	-ltclstub$(TCL_VERSION) \
++	-L${LOCALBASE}/lib
  
  ############################################################
- # There should be no need to edit something below this line 
+ # There should be no need to edit something below this line
diff --git a/x11-toolkits/gnocl/pkg-plist b/x11-toolkits/gnocl/pkg-plist
index d1f19220f8c3..f4c977b5c2fe 100644
--- a/x11-toolkits/gnocl/pkg-plist
+++ b/x11-toolkits/gnocl/pkg-plist
@@ -3,161 +3,168 @@ lib/libgnocl.so.1
 %%GNOCL_GCONF_FILE%%
 %%GNOCL_GNOME_FILE%%
 %%GNOCL_VFS_FILE%%
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/index.html
+%%PORTDOCS%%%%DOCSDIR%%/examples/button.tcl
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r4259.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r8902.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r547.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r9914.html
 %%PORTDOCS%%%%DOCSDIR%%/gnocl/t118.html
 %%PORTDOCS%%%%DOCSDIR%%/gnocl/x165.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/x351.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r355.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r408.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r438.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r499.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r547.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r571.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r9674.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/index.html
 %%PORTDOCS%%%%DOCSDIR%%/gnocl/r586.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r796.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r1075.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r1365.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r1461.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r1656.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r1765.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r1926.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r1987.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r2256.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r2464.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r2671.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r2842.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r3025.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r3218.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r3424.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r3625.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r3834.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r4259.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r4423.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r4533.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r4668.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r4864.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r4983.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r5114.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r6227.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r2845.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r7006.html
 %%PORTDOCS%%%%DOCSDIR%%/gnocl/r5240.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r5400.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r5554.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r5638.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r1988.html
 %%PORTDOCS%%%%DOCSDIR%%/gnocl/r5768.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r5890.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r6060.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r6227.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r3025.html
 %%PORTDOCS%%%%DOCSDIR%%/gnocl/r6423.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r6543.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r6702.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r6897.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r7006.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r7725.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r7760.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r7952.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r8030.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r8128.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r1987.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r1075.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r10267.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/a11175.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r8984.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r2843.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r355.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r4983.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/a11176.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/a11173.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r8793.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r10843.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r2483.html
 %%PORTDOCS%%%%DOCSDIR%%/gnocl/r8563.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r6543.html
 %%PORTDOCS%%%%DOCSDIR%%/gnocl/r8704.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r8793.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r8902.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r8984.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r9102.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r9219.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r9330.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r9674.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r3424.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r4668.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r2842.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r7952.html
 %%PORTDOCS%%%%DOCSDIR%%/gnocl/r9824.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r9914.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r1461.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r6897.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r7760.html
 %%PORTDOCS%%%%DOCSDIR%%/gnocl/r10031.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r10267.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r10422.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r5890.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r9330.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r9102.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r7725.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r1656.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r499.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r5554.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r5114.html
 %%PORTDOCS%%%%DOCSDIR%%/gnocl/r10639.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r10734.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/r10843.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r10422.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r2844.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r438.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r4864.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r796.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r4423.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r5400.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r1765.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r6060.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r5638.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r2464.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r3625.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r8030.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r3218.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/a11174.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r2256.html
 %%PORTDOCS%%%%DOCSDIR%%/gnocl/r11010.html
-%%PORTDOCS%%%%DOCSDIR%%/gnocl/a11173.html
-%%PORTDOCS%%%%DOCSDIR%%/pics/menu.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/colorSelection.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/optionMenu.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/combo.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/tree.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/list.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/menuItem.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/eventBox.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/appletFactory.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/percentString.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/expander.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/checkButton.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/label.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/comboEntry.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/helloWorld.png
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r6702.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r9219.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r1926.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r408.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r2671.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r1365.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r8128.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r10734.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r571.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/x351.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r4533.html
+%%PORTDOCS%%%%DOCSDIR%%/gnocl/r3834.html
+%%PORTDOCS%%%%DOCSDIR%%/pics/comboBox.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/notebook.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/progressBar.png
 %%PORTDOCS%%%%DOCSDIR%%/pics/spinButton.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/stockButtons.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/paned.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/text.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/menuBar.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/fileChooserButton.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/scrolledWindow.png
 %%PORTDOCS%%%%DOCSDIR%%/pics/menuSeparator.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/box.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/percentString.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/combo.png
 %%PORTDOCS%%%%DOCSDIR%%/pics/scale.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/gnoclBanner.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/expander.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/colorButton.png
 %%PORTDOCS%%%%DOCSDIR%%/pics/toolBar.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/toggleButton.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/box.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/image.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/canvas.png
 %%PORTDOCS%%%%DOCSDIR%%/pics/dialog.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/notebook.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/window.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/menuItem.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/eventBox.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/checkButton.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/menuCheckItem.png
 %%PORTDOCS%%%%DOCSDIR%%/pics/fontSelection.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/colorButton.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/button.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/radioButton.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/menuRadioItem.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/fontButton.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/image.png
 %%PORTDOCS%%%%DOCSDIR%%/pics/socket.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/scrolledWindow.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/menuCheckItem.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/fileSelection.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/canvas.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/separator.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/appletFactory.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/handleBox.png
 %%PORTDOCS%%%%DOCSDIR%%/pics/entry.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/progressBar.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/menuBar.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/statusBar.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/window.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/tree.png
 %%PORTDOCS%%%%DOCSDIR%%/pics/fileChooser.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/comboBox.png
-%%PORTDOCS%%%%DOCSDIR%%/pics/table.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/label.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/stockButtons.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/fontButton.png
 %%PORTDOCS%%%%DOCSDIR%%/pics/simple.png
-%%PORTDOCS%%%%DOCSDIR%%/xml/manpages.txt
-%%PORTDOCS%%%%DOCSDIR%%/xml/gnocl.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/concepts.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/nonwidgetcmds.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/appletfactory.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/file.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/mime.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/sed_cmds
-%%PORTDOCS%%%%DOCSDIR%%/xml/txt2xml.tcl
+%%PORTDOCS%%%%DOCSDIR%%/pics/helloWorld.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/text.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/paned.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/list.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/menuRadioItem.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/optionMenu.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/table.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/linkButton.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/statusBar.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/arrowButton.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/comboEntry.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/button.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/radioButton.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/separator.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/menu.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/colorSelection.png
+%%PORTDOCS%%%%DOCSDIR%%/pics/gnocl_logo.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-widget.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-richText.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-polygon.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-lines.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-lines.tcl-bcp20040921
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-affine.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-clipGroup.tcl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-lines.tcl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-bpath.tcl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-widget.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-text.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-tags.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/canvas-man.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-bpath.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/deprecated/test-combo.tcl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-clipGroup.tcl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-richText.tcl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-affine.tcl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/test-canvas-polygon.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deprecated/test-optionMenu.tcl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/deprecated/test-combo.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/doTests
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/embed-tk.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/embed.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/floppybuddy.gif
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gconf/test-gconf.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnome/gnocl_test_applet.server
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnome/test-session.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnome/gnocl-applet
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnome/canvas.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnome/README.applet
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnome/gnocl_test_applet.server
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnome/canvas.tcl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnome/gnocl-applet
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/jitter.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mini.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/one.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/outfile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/regexp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/socket-man.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/socket.tcl
@@ -168,7 +175,6 @@ lib/libgnocl.so.1
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-box.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-box2.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-box3.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/three.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-button.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-check.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-checkButton.tcl
@@ -207,18 +213,19 @@ lib/libgnocl.so.1
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-toolBar.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-tree.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-window.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vfs/q
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/three.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vfs/q.zip
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vfs/q
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vfs/test-vfs.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vfs/q3.zip
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets.tcl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/vfs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnome
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gconf
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/deprecated
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/canvas
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/gnocl
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pics
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/canvas
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/deprecated
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gconf
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnome
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/vfs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%