19 files changed, 0 insertions, 504 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 111b4fa62ef9..92df1abe47ad 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -400,7 +400,6 @@
     SUBDIR += linux_dri
     SUBDIR += linux_dri-devel
     SUBDIR += linux_glide
-    SUBDIR += linux_glx
     SUBDIR += lodju
     SUBDIR += long-exposure-tools
     SUBDIR += lphoto
@@ -410,7 +409,6 @@
     SUBDIR += maverik
     SUBDIR += megapov
     SUBDIR += mesa-demos
-    SUBDIR += mesagl
     SUBDIR += meshviewer
     SUBDIR += metacam
     SUBDIR += metapixel
@@ -742,7 +740,6 @@
     SUBDIR += xpaint
     SUBDIR += xpcd
     SUBDIR += xpdf
-    SUBDIR += xpm
     SUBDIR += xpx
     SUBDIR += xrml
     SUBDIR += xsane
diff --git a/graphics/linux_glx/Makefile b/graphics/linux_glx/Makefile
deleted file mode 100644
index 8dc9521a2e28..000000000000
--- a/graphics/linux_glx/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# New ports collection makefile for:	linux_glx
-# Date created:         27 November 1999
-# Whom:                 Marc E E van Woerkom  <van.woerkom@netcologne.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	glx
-PORTVERSION=	991127
-PORTREVISION=	2
-CATEGORIES=	graphics linux
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	3d/glx/linux
-PKGNAMEPREFIX=	linux_
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	freebsd-emulation@FreeBSD.org
-COMMENT=	Libraries to make use of glx-aware Linux apps
-
-BUILD_DEPENDS=	${LINUX_BASE_PORT}
-
-USE_BZIP2=	yes
-NO_BUILD=	yes
-
-USE_LINUX=	yes
-USE_LINUX_PREFIX=yes
-
-WRKSRC=		${WRKDIR}/linux_glx
-
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
-IGNORE=		"Requires XFree86 3.3.* - will not work with XFree86 4.*"
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/libGL.so ${PREFIX}/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/libGLU.so ${PREFIX}/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/libglut.so ${PREFIX}/lib
-post-install:
-	@${LINUXBASE}/sbin/ldconfig
-
-.include <bsd.port.post.mk>
diff --git a/graphics/linux_glx/distinfo b/graphics/linux_glx/distinfo
deleted file mode 100644
index 5d48608b7475..000000000000
--- a/graphics/linux_glx/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (linux_glx-991127.tar.bz2) = d6d0d52dceeab12013cdc76891fcf33d
-SIZE (linux_glx-991127.tar.bz2) = 253847
diff --git a/graphics/linux_glx/pkg-descr b/graphics/linux_glx/pkg-descr
deleted file mode 100644
index db0deac1796b..000000000000
--- a/graphics/linux_glx/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-libraries to make use of glx aware Linux apps
-
-created by Ralph Giles and Steve Reid
-
-
-WWW: http://people.FreeBSD.org/~3d/distfiles/glx/linux/
-
-Marc E E van Woerkom  <3d@freebsd.org>
diff --git a/graphics/linux_glx/pkg-plist b/graphics/linux_glx/pkg-plist
deleted file mode 100644
index 515a358335a5..000000000000
--- a/graphics/linux_glx/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-lib/libGL.so
-lib/libGL.so.1
-lib/libGLU.so
-lib/libGLU.so.3
-lib/libglut.so
-lib/libglut.so.3
-@exec %D/sbin/ldconfig
-@unexec %D/sbin/ldconfig
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
deleted file mode 100644
index 0dfe0ab951fc..000000000000
--- a/graphics/mesagl/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# New ports collection makefile for:    Mesa
-# Date created:         Tue Feb  7 12:02:49  1995
-# Whom:                 hsu
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Mesa
-PORTVERSION=	5.0.2
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
-MASTER_SITE_SUBDIR=	mesa3d
-DISTFILES=	MesaLib-${PORTVERSION}${EXTRACT_SUFX} \
-		MesaDemos-${PORTVERSION}${EXTRACT_SUFX}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A graphics library similar to SGI's OpenGL
-
-CONFLICTS=	XFree86-libraries-[4-9]* xorg-libraries-[6-9]*
-
-USE_BZIP2=	yes
-USE_LDCONFIG=	yes
-
-.if defined(WANT_GGI)
-LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
-CONFIGURE_ARGS+=--with-ggi=${LOCALBASE}
-.endif
-
-USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_ENV+=	GLVER="${GLVER}" LIBS="-lm"
-SUB_GL=		src si-glu src-glu
-INCLUDE_GL=	include
-GLVER=		14
-MAKE_ENV+=	SUB_GL="${SUB_GL}"		\
-		INCLUDE_GL=${INCLUDE_GL}
-
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
-IGNORE=		is unnecessary because libGL and libGLU come with XFree86 4.0 and higher
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-
-post-install:
-.for lib in GL GLU
-	@${LN} -sf ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/libMesa${lib}.so
-.endfor
-
-.include <bsd.port.post.mk>
diff --git a/graphics/mesagl/distinfo b/graphics/mesagl/distinfo
deleted file mode 100644
index 894b002d8ad3..000000000000
--- a/graphics/mesagl/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (MesaLib-5.0.2.tar.bz2) = 7b4bf9261657c2fca03796d4955e6f50
-SHA256 (MesaLib-5.0.2.tar.bz2) = e63d42092d65dac4d1b2493a5c14ec0bcb1d3b8dfe6769e0ca4914b559aa5eb3
-SIZE (MesaLib-5.0.2.tar.bz2) = 1719544
-MD5 (MesaDemos-5.0.2.tar.bz2) = b81fafff90995025d2f25ea02b786642
-SHA256 (MesaDemos-5.0.2.tar.bz2) = 7e5ec6d2e524cdd765171742156185974955e4b164b26df66adb9d84c46226dc
-SIZE (MesaDemos-5.0.2.tar.bz2) = 901632
diff --git a/graphics/mesagl/files/patch-aa b/graphics/mesagl/files/patch-aa
deleted file mode 100644
index d63f547591fc..000000000000
--- a/graphics/mesagl/files/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
---- configure.orig	Fri Nov  7 12:00:34 2003
-+++ configure	Thu Mar  2 16:13:38 2006
-@@ -1885,10 +1885,10 @@
- 
- # For Mesa-specific libs like libOSMesa.
- LIBMESA_VERSION_INFO=4:${MESA_VERSION}:0    # Mesa 5.0.2
--LIBGL_VERSION_INFO=5:${MESA_VERSION}:4      # OpenGL 1.4
--LIBGLU_VERSION_INFO=2:${MESA_VERSION}:1     # GLU 1.1
--SI_GLU_VERSION_INFO=4:${MESA_VERSION}:3     # GLU 1.3
--LIBGLUT_VERSION_INFO=10:1:7                 # GLUT 3.7
-+LIBGL_VERSION_INFO=${GLVER}:0
-+LIBGLU_VERSION_INFO=${GLVER}:0
-+SI_GLU_VERSION_INFO=${GLVER}:0
-+LIBGLUT_VERSION_INFO=${GLUTVER}:0
- 
- 
- 
-@@ -7920,6 +7920,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8849,7 +8850,7 @@
- 
-     echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--    CFLAGS="$CFLAGS -D_REENTRANT -DPTHREADS"
-+    CFLAGS="$CFLAGS -D_THREAD_SAFE -D_REENTRANT -DPTHREADS"
-     THREAD_LIBS="$THREAD_LIBS -lpthread"
- else
-   echo "$as_me: failed program was:" >&5
diff --git a/graphics/mesagl/files/patch-ad b/graphics/mesagl/files/patch-ad
deleted file mode 100644
index 1d3a45ba3641..000000000000
--- a/graphics/mesagl/files/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in	2003/05/01 18:09:21	1.1
-+++ Makefile.in	2003/05/01 18:10:49
-@@ -113,8 +113,8 @@
- @USE_SI_GLU_TRUE@sel_sub_glu = si-glu
- @USE_SI_GLU_FALSE@sel_sub_glu = src-glu
- 
--DIST_SUBDIRS = include src si-glu src-glu @glut_dir@ $(SUB_DEMOS) util
--SUBDIRS = include src $(sel_sub_glu) $(sel_sub_glut) $(sel_sub_demos) util
-+DIST_SUBDIRS = $(INCLUDE_GL) $(SUB_GL) $(SUB_DEMOS) util
-+SUBDIRS = $(INCLUDE_GL) $(SUB_GL) $(sel_sub_demos) util
- 
- EXTRA_DIST =  	3Dfx 	BeOS 	OpenStep 	WIN32 	docs 	ggi 	images 	m4 	macos 	mtdemos 	src-glut.beos 	src-glut.dja 	tests 	vms 	widgets-mesa 	widgets-sgi 	bootstrap 	MESADOS.BAT 	MESAFX.BAT 	Make-config 	Makefile.DJ 	Makefile.X11 	Makefile.dja 	Makefile.win 	Mingw32.bat 	Names.win 	STARTUP.MK 	common.dja 	descrip.mms 	fixam 	mesaw32.BAT 	mesawin32.mak 	mms-config 	win32-openstep.sh 	xlib.opt
- 
diff --git a/graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in b/graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in
deleted file mode 100644
index b85f82fabfda..000000000000
--- a/graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- si-glu/libnurbs/interface/Makefile.in.orig	Fri Nov  7 11:58:16 2003
-+++ si-glu/libnurbs/interface/Makefile.in	Thu Mar  2 16:38:17 2006
-@@ -201,7 +201,7 @@
- 
- # Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging
- # switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.
--AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG
-+AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG @CXXFLAGS@
- libNIFac_la_SOURCES = \
- 	bezierEval.cc \
- 	bezierEval.h \
diff --git a/graphics/mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in b/graphics/mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in
deleted file mode 100644
index c5b1372096ea..000000000000
--- a/graphics/mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- si-glu/libnurbs/internals/Makefile.in.orig	Fri Nov  7 11:58:17 2003
-+++ si-glu/libnurbs/internals/Makefile.in	Thu Mar  2 16:44:45 2006
-@@ -201,7 +201,7 @@
- 
- # Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging
- # switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.
--AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG
-+AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG @CXXFLAGS@
- libNInt_la_SOURCES = \
- 	arc.cc \
- 	arc.h \
diff --git a/graphics/mesagl/pkg-descr b/graphics/mesagl/pkg-descr
deleted file mode 100644
index 47eecf190e50..000000000000
--- a/graphics/mesagl/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Mesa is a 3-D graphics library with an API which is very similar to that
-of OpenGL*.  To the extent that Mesa utilizes the OpenGL command syntax
-or state machine, it is being used with authorization from Silicon Graphics,
-Inc.  However, the author makes no claim that Mesa is in any way a
-compatible replacement for OpenGL or associated with Silicon Graphics, Inc.
-Those who want a licensed implementation of OpenGL should contact a licensed
-vendor.
-
-paulo@isr.uc.pt
-
-WWW: http://www.mesa3d.org/
diff --git a/graphics/mesagl/pkg-plist b/graphics/mesagl/pkg-plist
deleted file mode 100644
index bb2b2a242556..000000000000
--- a/graphics/mesagl/pkg-plist
+++ /dev/null
@@ -1,27 +0,0 @@
-etc/mesa.conf
-include/GL/gl.h
-include/GL/gl_mangle.h
-include/GL/glu.h
-include/GL/glu_mangle.h
-include/GL/glx.h
-include/GL/glx_mangle.h
-include/GL/glext.h
-include/GL/glut.h
-include/GL/glutf90.h
-include/GL/glxext.h
-include/GL/osmesa.h
-include/GL/xmesa.h
-include/GL/xmesa_x.h
-include/GL/xmesa_xf86.h
-lib/libGL.la
-lib/libGL.so
-lib/libGL.so.14
-lib/libGLU.la
-lib/libGLU.so
-lib/libGLU.so.14
-lib/libMesaGL.so
-lib/libMesaGLU.so
-lib/libOSMesa.la
-lib/libOSMesa.so
-lib/libOSMesa.so.4
-@dirrm include/GL
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
deleted file mode 100644
index eaab703a55fb..000000000000
--- a/graphics/xpm/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:	xpm
-# Date created:		14 September 1994
-# Whom:			jkh
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xpm
-PORTVERSION=	3.4k
-PORTREVISION=	1
-CATEGORIES=	graphics x11
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	libraries
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The X Pixmap library
-
-CONFLICTS=	XFree86-libraries-[0-9]* xorg-libraries-[0-9]*
-
-USE_IMAKE=	yes
-USE_LDCONFIG=	yes
-
-MAN1=		cxpm.1 sxpm.1
-
-.ifdef USE_XPM
-IGNORE=	Cannot install: you have the `USE_XPM' variable defined either in environment or in make(1) arguments. Please undefine and try again
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
-IGNORE=		is included in XFree86 >3.x
-.endif
-
-post-install:
-	@ranlib ${PREFIX}/lib/libXpm.a
-
-.include <bsd.port.post.mk>
diff --git a/graphics/xpm/distinfo b/graphics/xpm/distinfo
deleted file mode 100644
index 26bc1f3f917c..000000000000
--- a/graphics/xpm/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xpm-3.4k.tar.gz) = dd7c6df259912646671ab8cbd3fcafd7
-SHA256 (xpm-3.4k.tar.gz) = 39ffe9eb0b9cb3c7e9386caa189a540173b03014ccbd2c1e5574a321b1dbd47f
-SIZE (xpm-3.4k.tar.gz) = 148887
diff --git a/graphics/xpm/files/patch-ab b/graphics/xpm/files/patch-ab
deleted file mode 100644
index ed4037061b8a..000000000000
--- a/graphics/xpm/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-*** sxpm/Imakefile.orig	Thu Mar 19 20:51:01 1998
---- sxpm/Imakefile	Sun Jun 13 14:19:16 1999
-***************
-*** 96,98 ****
---- 96,100 ----
-  clean::	
-  	$(RM) sxpmout.xpm
-  
-+ XCOMM unset LDPRELIBS to ensure we link with local lib not system lib
-+ LDPRELIBS=
diff --git a/graphics/xpm/files/patch-security-1 b/graphics/xpm/files/patch-security-1
deleted file mode 100644
index 29764dc0ceed..000000000000
--- a/graphics/xpm/files/patch-security-1
+++ /dev/null
@@ -1,193 +0,0 @@
-diff -ruN lib/Attrib.c xpm-3.4k/lib/Attrib.c
---- lib/Attrib.c	Thu Oct 21 11:22:53 2004
-+++ xpm-3.4k/lib/Attrib.c	Thu Oct 21 11:25:18 2004
-@@ -52,6 +52,8 @@
-     XpmColor **colorTable, **color;
-     int a;
- 
-+    if (ncolors > INT_MAX/sizeof(XpmColor *))
-+	return (XpmNoMemory);
-     colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
-     if (!colorTable) {
- 	*oldct = NULL;
-diff -ruN lib/CrDatFrI.c xpm-3.4k/lib/CrDatFrI.c
---- lib/CrDatFrI.c	Thu Oct 21 11:22:53 2004
-+++ xpm-3.4k/lib/CrDatFrI.c	Thu Oct 21 11:26:32 2004
-@@ -123,6 +123,8 @@
-      */
-     header_nlines = 1 + image->ncolors;
-     header_size = sizeof(char *) * header_nlines;
-+    if (header_size > INT_MAX/sizeof(char *))
-+	return (XpmNoMemory);
-     header = (char **) XpmCalloc(header_size, sizeof(char *));
-     if (!header)
- 	return (XpmNoMemory);
-diff -ruN lib/XpmI.h xpm-3.4k/lib/XpmI.h
---- lib/XpmI.h	Thu Oct 21 11:22:54 2004
-+++ xpm-3.4k/lib/XpmI.h	Thu Oct 21 11:24:23 2004
-@@ -48,6 +48,7 @@
-  * lets try to solve include files
-  */
- 
-+#include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
- /* stdio.h doesn't declare popen on a Sequent DYNIX OS */
-diff -ruN lib/create.c xpm-3.4k/lib/create.c
---- lib/create.c	Thu Oct 21 11:22:53 2004
-+++ xpm-3.4k/lib/create.c	Thu Oct 21 12:06:56 2004
-@@ -820,6 +820,8 @@
-     ErrorStatus = XpmSuccess;
- 
-     /* malloc pixels index tables */
-+    if (image->ncolors > INT_MAX/sizeof(Pixel))
-+	return (XpmNoMemory);
-     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors);
-     if (!image_pixels)
- 	return (XpmNoMemory);
-@@ -992,6 +994,10 @@
- 
- #if !defined(FOR_MSW) && !defined(AMIGA)
-     /* now that bytes_per_line must have been set properly alloc data */
-+    if (height != 0 && (*image_return)->bytes_per_line > INT_MAX/height) {
-+	XDestroyImage(*image_return);
-+	return (XpmNoMemory);
-+    }
-     (*image_return)->data =
- 	(char *) XpmMalloc((*image_return)->bytes_per_line * height);
- 
-@@ -2063,6 +2069,8 @@
- 	xpmGetCmt(data, &colors_cmt);
- 
-     /* malloc pixels index tables */
-+    if (ncolors > INT_MAX/sizeof(Pixel))
-+	RETURN(XpmNoMemory);
-     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors);
-     if (!image_pixels)
- 	RETURN(XpmNoMemory);
-@@ -2364,7 +2372,7 @@
- 
- 	    /* array of pointers malloced by need */
- 	    unsigned short *cidx[256];
--	    int char1;
-+	    unsigned int char1;
- 
- 	    bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */
- 	    for (a = 0; a < ncolors; a++) {
-diff -ruN lib/hashtab.c xpm-3.4k/lib/hashtab.c
---- lib/hashtab.c	Thu Oct 21 11:22:54 2004
-+++ xpm-3.4k/lib/hashtab.c	Thu Oct 21 12:08:24 2004
-@@ -144,6 +144,8 @@
-     HASH_TABLE_GROWS
- 	table->size = size;
-     table->limit = size / 3;
-+    if (size > INT_MAX/sizeof(*atomTable))
-+	return (XpmNoMemory);
-     atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
-     if (!atomTable)
- 	return (XpmNoMemory);
-@@ -204,6 +206,8 @@
-     table->size = INITIAL_HASH_SIZE;
-     table->limit = table->size / 3;
-     table->used = 0;
-+    if (table->size > INT_MAX/sizeof(*atomTable))
-+	return (XpmNoMemory);
-     atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
-     if (!atomTable)
- 	return (XpmNoMemory);
-diff -ruN lib/parse.c xpm-3.4k/lib/parse.c
---- lib/parse.c	Thu Oct 21 11:22:54 2004
-+++ xpm-3.4k/lib/parse.c	Thu Oct 21 13:01:11 2004
-@@ -183,6 +183,8 @@
-     char **defaults;
-     int ErrorStatus;
- 
-+    if (ncolors > INT_MAX/sizeof(XpmColor))
-+	return (XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
-     if (!colorTable)
- 	return (XpmNoMemory);
-@@ -194,6 +196,8 @@
- 	    /*
- 	     * read pixel value
- 	     */
-+	    if (cpp > INT_MAX-1)
-+		return (XpmNoMemory);
- 	    color->string = (char *) XpmMalloc(cpp + 1);
- 	    if (!color->string) {
- 		xpmFreeColorTable(colorTable, ncolors);
-@@ -276,6 +280,8 @@
- 	    /*
- 	     * read pixel value
- 	     */
-+	    if (cpp > INT_MAX-1)
-+		return (XpmNoMemory);
- 	    color->string = (char *) XpmMalloc(cpp + 1);
- 	    if (!color->string) {
- 		xpmFreeColorTable(colorTable, ncolors);
-@@ -338,6 +344,8 @@
-     unsigned int *iptr, *iptr2;
-     unsigned int a, x, y;
- 
-+    if (height != 0 && width > INT_MAX/sizeof(unsigned int))
-+	return (XpmNoMemory);
- #ifndef FOR_MSW
-     iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height);
- #else
-@@ -391,7 +399,7 @@
- 
- 	    /* array of pointers malloced by need */
- 	    unsigned short *cidx[256];
--	    int char1;
-+	    unsigned int char1;
- 
- 	    bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */
- 	    for (a = 0; a < ncolors; a++) {
-diff -ruN lib/scan.c xpm-3.4k/lib/scan.c
---- lib/scan.c	Thu Oct 21 11:22:54 2004
-+++ xpm-3.4k/lib/scan.c	Thu Oct 21 13:19:05 2004
-@@ -228,11 +228,16 @@
-     else
- 	cpp = 0;
- 
-+    if ((height != 0 && width > INT_MAX/height) ||
-+      (width*height > INT_MAX/sizeof(unsigned int)))
-+	RETURN(XpmNoMemory);
-     pmap.pixelindex =
- 	(unsigned int *) XpmCalloc(width * height, sizeof(unsigned int));
-     if (!pmap.pixelindex)
- 	RETURN(XpmNoMemory);
- 
-+    if (pmap.size > INT_MAX/sizeof(Pixel))
-+	RETURN(XpmNoMemory);
-     pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
-     if (!pmap.pixels)
- 	RETURN(XpmNoMemory);
-@@ -297,7 +302,8 @@
-      * get rgb values and a string of char, and possibly a name for each
-      * color
-      */
--
-+    if (pmap.ncolors > INT_MAX/sizeof(XpmColor))
-+	RETURN(XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
-     if (!colorTable)
- 	RETURN(XpmNoMemory);
-@@ -356,6 +362,8 @@
- 
-     /* first get a character string */
-     a = 0;
-+    if (cpp > INT_MAX-1)
-+	return (XpmNoMemory);
-     if (!(s = color->string = (char *) XpmMalloc(cpp + 1)))
- 	return (XpmNoMemory);
-     *s++ = printable[c = a % MAXPRINTABLE];
-@@ -447,6 +455,8 @@
-     }
- 
-     /* first get character strings and rgb values */
-+    if (ncolors > INT_MAX/sizeof(XColor) || cpp > INT_MAX-1)
-+	return (XpmNoMemory);
-     xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
-     if (!xcolors)
- 	return (XpmNoMemory);
diff --git a/graphics/xpm/pkg-descr b/graphics/xpm/pkg-descr
deleted file mode 100644
index 0b22c45275c1..000000000000
--- a/graphics/xpm/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Here is an extract from the README file:
-
- * Copyright (C) 1989-94 GROUPE BULL
-
-                                XPM Version 3
-
-WHAT IS XPM?
-============
-
-XPM (X PixMap) is a format for storing/retrieving X pixmaps to/from files.
-
-Here is provided a library containing a set of four functions, similar to the
-X bitmap functions as defined in the Xlib: XpmCreatePixmapFromData,
-XpmCreateDataFromPixmap, XpmReadFileToPixmap and XpmWriteFileFromPixmap for
-respectively including, storing, reading and writing this format, plus four
-other: XpmCreateImageFromData, XpmCreateDataFromImage, XpmReadFileToImage and
-XpmWriteFileFromImage for working with images instead of pixmaps.
-
-WWW: http://koala.ilog.fr/lehors/xpm.html
diff --git a/graphics/xpm/pkg-plist b/graphics/xpm/pkg-plist
deleted file mode 100644
index 86c7c55f4ca0..000000000000
--- a/graphics/xpm/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/cxpm
-bin/sxpm
-include/X11/xpm.h
-lib/libXpm.a
-lib/libXpm.so
-lib/libXpm.so.4