pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics Retire old xpm package. Replaced by x11/libXpm.
details: https://anonhg.NetBSD.org/pkgsrc/rev/0c35501a3358
branches: trunk
changeset: 568692:0c35501a3358
user: joerg <joerg%pkgsrc.org@localhost>
date: Wed Dec 16 20:07:32 2009 +0000
description:
Retire old xpm package. Replaced by x11/libXpm.
diffstat:
graphics/Makefile | 3 +-
graphics/xpm/DESCR | 10 -
graphics/xpm/Makefile | 45 ----
graphics/xpm/PLIST | 10 -
graphics/xpm/buildlink3.mk | 15 -
graphics/xpm/builtin.mk | 88 ---------
graphics/xpm/distinfo | 24 --
graphics/xpm/patches/patch-aa | 25 --
graphics/xpm/patches/patch-ab | 20 --
graphics/xpm/patches/patch-ac | 40 ----
graphics/xpm/patches/patch-ad | 54 -----
graphics/xpm/patches/patch-ae | 60 ------
graphics/xpm/patches/patch-af | 233 -------------------------
graphics/xpm/patches/patch-ag | 387 ------------------------------------------
graphics/xpm/patches/patch-ah | 43 ----
graphics/xpm/patches/patch-ai | 33 ---
graphics/xpm/patches/patch-aj | 269 -----------------------------
graphics/xpm/patches/patch-ak | 208 ----------------------
graphics/xpm/patches/patch-al | 308 ---------------------------------
graphics/xpm/patches/patch-am | 32 ---
graphics/xpm/patches/patch-an | 88 ---------
graphics/xpm/patches/patch-ao | 22 --
graphics/xpm/patches/patch-ap | 103 -----------
graphics/xpm/patches/patch-aq | 13 -
graphics/xpm/patches/patch-ar | 186 --------------------
graphics/xpm/patches/patch-as | 12 -
26 files changed, 1 insertions(+), 2330 deletions(-)
diffs (truncated from 2445 to 300 lines):
diff -r 98aa6d1a1e11 -r 0c35501a3358 graphics/Makefile
--- a/graphics/Makefile Wed Dec 16 20:06:44 2009 +0000
+++ b/graphics/Makefile Wed Dec 16 20:07:32 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.544 2009/12/11 20:25:22 drochner Exp $
+# $NetBSD: Makefile,v 1.545 2009/12/16 20:07:32 joerg Exp $
#
COMMENT= Graphics tools and libraries
@@ -415,7 +415,6 @@
SUBDIR+= xpaint
SUBDIR+= xplot
SUBDIR+= xplot-devel
-SUBDIR+= xpm
SUBDIR+= xsane
SUBDIR+= xv
SUBDIR+= xzgv
diff -r 98aa6d1a1e11 -r 0c35501a3358 graphics/xpm/DESCR
--- a/graphics/xpm/DESCR Wed Dec 16 20:06:44 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-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.
diff -r 98aa6d1a1e11 -r 0c35501a3358 graphics/xpm/Makefile
--- a/graphics/xpm/Makefile Wed Dec 16 20:06:44 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.62 2009/10/14 20:06:41 zafer Exp $
-
-DISTNAME= xpm-3.4k
-PKGREVISION= 7
-CATEGORIES= graphics x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB:=libraries/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://koala.ilog.fr/lehors/xpm.html
-COMMENT= The X Pixmap library
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
-CONFLICTS+= libXpm-[0-9]*
-
-USE_FEATURES= snprintf
-USE_IMAKE= yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS" || !empty(MACHINE_PLATFORM:MIRIX-5*)
-post-install:
- cd ${PREFIX}/lib && \
- rm -f libXpm.so.4 && \
- ln -s libXpm.so.4.11 libXpm.so.4
-.endif
-
-.if ${OPSYS} == "IRIX"
-SUBST_CLASSES+= sodots
-SUBST_STAGE.sodots= post-configure
-SUBST_FILES.sodots= lib/Makefile
-SUBST_SED.sodots= -e 's,\.so$$(SOXPMLIBREV),.so.$$(SOXPMLIBREV),g'
-
-IMAKEOPTS+= -DExtraLibraries=${LIBS:Q}
-IMAKEOPTS+= -DInstallCmd=${INSTALL:Q}
-
-post-configure:
- ${MKDIR} ${WRKSRC}/usrlib
-.endif
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 98aa6d1a1e11 -r 0c35501a3358 graphics/xpm/PLIST
--- a/graphics/xpm/PLIST Wed Dec 16 20:06:44 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/02 19:47:27 jschauma Exp $
-bin/cxpm
-bin/sxpm
-lib/libXpm.a
-lib/libXpm.so
-lib/libXpm.so.4
-lib/libXpm.so.4.11
-include/X11/xpm.h
-${IMAKE_MAN_DIR}/cxpm.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/sxpm.${IMAKE_MANNEWSUFFIX}
diff -r 98aa6d1a1e11 -r 0c35501a3358 graphics/xpm/buildlink3.mk
--- a/graphics/xpm/buildlink3.mk Wed Dec 16 20:06:44 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.25 2009/03/20 19:24:46 joerg Exp $
-
-BUILDLINK_TREE+= xpm
-
-.if !defined(XPM_BUILDLINK3_MK)
-XPM_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xpm+= xpm>=3.4k
-BUILDLINK_ABI_DEPENDS.xpm+= xpm>=3.4knb6
-BUILDLINK_PKGSRCDIR.xpm?= ../../graphics/xpm
-
-.include "../../mk/x11.buildlink3.mk"
-.endif # XPM_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -xpm
diff -r 98aa6d1a1e11 -r 0c35501a3358 graphics/xpm/builtin.mk
--- a/graphics/xpm/builtin.mk Wed Dec 16 20:06:44 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-# $NetBSD: builtin.mk,v 1.16 2008/10/05 21:36:36 cube Exp $
-
-BUILTIN_PKG:= xpm
-
-BUILTIN_FIND_FILES_VAR:= H_XPM
-BUILTIN_FIND_FILES.H_XPM= ${X11BASE}/include/X11/xpm.h
-
-.include "../../mk/buildlink3/bsd.builtin.mk"
-
-###
-### Determine if there is a built-in implementation of the package and
-### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
-###
-.if !defined(IS_BUILTIN.xpm)
-IS_BUILTIN.xpm= no
-. if empty(H_XPM:M__nonexistent__)
-. if !empty(X11BASE:M*openwin) && exists(/usr/sbin/pkgchk)
-IS_BUILTIN.xpm!= \
- if /usr/sbin/pkgchk -l SUNWxwinc 2>/dev/null | ${GREP} -q xpm.h; then \
- ${ECHO} yes; \
- else \
- ${ECHO} no; \
- fi
-. elif ${OPSYS} == "IRIX"
-IS_BUILTIN.xpm= yes
-. elif ${OPSYS} == "Darwin"
-IS_BUILTIN.xpm= yes
-. else
-BUILTIN_IMAKE_CHECK:= xpm:NormalLibXpm
-. include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.xpm= ${BUILTIN_IMAKE_CHECK.xpm}
-. endif
-. endif
-.endif
-MAKEVARS+= IS_BUILTIN.xpm
-
-###
-### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
-### a package name to represent the built-in package.
-###
-.if !defined(BUILTIN_PKG.xpm) && \
- !empty(IS_BUILTIN.xpm:M[yY][eE][sS]) && \
- empty(H_XPM:M__nonexistent__)
-BUILTIN_VERSION.xpm!= \
- ${AWK} 'BEGIN { split("abcdefghijklmnopqrstuvwxyz", alpha, ""); \
- p = ".0" } \
- /\#define[ ]*XpmFormat/ { M = $$3 } \
- /\#define[ ]*XpmVersion/ { m = "."$$3 } \
- /\#define[ ]*XpmRevision/ { p = alpha[$$3] } \
- END { printf "%s%s%s\n", M, m, p }' \
- ${H_XPM}
-BUILTIN_PKG.xpm= xpm-${BUILTIN_VERSION.xpm}
-.endif
-MAKEVARS+= BUILTIN_PKG.xpm
-
-###
-### Determine whether we should use the built-in implementation if it
-### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
-###
-.if !defined(USE_BUILTIN.xpm)
-. if ${PREFER.xpm} == "pkgsrc"
-USE_BUILTIN.xpm= no
-. else
-USE_BUILTIN.xpm= ${IS_BUILTIN.xpm}
-. if defined(BUILTIN_PKG.xpm) && \
- !empty(IS_BUILTIN.xpm:M[yY][eE][sS])
-USE_BUILTIN.xpm= yes
-. for dep in ${BUILDLINK_API_DEPENDS.xpm}
-. if !empty(USE_BUILTIN.xpm:M[yY][eE][sS])
-USE_BUILTIN.xpm!= \
- if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.xpm:Q}; then \
- ${ECHO} yes; \
- else \
- ${ECHO} no; \
- fi
-. endif
-. endfor
-. endif
-. endif # PREFER.xpm
-.endif
-MAKEVARS+= USE_BUILTIN.xpm
-
-###
-### The section below only applies if we are not including this file
-### solely to determine whether a built-in implementation exists.
-###
-
-.include "../../mk/x11.builtin.mk"
diff -r 98aa6d1a1e11 -r 0c35501a3358 graphics/xpm/distinfo
--- a/graphics/xpm/distinfo Wed Dec 16 20:06:44 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: distinfo,v 1.14 2005/08/11 22:46:05 dmcmahill Exp $
-
-SHA1 (xpm-3.4k.tar.gz) = a8eac19e5772bf7b3b177353686c1401fbf334bd
-RMD160 (xpm-3.4k.tar.gz) = 65a2e58f97724a48a6834aab991341771c5a1faf
-Size (xpm-3.4k.tar.gz) = 148887 bytes
-SHA1 (patch-aa) = 33725beb53dc01b022e5110dbffab4c6a3ae65dc
-SHA1 (patch-ab) = ac9e69f618788d78a024b55c58c46c302f66ec99
-SHA1 (patch-ac) = 80c8c58a526ccc8651862d87cc5cd92d8aa9fb2d
-SHA1 (patch-ad) = d352c47831955845e5805ac737031f2ff179b0df
-SHA1 (patch-ae) = 9b11253041212c8e43c426be4729363e4f8e122a
-SHA1 (patch-af) = be7953d5baf84d2b08e89576755428d3bc57e8c2
-SHA1 (patch-ag) = 74f8e7ed98e6d6c85168464e71274dc1ecb56297
-SHA1 (patch-ah) = ffa827d23283c9e937071a202f7f7d5b7846d9d0
-SHA1 (patch-ai) = 619392a9bde70210c5f6e0fa1b7f1e278cd68bfb
-SHA1 (patch-aj) = db0de3aff27606aceb67027691cb6f55c549478a
-SHA1 (patch-ak) = 011da5204f825aaaf4aed4536cfb29a7f63efc5d
-SHA1 (patch-al) = 09ceea05f856edd3fad3aedabbdf535c9d919cd9
-SHA1 (patch-am) = 3f69a82cb9ebaa4e0fc7ce5c63a938cec31bbbd3
-SHA1 (patch-an) = f8f0602116e9000f2506230f0d65eac1171c2904
-SHA1 (patch-ao) = 7681e03f1f317ef5e694a464f1efad82d9de78c2
-SHA1 (patch-ap) = 6ccb211e9051374cf7cdb6138a6520943e1cd645
-SHA1 (patch-aq) = 6d3f3554c7d66d3d9879dc2b352310e32799926c
-SHA1 (patch-ar) = c6a5ef0af6568f519467b753aae5050a0513f99e
-SHA1 (patch-as) = f11694bc7fb300450fd07d496975bfb0fbb6b68f
diff -r 98aa6d1a1e11 -r 0c35501a3358 graphics/xpm/patches/patch-aa
--- a/graphics/xpm/patches/patch-aa Wed Dec 16 20:06:44 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$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
diff -r 98aa6d1a1e11 -r 0c35501a3358 graphics/xpm/patches/patch-ab
--- a/graphics/xpm/patches/patch-ab Wed Dec 16 20:06:44 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$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
diff -r 98aa6d1a1e11 -r 0c35501a3358 graphics/xpm/patches/patch-ac
--- a/graphics/xpm/patches/patch-ac Wed Dec 16 20:06:44 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$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
Home |
Main Index |
Thread Index |
Old Index