PKG_DESTDIR_SUPPORT

11 files changed, 104 insertions, 92 deletions

diff --git a/x11/fvwm-wharf/Makefile b/x11/fvwm-wharf/Makefile
index e038668bcfb..24fbaa28987 100644
--- a/x11/fvwm-wharf/Makefile
+++ b/x11/fvwm-wharf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/01/19 09:16:26 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2009/12/17 18:28:07 abs Exp $
 
 DISTNAME=		AfterStep-1.0
 PKGNAME=		fvwm-wharf-1.0
@@ -13,13 +13,14 @@ COMMENT=		Copy of AfterStep's Wharf compatible with fvwm2
 USE_IMAKE=		YES
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+PKG_DESTDIR_SUPPORT=  	user-destdir
 
 post-configure:
 	cd ${WRKSRC}; ${MAKE} Makefiles
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/modules/Wharf/Wharf ${PREFIX}/bin/Fvwm-Wharf
-	${INSTALL_MAN} ${WRKSRC}/modules/Wharf/Wharf.man ${PREFIX}/${PKGMANDIR}/man1/Fvwm-Wharf.1
+	${INSTALL_PROGRAM} ${WRKSRC}/modules/Wharf/Wharf ${DESTDIR}${PREFIX}/bin/Fvwm-Wharf
+	${INSTALL_MAN} ${WRKSRC}/modules/Wharf/Wharf.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/Fvwm-Wharf.1
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/x11/gtkstep/Makefile b/x11/gtkstep/Makefile
index 3c5c6b560a4..15fc40fd0b6 100644
--- a/x11/gtkstep/Makefile
+++ b/x11/gtkstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/07/22 09:01:54 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2009/12/17 18:31:46 abs Exp $
 
 DISTNAME=		gtkstep-1.10
 PKGREVISION=		6
@@ -13,10 +13,12 @@ COMMENT=		GTK theme-engine to yield a NEXTSTEP(tm) look and feel
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
+PKG_DESTDIR_SUPPORT= user-destdir
+
 post-install:
-	${RM} -f ${PREFIX}/share/themes/Step/gtk/gtkrc.in
+	${RM} -f ${DESTDIR}${PREFIX}/share/themes/Step/gtk/gtkrc.in
 	${INSTALL_DATA} ${WRKSRC}/step/Theme/gtk/gtkrc \
-	  ${PREFIX}/share/themes/Step/gtk
+	  ${DESTDIR}${PREFIX}/share/themes/Step/gtk
 
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index e8039199c25..253dc416c0e 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/03/08 19:49:16 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2009/12/17 18:32:51 abs Exp $
 #
 
 DISTNAME=	keylaunch_1.3.3
@@ -14,13 +14,13 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS+=	bin share/examples/keylaunch
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/keylaunch ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/keylaunch
+	${INSTALL_PROGRAM} ${WRKSRC}/keylaunch ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/docs/example_rc \
-		${PREFIX}/share/examples/keylaunch/keylaunch.rc
+		${DESTDIR}${PREFIX}/share/examples/keylaunch/keylaunch.rc
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/matchbox-panel/Makefile b/x11/matchbox-panel/Makefile
index 3a67fb3252a..98e027e7337 100644
--- a/x11/matchbox-panel/Makefile
+++ b/x11/matchbox-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/10/06 18:47:10 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2009/12/17 18:29:05 abs Exp $
 #
 
 DISTNAME=		matchbox-panel-0.9.2
@@ -21,18 +21,21 @@ CONFIGURE_ARGS+=	--enable-small-icons
 CONFIGURE_ARGS+=	--enable-startup-notification
 CONFIGURE_ARGS+=	--enable-nls
 
+PKG_DESTDIR_SUPPORT=  	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_VARS=		apm
 .if ${OPSYS} == "DragonFly" || \
     ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "x86_64"
 # Nada
-.else 
+.else
 PLIST.apm=		yes
 .endif
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libmatchbox/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/swing/Makefile b/x11/swing/Makefile
index 63f096c4854..b631d1ae944 100644
--- a/x11/swing/Makefile
+++ b/x11/swing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2009/12/17 18:23:14 abs Exp $
 
 DISTNAME=	swing1_1_1
 PKGNAME=	swing-1.1.1
@@ -37,24 +37,23 @@ SWINGDIR=	${PREFIX}/lib/java/swing
 EGDIR=		${PREFIX}/share/examples/swing
 HTMLDIR=	${PREFIX}/share/doc/swing
 
+PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS+=lib/java/swing share/examples/swing share/doc/swing
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
-	${INSTALL_DATA_DIR} ${SWINGDIR}
-	${INSTALL_DATA} ${WRKSRC}/swingall.jar ${PREFIX}/lib/java
-	${INSTALL_DATA} ${WRKSRC}/beaninfo.jar ${SWINGDIR}
-	${INSTALL_DATA} ${WRKSRC}/mac.jar ${SWINGDIR}
-	${INSTALL_DATA} ${WRKSRC}/motif.jar ${SWINGDIR}
-	${INSTALL_DATA} ${WRKSRC}/multi.jar ${SWINGDIR}
-	${INSTALL_DATA} ${WRKSRC}/swing.jar ${SWINGDIR}
-	${INSTALL_DATA} ${WRKSRC}/windows.jar ${SWINGDIR}
-	${INSTALL_DATA_DIR} ${HTMLDIR}
-	cd ${WRKSRC}/doc && pax -rw . ${HTMLDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${HTMLDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${HTMLDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.html ${HTMLDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${HTMLDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
-	cd ${WRKSRC}/examples && pax -rw . ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/swingall.jar ${DESTDIR}${PREFIX}/lib/java
+	${INSTALL_DATA} ${WRKSRC}/beaninfo.jar ${DESTDIR}${SWINGDIR}
+	${INSTALL_DATA} ${WRKSRC}/mac.jar ${DESTDIR}${SWINGDIR}
+	${INSTALL_DATA} ${WRKSRC}/motif.jar ${DESTDIR}${SWINGDIR}
+	${INSTALL_DATA} ${WRKSRC}/multi.jar ${DESTDIR}${SWINGDIR}
+	${INSTALL_DATA} ${WRKSRC}/swing.jar ${DESTDIR}${SWINGDIR}
+	${INSTALL_DATA} ${WRKSRC}/windows.jar ${DESTDIR}${SWINGDIR}
+	cd ${WRKSRC}/doc && pax -rw . ${DESTDIR}${HTMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${DESTDIR}${HTMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${DESTDIR}${HTMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.html ${DESTDIR}${HTMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${HTMLDIR}
+	cd ${WRKSRC}/examples && pax -rw . ${DESTDIR}${EGDIR}
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk83/Makefile b/x11/tk83/Makefile
index 87e178b802d..82ae2472452 100644
--- a/x11/tk83/Makefile
+++ b/x11/tk83/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/08/20 15:25:01 jwise Exp $
+# $NetBSD: Makefile,v 1.18 2009/12/17 18:23:49 abs Exp $
 
 DISTNAME=	tk8.3.4
 PKGNAME=	tk-8.3.4
@@ -11,6 +11,8 @@ HOMEPAGE=	http://www.tcltk.com/
 COMMENT=	Graphical toolkit for TCL
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT= 	user-destdir
+INSTALLATION_DIRS+=	include/tk/generic include/tk/unix
 
 GNU_CONFIGURE=		yes
 CONFIGURE_DIRS=		unix
@@ -37,7 +39,7 @@ CONFIGURE_ARGS+=	--enable-64bit
 # linked to a longer filename.
 #
 post-patch:
-	@cd ${WRKSRC}/unix;						\
+	cd ${WRKSRC}/unix;						\
 	${MV} -f mkLinks mkLinks.tmp;					\
 	${GREP} -v "^exit 0" mkLinks.tmp > mkLinks;			\
 	${CAT} mkLinks.tmp						\
@@ -57,37 +59,33 @@ post-build:
 	done
 
 post-install:
-	${RM} -f ${PREFIX}/bin/wish
-	cd ${PREFIX}/bin && ${LN} -s wish8.3 wish
-	${INSTALL_DATA_DIR} ${PREFIX}/include/tk
-	${INSTALL_DATA_DIR} ${PREFIX}/include/tk/generic
-	${INSTALL_DATA_DIR} ${PREFIX}/include/tk/unix
-	${INSTALL_DATA} ${WRKSRC}/generic/default.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/ks_names.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tk.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tk3d.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkButton.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkCanvas.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkColor.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkDecls.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkFileFilter.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkFont.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkInitScript.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkInt.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkIntDecls.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkIntPlatDecls.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkIntXlibDecls.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkMenu.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkMenubutton.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkPlatDecls.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkPort.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkScale.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkScrollbar.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkSelect.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkText.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixDefault.h ${PREFIX}/include/tk/unix
-	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixInt.h ${PREFIX}/include/tk/unix
-	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixPort.h ${PREFIX}/include/tk/unix
+	cd ${DESTDIR}${PREFIX}/bin && ${LN} -s wish8.3 wish
+	${INSTALL_DATA} ${WRKSRC}/generic/default.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/ks_names.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tk.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tk3d.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkButton.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkCanvas.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkColor.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkDecls.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkFileFilter.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkFont.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkInitScript.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkInt.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkIntDecls.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkIntPlatDecls.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkIntXlibDecls.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkMenu.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkMenubutton.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkPlatDecls.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkPort.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkScale.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkScrollbar.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkSelect.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkText.h ${DESTDIR}${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixDefault.h ${DESTDIR}${PREFIX}/include/tk/unix
+	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixInt.h ${DESTDIR}${PREFIX}/include/tk/unix
+	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixPort.h ${DESTDIR}${PREFIX}/include/tk/unix
 
 .include "../../lang/tcl83/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/tk83/distinfo b/x11/tk83/distinfo
index bb5a0a3ef6d..67ca0a70ce5 100644
--- a/x11/tk83/distinfo
+++ b/x11/tk83/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2009/05/15 12:12:28 sborrill Exp $
+$NetBSD: distinfo,v 1.10 2009/12/17 18:23:49 abs Exp $
 
 SHA1 (tk8.3.4.tar.gz) = d52bf5cedb73e9b817ba8d6a2b00701f4f82fad2
 RMD160 (tk8.3.4.tar.gz) = f154fd9b2eedcff732b9cdabee48bd9af1b3dd26
 Size (tk8.3.4.tar.gz) = 2589635 bytes
-SHA1 (patch-aa) = eac3c87f6fa921f046e59588e8d77dde336985c7
-SHA1 (patch-ab) = 2476494048a118c06af497428d39aaab05faec4c
+SHA1 (patch-aa) = 5859c2d4e2cafe68d5a2f14aecae4b36cab3a747
+SHA1 (patch-ab) = 6cd2c9b7a800b6a5aeb2d8f71840e78fcbd4aaa4
 SHA1 (patch-ac) = b7e3a2fefafd00d3d00499117fe7dc42fb6ad429
-SHA1 (patch-ad) = 7aaab1728ad13ddbbf4483780f818996a09a67f9
+SHA1 (patch-ad) = 9afaa77065585ef6cb97864e1fbc470670773186
 SHA1 (patch-ae) = 9ab780fbfcc18606423abf4a1ae8816a39856dbf
-SHA1 (patch-af) = bfbb2a9ebdaf172b242b33668d4af64c316a8b63
+SHA1 (patch-af) = 63da236ce317e9860dc0dde6097bb94ecfdbd6a8
diff --git a/x11/tk83/patches/patch-aa b/x11/tk83/patches/patch-aa
index 2ee03eda896..ad2b42c8be9 100644
--- a/x11/tk83/patches/patch-aa
+++ b/x11/tk83/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2005/11/05 03:27:56 rillig Exp $
+$NetBSD: patch-aa,v 1.4 2009/12/17 18:23:49 abs Exp $
 
---- unix/Makefile.in.orig	2001-10-20 01:24:40.000000000 +0100
-+++ unix/Makefile.in	2005-05-10 17:01:34.000000000 +0100
-@@ -76,7 +76,7 @@
+--- unix/Makefile.in.orig	2001-10-20 00:24:40.000000000 +0000
++++ unix/Makefile.in
+@@ -37,7 +37,7 @@ mandir			= @mandir@
+ # to be different than those used for actually reference files at
+ # run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
+ # when installing files.
+-INSTALL_ROOT		=
++INSTALL_ROOT		= $(DESTDIR)
+ 
+ # Directory from which applications will reference the library of Tcl
+ # scripts (note: you can set the TK_LIBRARY environment variable at
+@@ -76,7 +76,7 @@ MANN_INSTALL_DIR	= $(MAN_INSTALL_DIR)/ma
  # The directory containing the Tcl sources and headers appropriate
  # for this version of Tk ("srcdir" will be replaced or has already
  # been replaced by the configure script):
@@ -11,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/05 03:27:56 rillig Exp $
  
  # The directory containing the Tcl library archive file appropriate
  # for this version of Tk:
-@@ -100,7 +100,7 @@
+@@ -100,7 +100,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -20,7 +29,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/05 03:27:56 rillig Exp $
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -159,8 +159,8 @@
+@@ -159,8 +159,8 @@ SHELL			= /bin/sh
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -31,7 +40,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/05 03:27:56 rillig Exp $
  INSTALL_DATA		= ${INSTALL} -m 644
  
  # The following specifies which Tcl executable to use for make targets
-@@ -209,7 +209,7 @@
+@@ -209,7 +209,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
  # The values of the symbolis normally set by the configure script.
  
  STLIB_LD		= @STLIB_LD@
@@ -40,7 +49,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/05 03:27:56 rillig Exp $
  SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
  
  # Additional search flags needed to find the various shared libraries
-@@ -240,7 +240,8 @@
+@@ -240,7 +240,8 @@ TOOL_DIR		= @TCL_SRC_DIR@/tools
  # either.
  #----------------------------------------------------------------
  
@@ -50,7 +59,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/05 03:27:56 rillig Exp $
  
  CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
  -I${UNIX_DIR} -I${GENERIC_DIR} \
-@@ -373,6 +374,7 @@
+@@ -373,6 +374,7 @@ ${TK_LIB_FILE}: ${OBJS}
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
  	$(RANLIB) ${TK_LIB_FILE}
@@ -58,7 +67,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/05 03:27:56 rillig Exp $
  
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
-@@ -391,9 +393,9 @@
+@@ -391,9 +393,9 @@ objs: ${OBJS}
  
  
  wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
@@ -70,7 +79,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/05 03:27:56 rillig Exp $
  
  # This rule is executed if the user tried to run tktest without first
  # building tcltest in the Tcl bin directory. Just do it for them.
-@@ -402,12 +404,12 @@
+@@ -402,12 +404,12 @@ ${TCL_BIN_DIR}/tcltest:
  	make tcltest
  
  tktest: ${TCL_BIN_DIR}/tcltest $(TKTEST_OBJS) $(TK_LIB_FILE)
@@ -86,7 +95,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/05 03:27:56 rillig Exp $
  		@TK_BUILD_LIB_SPEC@ \
  		$(WISH_LIBS) $(TK_LD_SEARCH_FLAGS) -lXt -o xttest
  
-@@ -462,7 +464,7 @@
+@@ -462,7 +464,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
  	    chmod +x $(UNIX_DIR)/mkLinks; \
  	    fi
  	@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
diff --git a/x11/tk83/patches/patch-ab b/x11/tk83/patches/patch-ab
index 3b9ac4324c0..373c3407800 100644
--- a/x11/tk83/patches/patch-ab
+++ b/x11/tk83/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2008/07/14 00:43:34 dholland Exp $
+$NetBSD: patch-ab,v 1.6 2009/12/17 18:23:49 abs Exp $
 
---- unix/configure.orig	2001-10-20 02:24:40.000000000 +0200
+--- unix/configure.orig	2001-10-20 00:24:40.000000000 +0000
 +++ unix/configure
 @@ -1688,7 +1688,7 @@ echo "configure:1679: checking system ve
  	    # results, and the version is kept in special file).
diff --git a/x11/tk83/patches/patch-ad b/x11/tk83/patches/patch-ad
index 0e79cab3084..13f1274ada9 100644
--- a/x11/tk83/patches/patch-ad
+++ b/x11/tk83/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2005/11/05 03:27:56 rillig Exp $
+$NetBSD: patch-ad,v 1.3 2009/12/17 18:23:49 abs Exp $
 
---- unix/configure.in.orig	Sat Oct 20 02:24:40 2001
+--- unix/configure.in.orig	2001-10-20 00:24:40.000000000 +0000
 +++ unix/configure.in
-@@ -220,6 +220,10 @@
+@@ -220,6 +220,10 @@ if test "x${x_libraries}" != "x"; then
  fi
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
      LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.2 2005/11/05 03:27:56 rillig Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -349,7 +353,7 @@
+@@ -349,7 +353,7 @@ TCL_STUB_LIB_SPEC='-L$(TCL_BIN_DIR) $(TC
  if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
      TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX}
@@ -22,7 +22,7 @@ $NetBSD: patch-ad,v 1.2 2005/11/05 03:27:56 rillig Exp $
      RANLIB=":"
  
  #    TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
-@@ -372,11 +376,17 @@
+@@ -372,11 +376,17 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
  if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then
      if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
  	eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
diff --git a/x11/tk83/patches/patch-af b/x11/tk83/patches/patch-af
index 32764013828..0ab989dafb9 100644
--- a/x11/tk83/patches/patch-af
+++ b/x11/tk83/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2009/05/15 12:12:28 sborrill Exp $
+$NetBSD: patch-af,v 1.2 2009/12/17 18:23:49 abs Exp $
 
 Tk uses X event numbers to index this array, as well as adding a few of its
 own, starting with "VirtualEvent" (Which is correctly set to LASTEvent,
@@ -9,9 +9,9 @@ A cleaner fix, but a much bigger patch, is listed in the Tk bug tracker:
 
 http://sourceforge.net/tracker/index.php?func=detail&aid=2010422&group_id=12997&atid=112997
 
---- generic/tkBind.c.orig	2009-05-15 14:14:34.000000000 +0100
-+++ generic/tkBind.c	2009-05-15 14:16:15.000000000 +0100
-@@ -575,6 +575,9 @@
+--- generic/tkBind.c.orig	2001-10-13 01:25:10.000000000 +0000
++++ generic/tkBind.c
+@@ -575,6 +575,9 @@ static int flagArray[TK_LASTEVENT] = {
     /* ColormapNotify */		COLORMAP,
     /* ClientMessage */		0,
     /* MappingNotify */		0,