Mon Jan 23 08:30:02 2023 UTC ()
libXpm: Explicitly define path to gzip


(adam)
diff -r1.27 -r1.28 pkgsrc/x11/libXpm/Makefile
cvs diff -r1.27 -r1.28 pkgsrc/x11/libXpm/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libXpm/Makefile 2023/01/17 18:42:39 1.27
+++ pkgsrc/x11/libXpm/Makefile 2023/01/23 08:30:02 1.28
@@ -1,39 +1,41 @@ @@ -1,39 +1,41 @@
1# $NetBSD: Makefile,v 1.27 2023/01/17 18:42:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.28 2023/01/23 08:30:02 adam 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
15USE_TOOLS+= pkg-config xgettext 15USE_TOOLS+= gzip pkg-config xgettext
16PKGCONFIG_OVERRIDE+= xpm.pc.in 16PKGCONFIG_OVERRIDE+= xpm.pc.in
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18CONFIGURE_ENV+= APP_MAN_SUFFIX=1 18CONFIGURE_ENV+= APP_MAN_SUFFIX=1
19 19
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.
 28CONFIGURE_ENV+= XPM_PATH_GZIP=${TOOLS_GZIP_CMD}
27MAKE_ENV+= INTLLIBS=${BUILDLINK_LDADD.gettext:Q} 29MAKE_ENV+= INTLLIBS=${BUILDLINK_LDADD.gettext:Q}
28 30
29.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
30 32
31.if ${X11_TYPE} == "native" 33.if ${X11_TYPE} == "native"
32XPM_CFLAGS= -I${X11BASE}/include 34XPM_CFLAGS= -I${X11BASE}/include
33XPM_LIBS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lX11 35XPM_LIBS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lX11
34 36
35SXPM_CFLAGS= -I${X11BASE}/include 37SXPM_CFLAGS= -I${X11BASE}/include
36SXPM_LIBS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lXt -lXext 38SXPM_LIBS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lXt -lXext
37 39
38CONFIGURE_ARGS+= XPM_CFLAGS=${XPM_CFLAGS:Q} \ 40CONFIGURE_ARGS+= XPM_CFLAGS=${XPM_CFLAGS:Q} \
39 XPM_LIBS=${XPM_LIBS:Q} \ 41 XPM_LIBS=${XPM_LIBS:Q} \