diff options
| author | jlam <jlam@pkgsrc.org> | 2004-03-29 05:43:28 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-03-29 05:43:28 +0000 |
| commit | 6d92080aa240757729992f43156b2924bbda71c4 (patch) | |
| tree | 2684bb3d4a41538be1b78668954f44c69a49033d /graphics/xpm | |
| parent | 82cd68d38a1d8bd0262376d4a40e4c201e6c55b3 (diff) | |
| download | pkgsrc-6d92080aa240757729992f43156b2924bbda71c4.tar.gz | |
Match the template builtin.mk file in bsd.builtin.mk, and make the two
packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links)
use the new format correctly.
Diffstat (limited to 'graphics/xpm')
| -rw-r--r-- | graphics/xpm/Makefile | 3 | ||||
| -rw-r--r-- | graphics/xpm/builtin.mk | 13 |
2 files changed, 5 insertions, 11 deletions
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index c86c9239997..e2d903d26d1 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/03/23 04:41:01 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2004/03/29 05:43:31 jlam Exp $ DISTNAME= xpm-3.4k PKGREVISION= 1 @@ -14,7 +14,6 @@ USE_BUILDLINK3= yes USE_IMAKE= # defined CHECK_BUILTIN.xpm= yes - .include "builtin.mk" .if !empty(IS_BUILTIN.xpm:M[yY][eE][sS]) diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk index 1a2c59b7166..4ec15513261 100644 --- a/graphics/xpm/builtin.mk +++ b/graphics/xpm/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $ +# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:32 jlam Exp $ .include "../../mk/bsd.prefs.mk" @@ -43,15 +43,10 @@ _XPM_PATCH!= \ ${AWK} 'BEGIN { split("abcdefghijklmnopqrstuvwxyz", alpha, "") } /\#define[ ]*XpmRevision/ { print alpha[$$3] }' ${_X11_XPM_H} _XPM_VERSION= ${_XPM_MAJOR}${_XPM_MINOR}${_XPM_PATCH} BUILTIN_PKG.xpm= xpm-${_XPM_VERSION} -MAKEFLAGS+= BUILTIN_PKG.xpm=${BUILTIN_PKG.xpm} +BUILDLINK_VARS+= BUILTIN_PKG.xpm . endif -MAKEFLAGS+= IS_BUILTIN.xpm=${IS_BUILTIN.xpm} -.endif # USE_BUILTIN.xpm - -CHECK_BUILTIN.xpm?= no -.if !empty(CHECK_BUILTIN.xpm:M[yY][eE][sS]) -USE_BUILTIN.xpm= yes -.endif +BUILDLINK_VARS+= IS_BUILTIN.xpm +.endif # IS_BUILTIN.xpm .if !defined(USE_BUILTIN.xpm) USE_BUILTIN.xpm?= ${IS_BUILTIN.xpm} |