head	1.5;
access;
symbols
	pkgsrc-2013Q2:1.5.0.10
	pkgsrc-2013Q2-base:1.5
	pkgsrc-2012Q4:1.5.0.8
	pkgsrc-2012Q4-base:1.5
	pkgsrc-2011Q4:1.5.0.6
	pkgsrc-2011Q4-base:1.5
	pkgsrc-2011Q2:1.5.0.4
	pkgsrc-2011Q2-base:1.5
	pkgsrc-2009Q4:1.5.0.2
	pkgsrc-2009Q4-base:1.5
	pkgsrc-2009Q3:1.4.0.38
	pkgsrc-2009Q3-base:1.4
	pkgsrc-2009Q2:1.4.0.36
	pkgsrc-2009Q2-base:1.4
	pkgsrc-2009Q1:1.4.0.34
	pkgsrc-2009Q1-base:1.4
	pkgsrc-2008Q4:1.4.0.32
	pkgsrc-2008Q4-base:1.4
	pkgsrc-2008Q3:1.4.0.30
	pkgsrc-2008Q3-base:1.4
	cube-native-xorg:1.4.0.28
	cube-native-xorg-base:1.4
	pkgsrc-2008Q2:1.4.0.26
	pkgsrc-2008Q2-base:1.4
	cwrapper:1.4.0.24
	pkgsrc-2008Q1:1.4.0.22
	pkgsrc-2008Q1-base:1.4
	pkgsrc-2007Q4:1.4.0.20
	pkgsrc-2007Q4-base:1.4
	pkgsrc-2007Q3:1.4.0.18
	pkgsrc-2007Q3-base:1.4
	pkgsrc-2007Q2:1.4.0.16
	pkgsrc-2007Q2-base:1.4
	pkgsrc-2007Q1:1.4.0.14
	pkgsrc-2007Q1-base:1.4
	pkgsrc-2006Q4:1.4.0.12
	pkgsrc-2006Q4-base:1.4
	pkgsrc-2006Q3:1.4.0.10
	pkgsrc-2006Q3-base:1.4
	pkgsrc-2006Q2:1.4.0.8
	pkgsrc-2006Q2-base:1.4
	pkgsrc-2006Q1:1.4.0.6
	pkgsrc-2006Q1-base:1.4
	pkgsrc-2005Q4:1.4.0.4
	pkgsrc-2005Q4-base:1.4
	pkgsrc-2005Q3:1.4.0.2
	pkgsrc-2005Q3-base:1.4
	pkgsrc-2005Q2:1.3.0.22
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.20
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.18
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.16
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.14
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.12
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.3.0.10
	pkgsrc-2003Q4-base:1.3
	netbsd-1-6-1:1.3.0.6
	netbsd-1-6-1-base:1.3
	netbsd-1-6:1.3.0.8
	netbsd-1-6-RELEASE-base:1.3
	pkgviews:1.3.0.4
	pkgviews-base:1.3
	buildlink2:1.3.0.2
	buildlink2-base:1.3
	netbsd-1-5-PATCH003:1.3
	netbsd-1-5-PATCH001:1.1
	netbsd-1-5-RELEASE:1.1
	netbsd-1-4-PATCH003:1.1
	netbsd-1-4-PATCH002:1.1
	comdex-fall-1999:1.1;
locks; strict;
comment	@# @;


1.5
date	2009.12.16.20.07.32;	author joerg;	state dead;
branches;
next	1.4;

1.4
date	2005.08.11.22.46.05;	author dmcmahill;	state Exp;
branches;
next	1.3;

1.3
date	2001.06.09.11.41.36;	author tron;	state Exp;
branches;
next	1.2;

1.2
date	2001.06.08.14.35.39;	author tron;	state Exp;
branches;
next	1.1;

1.1
date	99.10.05.06.15.57;	author jlam;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Retire old xpm package. Replaced by x11/libXpm.
@
text
@$NetBSD: patch-ab,v 1.4 2005/08/11 22:46:05 dmcmahill Exp $

--- sxpm/Imakefile.orig	1998-03-19 14:51:01.000000000 -0500
+++ sxpm/Imakefile	2005-08-11 14:46:16.678675000 -0400
@@@@ -58,9 +58,15 @@@@
 #else
 LOCAL_LIBRARIES = -L../lib -L$(XPMLIBDIR) $(XPMLIB) $(XTOOLLIB) $(XLIB)
+EXTRA_LDOPTIONS = -L../lib 
 #endif
 
 XCOMM try hard to set things so we'll find the shared lib once installed
+#ifdef X11ProjectRoot
+LD_RUN_PATH = $(USRLIBDIR):$(XPROJECTROOT)/lib:$(XPMLIBDIR)
+USRLIBDIRPATH = $(USRLIBDIR):$(XPROJECTROOT)/lib:$(XPMLIBDIR)
+#else
 LD_RUN_PATH = $(USRLIBDIR):$(XPMLIBDIR)
 USRLIBDIRPATH = $(USRLIBDIR):$(XPMLIBDIR)
+#endif
 
 #if ProjectX < 603
@


1.4
log
@make sure that we put -L../lib at the beginning so we find our
local libXpm.  Fixes linking problems on solaris.
@
text
@d1 1
a1 1
$NetBSD$
@


1.3
log
@Solve problem caused by "xpkwedge" support showing up under Solaris in a
better way. Patch supplied by Johnny C. Lam in private e-mail.
@
text
@d3 6
a8 3
--- sxpm/Imakefile.orig	Thu Mar 19 14:51:01 1998
+++ sxpm/Imakefile	Sat Jun  9 03:33:04 2001
@@@@ -60,8 +60,13 @@@@
a20 1
 # ifdef HPArchitecture
@


1.2
log
@Fix broken "xpkwedge" patch which unconditionally modifies
"USRLIBDIRPATH" causing build problems under Solaris.
@
text
@d3 3
a5 3
--- sxpm/Imakefile.orig	Thu Mar 19 20:51:01 1998
+++ sxpm/Imakefile	Thu Jun  7 17:30:25 2001
@@@@ -60,8 +60,10 @@@@
d9 6
a14 5
-LD_RUN_PATH = $(USRLIBDIR):$(XPMLIBDIR)
-USRLIBDIRPATH = $(USRLIBDIR):$(XPMLIBDIR)
+#ifndef NetBSDArchitecture
+LD_RUN_PATH = $(USRLIBDIR):$(XPMLIBDIR)
+USRLIBDIRPATH = $(USRLIBDIR):$(XPMLIBDIR)
@


1.1
log
@Make this work with xpkgwedge/USE_LOCALBASE_FOR_X11.
@
text
@d3 3
a5 3
--- sxpm/Imakefile.orig	Thu Mar 19 14:51:01 1998
+++ sxpm/Imakefile	Tue Oct  5 01:10:19 1999
@@@@ -60,8 +60,8 @@@@
d11 4
a14 2
+XCOMM LD_RUN_PATH = $(USRLIBDIR):$(XPMLIBDIR)
+XCOMM USRLIBDIRPATH = $(USRLIBDIR):$(XPMLIBDIR)
@