head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.10
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.8
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2011Q4:1.4.0.6
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q2:1.4.0.4
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2009Q4:1.4.0.2
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2009Q3:1.3.0.40
	pkgsrc-2009Q3-base:1.3
	pkgsrc-2009Q2:1.3.0.38
	pkgsrc-2009Q2-base:1.3
	pkgsrc-2009Q1:1.3.0.36
	pkgsrc-2009Q1-base:1.3
	pkgsrc-2008Q4:1.3.0.34
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.32
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.30
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.28
	pkgsrc-2008Q2-base:1.3
	cwrapper:1.3.0.26
	pkgsrc-2008Q1:1.3.0.24
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.22
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.20
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.18
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.16
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.14
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.12
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.10
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.8
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.6
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.4
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.2
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.2.0.20
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.18
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.16
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.14
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.2.0.12
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.2.0.10
	pkgsrc-2003Q4-base:1.2
	netbsd-1-6-1:1.2.0.6
	netbsd-1-6-1-base:1.2
	netbsd-1-6:1.2.0.8
	netbsd-1-6-RELEASE-base:1.2
	pkgviews:1.2.0.4
	pkgviews-base:1.2
	buildlink2:1.2.0.2
	buildlink2-base:1.2
	netbsd-1-5-PATCH003:1.2
	netbsd-1-5-PATCH001:1.1
	netbsd-1-5-RELEASE:1.1
	netbsd-1-4-PATCH003:1.1
	netbsd-1-4-PATCH002:1.1;
locks; strict;
comment	@# @;


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

1.3
date	2005.06.14.18.10.37;	author jlam;	state Exp;
branches;
next	1.2;

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

1.1
date	99.10.31.10.46.31;	author mrg;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Retire old xpm package. Replaced by x11/libXpm.
@
text
@$NetBSD: patch-ac,v 1.3 2005/06/14 18:10:37 jlam Exp $

--- lib/Imakefile.orig	1998-03-19 14:50:59.000000000 -0500
+++ lib/Imakefile
@@@@ -34,7 +34,7 @@@@ XCOMM default locations
 #define XpmLibDir $(USRLIBDIR)
 #endif
 #ifndef XpmIncDir
-#define XpmIncDir $(INCDIR)
+#define XpmIncDir $(PROJECTROOT)/include
 #endif
 
 XCOMM If not already set in top dir,
@@@@ -55,7 +55,7 @@@@ REQUIREDLIBS = $(XLIB)
 #endif
 
 XCOMM on Dec Alpha we need to define the following to build the shared library
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && defined(ModernOSF1)
 REQUIREDLIBS = $(LDPRELIB) $(XLIB)
 SO_REQLIBS = -lX11 -lc
 #endif
@@@@ -104,13 +104,15 @@@@ HEADERS = xpm.h
 	 CrBufFrI.c CrDatFrP.c CrPFrBuf.c RdFToI.c WrFFrI.c \
 	 CrBufFrP.c CrIFrBuf.c CrPFrDat.c RdFToP.c WrFFrP.c \
 	 CrDatFrI.c CrIFrDat.c RdFToDat.c WrFFrDat.c \
-	 Attrib.c CrIFrP.c CrPFrI.c Image.c Info.c RdFToBuf.c WrFFrBuf.c
+	 Attrib.c CrIFrP.c CrPFrI.c Image.c Info.c RdFToBuf.c WrFFrBuf.c \
+	 s_popen.c
 
   OBJS = data.o create.o misc.o rgb.o scan.o parse.o hashtab.o \
 	 CrBufFrI.o CrDatFrP.o CrPFrBuf.o RdFToI.o WrFFrI.o \
 	 CrBufFrP.o CrIFrBuf.o CrPFrDat.o RdFToP.o WrFFrP.o \
 	 CrDatFrI.o CrIFrDat.o RdFToDat.o WrFFrDat.o \
-	 Attrib.o CrIFrP.o CrPFrI.o Image.o Info.o RdFToBuf.o WrFFrBuf.o
+	 Attrib.o CrIFrP.o CrPFrI.o Image.o Info.o RdFToBuf.o WrFFrBuf.o \
+	 s_popen.o
 
        INCLUDES = -I.
        LINTLIBS = $(LINTXTOLL) $(LINTXLIB) 
@


1.3
log
@Apply fixes derived from the HEAD branch of X.Org (6.8.99) to address
problems noted in CAN-2004-0914:

    Multiple vulnerabilities in libXpm for 6.8.1 and earlier, as
    used in XFree86 and other packages, include (1) multiple integer
    overflows, (2) out-of-bounds memory accesses, (3) directory
    traversal, (4) shell metacharacter, (5) endless loops, and (6)
    memory leaks, which could allow remote attackers to obtain
    sensitive information, cause a denial of service (application
    crash), or execute arbitary code via a certain XPM image file.

Bump PKGREVISION to 4.  Since this is a security-related fix, also
bump the BUILDLINK_RECOMMENDED version for this package.
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@Install "Xpm.h" to "include/X11" instead of "include/X11/X11" under
OpenWindows to avoid build lossage in several packages.
@
text
@d3 3
a5 3
--- lib/Imakefile.orig	Thu Mar 19 20:50:59 1998
+++ lib/Imakefile	Fri Jul  6 23:02:49 2001
@@@@ -34,7 +34,7 @@@@
d14 1
a14 1
@@@@ -55,7 +55,7 @@@@
d23 18
@


1.1
log
@make sure we apply OSF/DUh/Tru64 UNIX parts of Imakefiles only on those
platforms (ie, not just `AlphaArchitecture').  this showed up under
xpkgwedge where it was attempting to link in -lXext but not finding it.
@
text
@d3 11
a13 2
--- lib/Imakefile.orig	Fri Mar 20 06:50:59 1998
+++ lib/Imakefile	Sun Oct 31 21:39:04 1999
@