Thu Mar 2 07:52:30 2023 UTC ()
libXpm: wire down path to uncompress(1) as well


(tnn)
diff -r1.29 -r1.30 pkgsrc/x11/libXpm/Makefile
cvs diff -r1.29 -r1.30 pkgsrc/x11/libXpm/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libXpm/Makefile 2023/02/10 09:07:22 1.29
+++ pkgsrc/x11/libXpm/Makefile 2023/03/02 07:52:30 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.29 2023/02/10 09:07:22 tnn Exp $ 1# $NetBSD: Makefile,v 1.30 2023/03/02 07:52:30 tnn Exp $
2 2
3DISTNAME= libXpm-3.5.15 3DISTNAME= libXpm-3.5.15
4CATEGORIES= x11 graphics 4CATEGORIES= x11 graphics
5MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 5MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://xorg.freedesktop.org/ 9HOMEPAGE= https://xorg.freedesktop.org/
10COMMENT= X PixMap Library from modular Xorg X11 10COMMENT= X PixMap Library from modular Xorg X11
11 11
12CONFLICTS+= xpm-[0-9]* 12CONFLICTS+= xpm-[0-9]*
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
@@ -20,26 +20,27 @@ CONFIGURE_ENV+= APP_MAN_SUFFIX=1 @@ -20,26 +20,27 @@ CONFIGURE_ENV+= APP_MAN_SUFFIX=1
20# Don't allow the configure script to find libintl.so or else the resulting 20# Don't allow the configure script to find libintl.so or else the resulting
21# libXpm will be linked against it, which is not necessary. Instead, just 21# libXpm will be linked against it, which is not necessary. Instead, just
22# pass down INTLLIBS in the build environment for use by the [cs]xpm 22# pass down INTLLIBS in the build environment for use by the [cs]xpm
23# Makefiles. 23# Makefiles.
24# 24#
25USE_EXPLICIT_LIBDEPS= no 25USE_EXPLICIT_LIBDEPS= no
26CONFIGURE_ENV+= ac_cv_search_gettext=no 26CONFIGURE_ENV+= ac_cv_search_gettext=no
27# Explicitly define path to gzip. 27# Explicitly define path to gzip.
28CONFIGURE_ENV+= XPM_PATH_GZIP=${TOOLS_GZIP_CMD} 28CONFIGURE_ENV+= XPM_PATH_GZIP=${TOOLS_GZIP_CMD}
29# compress(1) is not a tool known to pkgsrc. Just force the typical 29# compress(1) is not a tool known to pkgsrc. Just force the typical
30# path of the tool for now. Linux systems usually do not have compress(1) 30# path of the tool for now. Linux systems usually do not have compress(1)
31# installed by default and that bombs the configure phase. 31# installed by default and that bombs the configure phase.
32CONFIGURE_ENV+= XPM_PATH_COMPRESS=/usr/bin/compress 32CONFIGURE_ENV+= XPM_PATH_COMPRESS=/usr/bin/compress
 33CONFIGURE_ENV+= XPM_PATH_UNCOMPRESS=/usr/bin/uncompress
33MAKE_ENV+= INTLLIBS=${BUILDLINK_LDADD.gettext:Q} 34MAKE_ENV+= INTLLIBS=${BUILDLINK_LDADD.gettext:Q}
34 35
35.include "../../mk/bsd.prefs.mk" 36.include "../../mk/bsd.prefs.mk"
36 37
37.if ${X11_TYPE} == "native" 38.if ${X11_TYPE} == "native"
38XPM_CFLAGS= -I${X11BASE}/include 39XPM_CFLAGS= -I${X11BASE}/include
39XPM_LIBS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lX11 40XPM_LIBS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lX11
40 41
41SXPM_CFLAGS= -I${X11BASE}/include 42SXPM_CFLAGS= -I${X11BASE}/include
42SXPM_LIBS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lXt -lXext 43SXPM_LIBS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lXt -lXext
43 44
44CONFIGURE_ARGS+= XPM_CFLAGS=${XPM_CFLAGS:Q} \ 45CONFIGURE_ARGS+= XPM_CFLAGS=${XPM_CFLAGS:Q} \
45 XPM_LIBS=${XPM_LIBS:Q} \ 46 XPM_LIBS=${XPM_LIBS:Q} \