From 461629ada2bd8e661f0bbcf7f294369e5a5d716b Mon Sep 17 00:00:00 2001 From: mrg Date: Thu, 19 Jan 2023 05:31:34 +0000 Subject: updates for libXpm 3.5.15. --- external/mit/xorg/bin/cxpm/Makefile | 5 ++-- external/mit/xorg/bin/sxpm/Makefile | 4 ++- external/mit/xorg/lib/libXpm/Makefile | 52 ++++++++++++++++++++++++++++++++--- external/mit/xorg/lib/libXpm/xpm.mk | 6 ++++ 4 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 external/mit/xorg/lib/libXpm/xpm.mk (limited to 'external/mit') diff --git a/external/mit/xorg/bin/cxpm/Makefile b/external/mit/xorg/bin/cxpm/Makefile index 3438119da49..d6b73edfe39 100644 --- a/external/mit/xorg/bin/cxpm/Makefile +++ b/external/mit/xorg/bin/cxpm/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2013/05/31 01:41:08 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2023/01/19 05:31:34 mrg Exp $ .include PROG= cxpm CPPFLAGS+= -I${X11SRCDIR.Xpm}/src -CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 LDADD+= -lXpm -lXt -lSM -lICE -lXext -lX11 DPADD+= ${LIBXPM} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} @@ -13,5 +12,7 @@ DPADD+= ${LIBXPM} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} .PATH: ${X11SRCDIR.Xpm}/${PROG} .PATH: ${X11SRCDIR.Xpm}/man +.include "${NETBSDSRCDIR}/external/mit/xorg/lib/libXpm/xpm.mk" + .include .include diff --git a/external/mit/xorg/bin/sxpm/Makefile b/external/mit/xorg/bin/sxpm/Makefile index b281428b999..097d155d495 100644 --- a/external/mit/xorg/bin/sxpm/Makefile +++ b/external/mit/xorg/bin/sxpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/05/31 01:41:56 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2023/01/19 05:31:34 mrg Exp $ .include @@ -13,5 +13,7 @@ DPADD+= ${LIBXPM} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} .PATH: ${X11SRCDIR.Xpm}/${PROG} .PATH: ${X11SRCDIR.Xpm}/man +.include "${NETBSDSRCDIR}/external/mit/xorg/lib/libXpm/xpm.mk" + .include .include diff --git a/external/mit/xorg/lib/libXpm/Makefile b/external/mit/xorg/lib/libXpm/Makefile index e41402902fe..8585aa109be 100644 --- a/external/mit/xorg/lib/libXpm/Makefile +++ b/external/mit/xorg/lib/libXpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2021/11/16 09:25:52 nia Exp $ +# $NetBSD: Makefile,v 1.4 2023/01/19 05:31:34 mrg Exp $ USE_FORT?= yes # data-driven bugs? @@ -17,14 +17,58 @@ SRCS= Attrib.c CrBufFrI.c CrBufFrP.c CrDatFrI.c CrDatFrP.c \ INCS= xpm.h INCSDIR=${X11INCDIR}/X11 -CPPFLAGS+=-DHAS_SNPRINTF -CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 - LIBDPLIBS=\ Xext ${.CURDIR}/../libXext \ X11 ${.CURDIR}/../libX11/dynamic PKGDIST= ${LIB} +.include "xpm.mk" + +.if 0 # not yet +MAN= \ + XpmAttributesSize.3 \ + XpmCreateBuffer.3 \ + XpmCreateBufferFromImage.3 \ + XpmCreateBufferFromPixmap.3 \ + XpmCreateBufferFromXpmImage.3 \ + XpmCreateData.3 \ + XpmCreateDataFromImage.3 \ + XpmCreateDataFromPixmap.3 \ + XpmCreateDataFromXpmImage.3 \ + XpmCreateImage.3 \ + XpmCreateImageFromBuffer.3 \ + XpmCreateImageFromData.3 \ + XpmCreateImageFromXpmImage.3 \ + XpmCreatePixmap.3 \ + XpmCreatePixmapFromBuffer.3 \ + XpmCreatePixmapFromData.3 \ + XpmCreatePixmapFromXpmImage.3 \ + XpmCreateXpmImage.3 \ + XpmCreateXpmImageFromBuffer.3 \ + XpmCreateXpmImageFromData.3 \ + XpmCreateXpmImageFromImage.3 \ + XpmCreateXpmImageFromPixmap.3 \ + XpmFree.3 \ + XpmFreeAttributes.3 \ + XpmFreeExtensions.3 \ + XpmFreeXpmImage.3 \ + XpmFreeXpmInfo.3 \ + XpmGetErrorString.3 \ + XpmLibraryVersion.3 \ + XpmMisc.3 \ + XpmRead.3 \ + XpmReadFileToBuffer.3 \ + XpmReadFileToData.3 \ + XpmReadFileToImage.3 \ + XpmReadFileToPixmap.3 \ + XpmReadFileToXpmImage.3 \ + XpmWrite.3 \ + XpmWriteFileFromBuffer.3 \ + XpmWriteFileFromImage.3 \ + XpmWriteFileFromPixmap.3 \ + XpmWriteFileFromXpmImage.3 +.endif + .include .include diff --git a/external/mit/xorg/lib/libXpm/xpm.mk b/external/mit/xorg/lib/libXpm/xpm.mk new file mode 100644 index 00000000000..e73aed99487 --- /dev/null +++ b/external/mit/xorg/lib/libXpm/xpm.mk @@ -0,0 +1,6 @@ + +CPPFLAGS+= -DHAS_SNPRINTF +CPPFLAGS+= -DXPM_PATH_COMPRESS=\"/usr/bin/compress\" +CPPFLAGS+= -DXPM_PATH_GZIP=\"/usr/bin/gzip\" +CPPFLAGS+= -DXPM_PATH_UNCOMPRESS=\"/usr/bin/uncompress\" +CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -- cgit