Wed Dec 16 19:57:47 2009 UTC ()
Allow buildling x11/libXpm with old X11_TYPE=native to replace
graphics/xpm.


(joerg)
diff -r1.8 -r1.9 pkgsrc/x11/libXpm/Makefile
diff -r1.4 -r1.5 pkgsrc/x11/libXpm/buildlink3.mk
diff -r0 -r1.1 pkgsrc/x11/libXpm/builtin.mk
cvs diff -r1.8 -r1.9 pkgsrc/x11/libXpm/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libXpm/Makefile 2008/05/24 21:45:15 1.8
+++ pkgsrc/x11/libXpm/Makefile 2009/12/16 19:57:47 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.8 2008/05/24 21:45:15 tnn Exp $ 1# $NetBSD: Makefile,v 1.9 2009/12/16 19:57:47 joerg Exp $
2# 2#
3 3
4DISTNAME= libXpm-3.5.7 4DISTNAME= libXpm-3.5.7
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= graphics x11 6CATEGORIES= graphics x11
7MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 7MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
11HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
12COMMENT= X PixMap Library from modular Xorg X11 12COMMENT= X PixMap Library from modular Xorg X11
13 13
14CONFLICTS+= xpm-[0-9]* 14CONFLICTS+= xpm-[0-9]*
@@ -19,21 +19,36 @@ USE_LIBTOOL= yes @@ -19,21 +19,36 @@ USE_LIBTOOL= yes
19USE_TOOLS+= pkg-config xgettext 19USE_TOOLS+= pkg-config xgettext
20PKGCONFIG_OVERRIDE+= xpm.pc.in 20PKGCONFIG_OVERRIDE+= xpm.pc.in
21GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
22CONFIGURE_ENV+= APP_MAN_SUFFIX=1 22CONFIGURE_ENV+= APP_MAN_SUFFIX=1
23 23
24# Don't allow the configure script to find libintl.so or else the resulting 24# Don't allow the configure script to find libintl.so or else the resulting
25# libXpm will be linked against it, which is not necessary. Instead, just 25# libXpm will be linked against it, which is not necessary. Instead, just
26# pass down INTLLIBS in the build environment for use by the [cs]xpm 26# pass down INTLLIBS in the build environment for use by the [cs]xpm
27# Makefiles. 27# Makefiles.
28# 28#
29CONFIGURE_ENV+= ac_cv_search_gettext=no 29CONFIGURE_ENV+= ac_cv_search_gettext=no
30MAKE_ENV+= INTLLIBS=${BUILDLINK_LDADD.gettext:Q} 30MAKE_ENV+= INTLLIBS=${BUILDLINK_LDADD.gettext:Q}
31 31
 32.include "../../mk/bsd.prefs.mk"
 33
 34.if ${X11_TYPE} == "native"
 35XPM_CFLAGS= -I${X11BASE}/include
 36XPM_LIBS= -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -lX11
 37
 38SXPM_CFLAGS= -I${X11BASE}/include
 39SXPM_LIBS= -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -lXt -lXext
 40
 41CONFIGURE_ARGS+= XPM_CFLAGS=${XPM_CFLAGS:Q} \
 42 XPM_LIBS=${XPM_LIBS:Q} \
 43 SXPM_CFLAGS=${SXPM_CFLAGS:Q} \
 44 SXPM_LIBS=${SXPM_LIBS:Q}
 45.endif
 46
32.include "../../devel/gettext-lib/buildlink3.mk" 47.include "../../devel/gettext-lib/buildlink3.mk"
33.include "../../x11/libX11/buildlink3.mk" 48.include "../../x11/libX11/buildlink3.mk"
34.include "../../x11/libXext/buildlink3.mk" 49.include "../../x11/libXext/buildlink3.mk"
35.include "../../x11/libXt/buildlink3.mk" 50.include "../../x11/libXt/buildlink3.mk"
36.include "../../x11/xextproto/buildlink3.mk" 51.include "../../x11/xextproto/buildlink3.mk"
37.include "../../x11/xproto/buildlink3.mk" 52.include "../../x11/xproto/buildlink3.mk"
38 53
39.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/x11/libXpm/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/libXpm/buildlink3.mk 2009/03/20 19:25:45 1.4
+++ pkgsrc/x11/libXpm/buildlink3.mk 2009/12/16 19:57:47 1.5
@@ -1,25 +1,15 @@ @@ -1,25 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.5 2009/12/16 19:57:47 joerg Exp $
2 
3.include "../../mk/bsd.fast.prefs.mk" 
4 
5.if ${X11_TYPE} != "modular" 
6.include "../../graphics/xpm/buildlink3.mk" 
7 
8BUILDLINK_PREFIX.libXpm= ${BUILDLINK_PREFIX.xpm} 
9.else 
10 2
11BUILDLINK_TREE+= libXpm 3BUILDLINK_TREE+= libXpm
12 4
13.if !defined(LIBXPM_BUILDLINK3_MK) 5.if !defined(LIBXPM_BUILDLINK3_MK)
14LIBXPM_BUILDLINK3_MK:= 6LIBXPM_BUILDLINK3_MK:=
15 7
16BUILDLINK_API_DEPENDS.libXpm+= libXpm>=3.5.4.2 8BUILDLINK_API_DEPENDS.libXpm+= libXpm>=3.5.4.2
17BUILDLINK_PKGSRCDIR.libXpm?= ../../x11/libXpm 9BUILDLINK_PKGSRCDIR.libXpm?= ../../x11/libXpm
18 10
19.include "../../x11/libX11/buildlink3.mk" 11.include "../../x11/libX11/buildlink3.mk"
20.include "../../x11/xproto/buildlink3.mk" 12.include "../../x11/xproto/buildlink3.mk"
21.endif # LIBXPM_BUILDLINK3_MK 13.endif # LIBXPM_BUILDLINK3_MK
22 14
23BUILDLINK_TREE+= -libXpm 15BUILDLINK_TREE+= -libXpm
24 
25.endif 
File Added: pkgsrc/x11/libXpm/builtin.mk
# $NetBSD: builtin.mk,v 1.1 2009/12/16 19:57:47 joerg Exp $

BUILTIN_PKG:=	libXpm

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 ${X11BASE} == ${LOCALBASE}
IS_BUILTIN.libXpm=	no
.elif !defined(IS_BUILTIN.libXpm)
IS_BUILTIN.libXpm=	no
.  if empty(H_XPM:M__nonexistent__)
IS_BUILTIN.libXpm=	yes
.  endif
.endif
MAKEVARS+=	IS_BUILTIN.libXpm

###
### 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.libXpm)
.  if ${PREFER.libXpm} == "pkgsrc"
USE_BUILTIN.libXpm=	no
.  else
USE_BUILTIN.libXpm=	${IS_BUILTIN.libXpm}
.    if defined(BUILTIN_PKG.libXpm) && \
        !empty(IS_BUILTIN.libXpm:M[yY][eE][sS])
USE_BUILTIN.libX11=	yes
.    endif
.  endif  # PREFER.libXpm
.endif
MAKEVARS+=	USE_BUILTIN.libXpm

.include "../../mk/x11.builtin.mk"