From e2afa97f51a1f72e6618533019aaaae07b7d3cf2 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sun, 25 Aug 2002 18:38:05 +0000
Subject: Merge changes in packages from the buildlink2 branch that have
 buildlink2.mk files back into the main trunk.  This provides sufficient
 buildlink2 infrastructure to start merging other packages from the buildlink2
 branch that have already been converted to use the buildlink2 framework.

---
 wm/windowmaker/Makefile      | 38 +++++++++++++++++---------------------
 wm/windowmaker/PLIST         |  2 +-
 wm/windowmaker/buildlink2.mk | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 22 deletions(-)
 create mode 100644 wm/windowmaker/buildlink2.mk

(limited to 'wm')

diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 6c9b44e37d6..5c48814b174 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2002/03/13 17:37:48 fredb Exp $
+# $NetBSD: Makefile,v 1.26 2002/08/25 18:40:15 jlam Exp $
 
 DISTNAME=		WindowMaker-0.80.0
 PKGNAME=		windowmaker-0.80.0
@@ -12,16 +12,12 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.windowmaker.org/
 COMMENT=		GNUStep-compliant NEXTSTEP(tm) window manager clone
 
-BUILD_USES_MSGFMT=	yes
-
-USE_BUILDLINK_ONLY=	YES
-REPLACE_BUILDLINK=	WINGs/get-wings-flags
-REPLACE_BUILDLINK+=	WINGs/get-wutil-flags
-REPLACE_BUILDLINK+=	wrlib/get-wraster-flags
+BUILD_USES_MSGFMT=	YES
 
+USE_BUILDLINK2=		YES
+USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-usermenu \
 			--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
@@ -31,11 +27,6 @@ INSTALL_TARGET=		install-strip
 
 .include "../../mk/bsd.prefs.mk"
 
-# "egcs" has an optimizer problem on "arm32".
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32"
-CFLAGS=
-.endif
-
 # WINDOWMAKER_OPTIONS is a space-separated list of compile-time options
 # to support.  Currently supported options:
 #
@@ -80,12 +71,17 @@ post-install:
 		FAQ FAQ.I18N \
 		${PREFIX}/share/doc/WindowMaker
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../graphics/hermes/buildlink.mk"
-.include "../../graphics/libungif/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/hermes/buildlink2.mk"
+.include "../../graphics/libungif/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
+
+# "egcs" has an optimizer problem on "arm32".
+.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32"
+CFLAGS:=	-O0
+.endif
diff --git a/wm/windowmaker/PLIST b/wm/windowmaker/PLIST
index e6098096b35..bf730c75689 100644
--- a/wm/windowmaker/PLIST
+++ b/wm/windowmaker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/06/26 10:30:04 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 18:40:15 jlam Exp $
 GNUstep/Apps/WPrefs.app/WPrefs
 GNUstep/Apps/WPrefs.app/WPrefs.tiff
 GNUstep/Apps/WPrefs.app/WPrefs.xpm
diff --git a/wm/windowmaker/buildlink2.mk b/wm/windowmaker/buildlink2.mk
new file mode 100644
index 00000000000..599722d8fca
--- /dev/null
+++ b/wm/windowmaker/buildlink2.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:16 jlam Exp $
+
+.if !defined(WINDOWMAKER_BUILDLINK2_MK)
+WINDOWMAKER_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			windowmaker
+BUILDLINK_DEPENDS.windowmaker?=		windowmaker>=0.80.0nb1
+BUILDLINK_PKGSRCDIR.windowmaker?=	../../wm/windowmaker
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.windowmaker=windowmaker
+BUILDLINK_PREFIX.windowmaker_DEFAULT=	${X11PREFIX}
+
+BUILDLINK_FILES.windowmaker=	include/WINGs/*
+BUILDLINK_FILES.windowmaker+=	include/WMaker.h
+BUILDLINK_FILES.windowmaker+=	include/wraster.h
+BUILDLINK_FILES.windowmaker+=	lib/libExtraWINGs.a
+BUILDLINK_FILES.windowmaker+=	lib/libWINGs.a
+BUILDLINK_FILES.windowmaker+=	lib/libWMaker.a
+BUILDLINK_FILES.windowmaker+=	lib/libWUtil.a
+BUILDLINK_FILES.windowmaker+=	lib/libwraster.*
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/hermes/buildlink2.mk"
+.include "../../graphics/libungif/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	windowmaker-buildlink
+
+windowmaker-buildlink: _BUILDLINK_USE
+
+.endif	# WINDOWMAKER_BUILDLINK2_MK
-- 
cgit v1.2.3