buildlink1 -> buildlink2 and use gcc/buildlink2.mk instead of Makefile.gcc

3 files changed, 21 insertions, 44 deletions

diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile
index 5aa33cf82d4..2c497b20e78 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/05/20 15:53:59 cjep Exp $
+# $NetBSD: Makefile,v 1.14 2002/09/29 09:29:56 jlam Exp $
 
 DISTNAME=	xephem-3.5.2
 CATEGORIES=	x11
@@ -9,39 +9,36 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.clearskyinstitute.com/xephem/
 COMMENT=	Interactive astronomical ephemeris program
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
-LIBSRC1=		${WRKDIR}/${DISTNAME}/libastro
-LIBSRC2=	${WRKDIR}/${DISTNAME}/libip
-USE_PERL5=	yes
-
 LICENSE=	no-commercial-use
 
-.if (${MACHINE_ARCH} == "arm32")
-. include "../../lang/gcc/Makefile.gcc"
-MAKE_FLAGS+=	CC=${CC}
-.endif
-
+USE_BUILDLINK2=	yes
 USE_IMAKE=	yes
+PERL_SCRIPTS=	astorb2edb.pl mpcorb2edb.pl
 
-pre-build:
-	(cd ${LIBSRC1}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS})
-	(cd ${LIBSRC2}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS})
+WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
+LIBSRC1=	${WRKDIR}/${DISTNAME}/libastro
+LIBSRC2=	${WRKDIR}/${DISTNAME}/libip
+ALL_TARGET=	# empty
+BUILD_DIRS=	${LIBSRC1} ${LIBSRC2} ${WRKSRC}
+INSTALL_DIRS=	${WRKSRC}
 
-PERL_SCRIPTS= astorb2edb.pl mpcorb2edb.pl
+.if (${MACHINE_ARCH} == "arm32")
+.  include "../../lang/gcc/buildlink2.mk"
+.endif
 
 post-install:
 	${SED} s,@PREFIX@,${PREFIX}, ${FILESDIR}/XEphem.ad > ${WRKDIR}/XEphem
 	${INSTALL_DATA} ${WRKDIR}/XEphem ${PREFIX}/lib/X11/app-defaults
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xephem/tools
-	(cd ${WRKSRC}; ${CP} -R auxil catalogs fifos fits \
-	 ${PREFIX}/share/xephem)
-	(cd ${WRKSRC}/tools; for file in ${PERL_SCRIPTS}; do \
-		${SED} 1s,@LOCALBASE@,${LOCALBASE}, $$file \
-			> ${WRKDIR}/$$file; \
-		${INSTALL_SCRIPT} ${WRKDIR}/$$file \
-			${PREFIX}/share/xephem/tools; \
-	done)
+	cd ${WRKSRC}; ${CP} -R auxil catalogs fifos fits		\
+		${PREFIX}/share/xephem
+	for file in ${PERL_SCRIPTS}; do					\
+		${INSTALL_SCRIPT} ${WRKSRC}/tools/$${file}		\
+			${PREFIX}/share/xephem/tools;			\
+	done
 	${CHOWN} -R ${SHAREOWN} ${PREFIX}/share/xephem
 
-.include "../../mk/motif.buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
+.include "../../mk/motif.buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xephem/patches/patch-ac b/x11/xephem/patches/patch-ac
deleted file mode 100644
index 1071cf3cda8..00000000000
--- a/x11/xephem/patches/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2002/01/19 11:39:44 drochner Exp $
-
---- tools/astorb2edb.pl.orig	Wed Aug 15 07:35:25 2001
-+++ tools/astorb2edb.pl	Mon Jan 14 16:03:05 2002
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!@LOCALBASE@/bin/perl
- # convert  astorb.txt to 2 .edb files.
- # Usage: [-f] <base>
- #   if -f then use ftp to get the script from lowell, else read it from stdin.
diff --git a/x11/xephem/patches/patch-ae b/x11/xephem/patches/patch-ae
deleted file mode 100644
index 3f4d4f6b6df..00000000000
--- a/x11/xephem/patches/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2000/12/12 17:29:52 drochner Exp $
-
---- tools/mpcorb2edb.pl.orig	Sat Dec  2 09:35:54 2000
-+++ tools/mpcorb2edb.pl	Sun Dec 10 17:21:20 2000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!@LOCALBASE@/bin/perl
- # convert MPCORB.DAT to 2 .edb files.
- # Usage: [-f] <base>
- #   if -f then use ftp to get the script from harvard, else read it from stdin.