Fix build on DragonFly and with newer GCC versions.

3 files changed, 19 insertions, 10 deletions

diff --git a/sysutils/tkdesk/Makefile b/sysutils/tkdesk/Makefile
index 28c2e9d9b24..46b07f6f9d0 100644
--- a/sysutils/tkdesk/Makefile
+++ b/sysutils/tkdesk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:43 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/21 12:09:57 joerg Exp $
 #
 
 DISTNAME=	tkdesk-2.0
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=--with-tcl=${BUILDLINK_PREFIX.tcl}/lib	\
 		--with-tk=${BUILDLINK_PREFIX.tk}/lib	\
 		--with-itcl=${BUILDLINK_PREFIX.tcl-itcl}/lib	\
 		--with-blt=${BUILDLINK_PREFIX.blt}/lib
-MAKE_ENV+=	LIB_RUNTIME_DIR="-L${BUILDLINK_PREFIX.tcl-itcl}/lib" \
+MAKE_ENV+=	LIB_RUNTIME_DIR=${BUILDLINK_PREFIX.tcl-itcl:Q}/lib \
 		PAX=${PAX:Q}
 
 .include "../../lang/tcl/buildlink3.mk"
diff --git a/sysutils/tkdesk/distinfo b/sysutils/tkdesk/distinfo
index 64297ccc4a9..6d82ae856b2 100644
--- a/sysutils/tkdesk/distinfo
+++ b/sysutils/tkdesk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/11/17 23:38:03 rillig Exp $
+$NetBSD: distinfo,v 1.6 2006/04/21 12:09:57 joerg Exp $
 
 SHA1 (tkdesk-2.0.tar.gz) = 6ee7e290c094a957b92647fa83e23b0765556bf7
 RMD160 (tkdesk-2.0.tar.gz) = bd3983465e44aa0c294d1936fc5f3f450535d9c2
@@ -7,5 +7,5 @@ SHA1 (patch-aa) = c4ce261aa0032a6ff41cbd4d615aca0d9592be35
 SHA1 (patch-ab) = 0250bf748da921d25b2c0e96841f3fbed42fd96e
 SHA1 (patch-ac) = 286a2bb4177431f87b778ed943cd57961aeb48ab
 SHA1 (patch-ae) = c09cd944af50c2a31020a7478c1568e847b0cb02
-SHA1 (patch-aj) = e0aa89498cff3cde0be007c0586e9d32acb411c1
+SHA1 (patch-aj) = 5ad17e6634f626e56f83c51a6ca9ee66b21aee16
 SHA1 (patch-ak) = 441a1eefd5872786981b25aa07482a8d6d9515aa
diff --git a/sysutils/tkdesk/patches/patch-aj b/sysutils/tkdesk/patches/patch-aj
index b42d4c826d6..caac33674d2 100644
--- a/sysutils/tkdesk/patches/patch-aj
+++ b/sysutils/tkdesk/patches/patch-aj
@@ -1,8 +1,17 @@
-$NetBSD: patch-aj,v 1.2 2005/10/26 04:29:01 minskim Exp $
+$NetBSD: patch-aj,v 1.3 2006/04/21 12:09:57 joerg Exp $
 
 --- libdesk/tixImgXpm.c.orig	2004-04-13 21:32:20.000000000 -0500
 +++ libdesk/tixImgXpm.c
-@@ -156,7 +156,7 @@ typedef struct PixmapInstance {
+@@ -63,8 +63,6 @@
+ #include "tkPort.h"*/
+ /*#include <tix.h>*/
+ 
+-EXTERN void		panic();
+-
+ /* constants used only in this file */
+ 
+ #define XPM_MONO		1
+@@ -156,7 +154,7 @@ typedef struct PixmapInstance {
   */
  
  static int		ImgXpmCreate _ANSI_ARGS_((Tcl_Interp *interp,
@@ -11,7 +20,7 @@ $NetBSD: patch-aj,v 1.2 2005/10/26 04:29:01 minskim Exp $
  			    Tk_ImageType *typePtr, Tk_ImageMaster master,
  			    ClientData *clientDataPtr));
  static ClientData	ImgXpmGet _ANSI_ARGS_((Tk_Window tkwin,
-@@ -177,7 +177,7 @@ Tk_ImageType tixPixmapImageType = {
+@@ -177,7 +175,7 @@ Tk_ImageType tixPixmapImageType = {
      ImgXpmFree,			/* freeProc */
      ImgXpmDelete,		/* deleteProc */
      (Tk_ImagePostscriptProc *) NULL, /* postscriptProc ?? */
@@ -20,7 +29,7 @@ $NetBSD: patch-aj,v 1.2 2005/10/26 04:29:01 minskim Exp $
  };
  
  /*
-@@ -242,12 +242,12 @@ static int xpmTableInited = 0;
+@@ -242,12 +240,12 @@ static int xpmTableInited = 0;
   *----------------------------------------------------------------------
   */
  static int
@@ -36,7 +45,7 @@ $NetBSD: patch-aj,v 1.2 2005/10/26 04:29:01 minskim Exp $
  				 * include image name or type). */
      Tk_ImageType *typePtr;	/* Pointer to our type record (not used). */
      Tk_ImageMaster master;	/* Token for image, to be used by us in
-@@ -257,6 +257,13 @@ ImgXpmCreate(interp, name, argc, argv, t
+@@ -257,6 +255,13 @@ ImgXpmCreate(interp, name, argc, argv, t
  {
      PixmapMaster *masterPtr;
  
@@ -50,7 +59,7 @@ $NetBSD: patch-aj,v 1.2 2005/10/26 04:29:01 minskim Exp $
      masterPtr = (PixmapMaster *) ckalloc(sizeof(PixmapMaster));
      masterPtr->tkMaster = master;
      masterPtr->interp = interp;
-@@ -270,10 +277,11 @@ ImgXpmCreate(interp, name, argc, argv, t
+@@ -270,10 +275,11 @@ ImgXpmCreate(interp, name, argc, argv, t
      masterPtr->isDataAlloced = 0;
      masterPtr->instancePtr = NULL;