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.46
	pkgsrc-2009Q3-base:1.4
	pkgsrc-2009Q2:1.4.0.44
	pkgsrc-2009Q2-base:1.4
	pkgsrc-2009Q1:1.4.0.42
	pkgsrc-2009Q1-base:1.4
	pkgsrc-2008Q4:1.4.0.40
	pkgsrc-2008Q4-base:1.4
	pkgsrc-2008Q3:1.4.0.38
	pkgsrc-2008Q3-base:1.4
	cube-native-xorg:1.4.0.36
	cube-native-xorg-base:1.4
	pkgsrc-2008Q2:1.4.0.34
	pkgsrc-2008Q2-base:1.4
	cwrapper:1.4.0.32
	pkgsrc-2008Q1:1.4.0.30
	pkgsrc-2008Q1-base:1.4
	pkgsrc-2007Q4:1.4.0.28
	pkgsrc-2007Q4-base:1.4
	pkgsrc-2007Q3:1.4.0.26
	pkgsrc-2007Q3-base:1.4
	pkgsrc-2007Q2:1.4.0.24
	pkgsrc-2007Q2-base:1.4
	pkgsrc-2007Q1:1.4.0.22
	pkgsrc-2007Q1-base:1.4
	pkgsrc-2006Q4:1.4.0.20
	pkgsrc-2006Q4-base:1.4
	pkgsrc-2006Q3:1.4.0.18
	pkgsrc-2006Q3-base:1.4
	pkgsrc-2006Q2:1.4.0.16
	pkgsrc-2006Q2-base:1.4
	pkgsrc-2006Q1:1.4.0.14
	pkgsrc-2006Q1-base:1.4
	pkgsrc-2005Q4:1.4.0.12
	pkgsrc-2005Q4-base:1.4
	pkgsrc-2005Q3:1.4.0.10
	pkgsrc-2005Q3-base:1.4
	pkgsrc-2005Q2:1.4.0.8
	pkgsrc-2005Q2-base:1.4
	pkgsrc-2005Q1:1.4.0.6
	pkgsrc-2005Q1-base:1.4
	pkgsrc-2004Q4:1.4.0.4
	pkgsrc-2004Q4-base:1.4
	pkgsrc-2004Q3:1.4.0.2
	pkgsrc-2004Q3-base:1.4
	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.3
	netbsd-1-5-RELEASE:1.3
	netbsd-1-4-PATCH003:1.3
	netbsd-1-4-PATCH002:1.3
	comdex-fall-1999:1.3
	netbsd-1-4-PATCH001:1.3
	netbsd-1-4-RELEASE:1.3
	netbsd-1-3-PATCH003:1.3
	netbsd-1-3-PATCH002: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	2004.09.16.15.09.01;	author minskim;	state Exp;
branches;
next	1.3;

1.3
date	98.08.07.10.40.55;	author agc;	state Exp;
branches;
next	1.2;

1.2
date	98.07.04.09.14.54;	author mycroft;	state Exp;
branches;
next	1.1;

1.1
date	97.11.06.12.53.18;	author agc;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Retire old xpm package. Replaced by x11/libXpm.
@
text
@$NetBSD: patch-aa,v 1.4 2004/09/16 15:09:01 minskim Exp $

--- Imakefile.orig	Thu Mar 19 13:50:59 1998
+++ Imakefile
@@@@ -51,14 +51,19 @@@@ SPRINTFDEF = -DVOID_SPRINTF
 #  endif
 # endif
 #endif
+#if HasStrlcat
+STRLCATDEF = -DHAS_STRLCAT
+#endif
+
 #if defined(Win32Architecture)
 ZPIPEDEF = -DNO_ZPIPE
 #endif
 
-DEFINES = $(STRDUPDEF) $(STRCASECMPDEF) $(SPRINTFDEF) $(ZPIPEDEF)
+DEFINES = $(STRDUPDEF) $(STRCASECMPDEF) $(SPRINTFDEF) $(STRLCATDEF) $(ZPIPEDEF)
 
 XCOMM You can uncomment the following line to avoid building the shared lib
 XCOMM IMAKE_DEFINES = -DSharedLibXpm=NO
+IMAKE_DEFINES = -DForceNormalLib=YES
 
 
 XCOMM
@


1.4
log
@Incorporate security fixes of X.Org X11R6.8.1.

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@


1.3
log
@Add NetBSD RCS Ids.
@
text
@d3 16
a18 3
--- Imakefile.orig	Thu Mar 19 14:50:59 1998
+++ Imakefile	Sat Jul  4 05:08:45 1998
@@@@ -59,6 +59,7 @@@@
@


1.2
log
@Update to 3.4k.
@
text
@d1 2
@


1.1
log
@Add a patch for NetBSD to:

+ set correct path for xpm.h

+ force building and installation of static libXpm.a
@
text
@d1 3
a3 12
--- lib/Imakefile	1997/11/06 11:09:44	1.1
+++ lib/Imakefile	1997/11/06 11:10:29
@@@@ -34,8 +34,12 @@@@
 #define XpmLibDir $(USRLIBDIR)
 #endif
 #ifndef XpmIncDir
+#if defined(NetBSDArchitecture)
+#define XpmIncDir $(INCROOT)
+#else
 #define XpmIncDir $(INCDIR)
 #endif
+#endif
d5 3
a7 11
 XCOMM If not already set in top dir,
 XCOMM you can uncomment the following line to avoid building the shared lib
@@@@ -44,6 +48,10 @@@@
 #ifndef SharedLibXpm
 # define SharedLibXpm (HasSharedLibraries && \
 	!(defined(SGIArchitecture) && !SystemV4))
+#endif
+
+#if defined(NetBSDArchitecture)
+#define NormalLibXpm 1
 #endif
d9 2
a10 1
 #ifndef NormalLibXpm
@