From 222e0b2f3c79f6568690392ba0b37d515ef5708a Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Wed, 12 Dec 2007 10:42:07 +0000
Subject: [PATCH] - use scons module

---
 devel/libopensync/Makefile | 16 +++++-----------
 x11/gaia/Makefile          | 14 ++++++--------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile
index 85340e3065f..58b8a6a9172 100644
--- a/devel/libopensync/Makefile
+++ b/devel/libopensync/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2007/10/27 23:44:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2007/12/12 10:42:07 ajacoutot Exp $
 
 COMMENT=	data synchronization framework
 
 DISTNAME=	libopensync-0.31
+PKGNAME=	${DISTNAME}p0
 SHARED_LIBS +=	opensync 1.0
 CATEGORIES=	devel comms
 
@@ -22,20 +23,13 @@ MASTER_SITES=	http://www.bsdfrog.org/OpenBSD/distfiles/
 
 WANTLIB=	c pthread
 
-BUILD_DEPENDS=	:scons-*:devel/scons
+MODULES=	devel/scons
+MODSCONS_FLAGS=	APPEND_CCFLAGS="${CFLAGS}"
+
 LIB_DEPENDS=	sqlite3.>=8::databases/sqlite3 \
 		xml2.>=9::textproc/libxml \
 		glib-2.0.>=1200,gmodule-2.0.>=1200,gthread-2.0.>=1200::devel/glib2
 
 NO_REGRESS=	Yes
 
-do-build:
-	@${SETENV} ${MAKE_ENV} scons -C ${WRKSRC} \
-		CC=${CC} CXX=${CXX} APPEND_CCFLAGS="${CFLAGS}" \
-		prefix=${PREFIX} debug=0
-
-do-install:
-	@${SETENV} ${MAKE_ENV} scons -C ${WRKSRC} install \
-		DESTDIR=${WRKINST}
-		
 .include <bsd.port.mk>
diff --git a/x11/gaia/Makefile b/x11/gaia/Makefile
index 6c63f0dbe8c..f7f4b7f7eb9 100644
--- a/x11/gaia/Makefile
+++ b/x11/gaia/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2007/09/15 20:04:20 merdely Exp $
+# $OpenBSD: Makefile,v 1.5 2007/12/12 10:42:07 ajacoutot Exp $
 
 COMMENT=	3D earth viewer with GPS support
 
 DISTNAME=	gaia-0.1.2
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	x11 geo
 
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +12,7 @@ HOMEPAGE=	http://gaia.serezhkin.com/
 
 MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
 
-# GPLv2
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -22,9 +22,11 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaia-clean/}
 
 WANTLIB=	GL GLU c crypto idn m pthread ssl stdc++ z
 
+MODULES=	devel/scons
+MODSCONS_FLAGS=	datadir=share/gaia gpsd=1
+
 USE_X11=	Yes
 NO_REGRESS=	Yes
-BUILD_DEPENDS=	::devel/scons
 LIB_DEPENDS=	SDL.>=6::devel/sdl \
 		gps.>=16::misc/gpsd \
 		curl.>=4::net/curl \
@@ -41,10 +43,6 @@ pre-configure:
 		-e 's,!!X11BASE!!,${X11BASE},g;' \
 		${WRKSRC}/SConstruct
 
-do-build:
-	@${SETENV} ${MAKE_ENV} scons -C ${WRKSRC} \
-		prefix=${PREFIX} datadir=share/gaia gpsd=1
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/gaia ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/gaia