From fb76c84dbac62787f1f18d73651cc5d0f9715c6d Mon Sep 17 00:00:00 2001 From: Adam Hoka Date: Sat, 2 Jun 2007 03:34:42 +0000 Subject: [PATCH] Making a centralised makefile for all of the bsdinstaller packages. This will make the packages more logical and easier to maintain. The makefile is called bsdinstall.mk and contains the information to fetch the cvs snapshot tarball and a pre-configure target to do some changes in those sources. --- bsdinstaller/bsdinstaller.mk | 7 +++++++ dfuibe_installer/Makefile | 10 +++------- dfuibe_lua/Makefile | 12 ++++-------- dfuife_curses/Makefile | 11 +++-------- libdfui/Makefile | 11 +++-------- libinstaller/Makefile | 11 +++-------- lua50-app/Makefile | 6 +++--- lua50-dfui/Makefile | 7 +++---- lua50-filename/Makefile | 6 +++--- lua50-pty/Makefile | 10 +++------- lua50/Makefile | 4 ++-- lua50/buildlink3.mk | 20 ++++++++++---------- 12 files changed, 47 insertions(+), 68 deletions(-) create mode 100644 bsdinstaller/bsdinstaller.mk diff --git a/bsdinstaller/bsdinstaller.mk b/bsdinstaller/bsdinstaller.mk new file mode 100644 index 0000000000..53bc7a05e2 --- /dev/null +++ b/bsdinstaller/bsdinstaller.mk @@ -0,0 +1,7 @@ +DISTNAME= bsdinstaller-20070528 +MASTER_SITES= http://rnrdoctor.sytes.net/~replaced/bsdinstaller/ + +FILESDIR= ${.CURDIR}/../../wip/bsdinstaller/files + +pre-configure: + ${CP} ${FILESDIR}/Config ${WRKDIR}/${DISTNAME}/installer/src/Config \ No newline at end of file diff --git a/dfuibe_installer/Makefile b/dfuibe_installer/Makefile index 67830404d0..7c4dc899c1 100644 --- a/dfuibe_installer/Makefile +++ b/dfuibe_installer/Makefile @@ -1,22 +1,18 @@ -# $NetBSD: Makefile,v 1.3 2007/06/01 20:07:31 hoka_adam Exp $ +# $NetBSD: Makefile,v 1.4 2007/06/02 03:34:42 hoka_adam Exp $ -DISTNAME= bsdinstaller-20070528 PKGNAME= dfuibe_installer-1.1.7 CATEGORIES= sysutils -MASTER_SITES= http://rnrdoctor.sytes.net/~replaced/bsdinstaller/ +.include "../../wip/bsdinstaller/bsdinstaller.mk" + WRKSRC= ${WRKDIR}/${DISTNAME}/installer/src/backend/installer HOMEPAGE= http://www.bsdinstaller.com/ MAINTAINER= adam.hoka@gmail.com COMMENT= DFUI BSD Installer backend -FILESDIR= ${.CURDIR}/../../wip/bsdinstaller/files SHAREDIR= ${PREFIX}/share/dfuibe_installer -pre-configure: - ${CP} ${FILESDIR}/Config ${WRKDIR}/${DISTNAME}/installer/src/Config - do-install: ${INSTALL_PROGRAM} -o root -g wheel -m 555 ${WRKSRC}/dfuibe_installer ${PREFIX}/sbin ${MKDIR} -p ${SHAREDIR} diff --git a/dfuibe_lua/Makefile b/dfuibe_lua/Makefile index 216c0bfd25..93e7909fbd 100644 --- a/dfuibe_lua/Makefile +++ b/dfuibe_lua/Makefile @@ -1,22 +1,18 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/06/01 20:16:15 hoka_adam Exp $ +# $NetBSD: Makefile,v 1.2 2007/06/02 03:34:43 hoka_adam Exp $ -DISTNAME= bsdinstaller-20070528 PKGNAME= dfuibe_lua-1.0 CATEGORIES= sysutils -MASTER_SITES= http://rnrdoctor.sytes.net/~replaced/bsdinstaller/ +.include "../../wip/bsdinstaller/bsdinstaller.mk" + WRKSRC= ${WRKDIR}/${DISTNAME}/installer/src/backend/lua MAINTAINER= adam.hoka@gmail.com +HOMEPAGE= http://www.bsdinstaller.com/ COMMENT= DFUI Lua backend -FILESDIR= ${.CURDIR}/../../wip/bsdinstaller/files - DFUIBE_LUA_DIR= ${PREFIX}/share/dfuibe_lua -pre-configure: - ${CP} ${FILESDIR}/Config ${WRKDIR}/${DISTNAME}/installer/src/Config - do-install: ${INSTALL_DATA_DIR} ${DFUIBE_LUA_DIR} ${INSTALL_DATA_DIR} ${DFUIBE_LUA_DIR}/lib diff --git a/dfuife_curses/Makefile b/dfuife_curses/Makefile index 479454834f..2840580173 100644 --- a/dfuife_curses/Makefile +++ b/dfuife_curses/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2007/06/02 00:55:59 hoka_adam Exp $ +# $NetBSD: Makefile,v 1.4 2007/06/02 03:34:43 hoka_adam Exp $ -DISTNAME= bsdinstaller-20070528 PKGNAME= dfuife_curses-1.5.1 CATEGORIES= sysutils -MASTER_SITES= http://rnrdoctor.sytes.net/~replaced/bsdinstaller/ +.include "../../wip/bsdinstaller/bsdinstaller.mk" + WRKSRC= ${WRKDIR}/${DISTNAME}/installer/src/frontends/ncurses MAINTAINER= adam.hoka@gmail.com @@ -13,11 +13,6 @@ COMMENT= DFUI curses frontend USE_NCURSES= yes -FILESDIR= ${.CURDIR}/../../wip/bsdinstaller/files - -pre-configure: - ${CP} ${FILESDIR}/Config ${WRKDIR}/${DISTNAME}/installer/src/Config - do-install: ${INSTALL_DATA_DIR} -p ${PREFIX}/share/dfuife_curses ${INSTALL_PROGRAM} -o root -g wheel ${WRKSRC}/dfuife_curses ${PREFIX}/sbin/ diff --git a/libdfui/Makefile b/libdfui/Makefile index 6f909bd68c..7ecc96c0d8 100644 --- a/libdfui/Makefile +++ b/libdfui/Makefile @@ -1,21 +1,16 @@ -# $NetBSD: Makefile,v 1.5 2007/05/30 22:04:02 hoka_adam Exp $ +# $NetBSD: Makefile,v 1.6 2007/06/02 03:34:43 hoka_adam Exp $ -DISTNAME= bsdinstaller-20070528 PKGNAME= libdfui-4.99.1 CATEGORIES= devel -MASTER_SITES= http://rnrdoctor.sytes.net/~replaced/bsdinstaller/ +.include "../../wip/bsdinstaller/bsdinstaller.mk" + WRKSRC= ${WRKDIR}/${DISTNAME}/installer/src/lib/libdfui MAINTAINER= adam.hoka@gmail.com HOMEPAGE= http://www.bsdinstaller.com/ COMMENT= Abstract user interface protocol library -FILESDIR= ${.CURDIR}/../../wip/bsdinstaller/files - -post-extract: - ${CP} ${FILESDIR}/Config ${WRKDIR}/${DISTNAME}/installer/src/Config - do-install: ${INSTALL_DATA_DIR} -p ${PREFIX}/include/dfui ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/libdfui.a ${PREFIX}/lib/ diff --git a/libinstaller/Makefile b/libinstaller/Makefile index 477d1c1e39..52eeedb8f0 100644 --- a/libinstaller/Makefile +++ b/libinstaller/Makefile @@ -1,28 +1,23 @@ -# $NetBSD: Makefile,v 1.7 2007/06/02 01:14:24 hoka_adam Exp $ +# $NetBSD: Makefile,v 1.8 2007/06/02 03:34:43 hoka_adam Exp $ -DISTNAME= bsdinstaller-20070528 PKGNAME= libinstaller-5.99.1 PKGREVISION= 1 CATEGORIES= devel -MASTER_SITES= http://rnrdoctor.sytes.net/~replaced/bsdinstaller/ +.include "../../wip/bsdinstaller/bsdinstaller.mk" + WRKSRC= ${WRKDIR}/${DISTNAME}/installer/src/lib/libinstaller MAINTAINER= adam.hoka@gmail.com HOMEPAGE= http://www.bsdinstaller.com/ COMMENT= BSD Installer library -FILESDIR= ${.CURDIR}/../../wip/bsdinstaller/files - SUBST_CLASSES+= conf SUBST_STAGE.conf= post-patch SUBST_FILES.conf= functions.c SUBST_SED.conf= -e "s|@@prefix@@|${PREFIX}|g" SUBST_MESSAGE.conf= Fixing hardcoded paths. -pre-configure: - ${CP} ${FILESDIR}/Config ${WRKDIR}/${DISTNAME}/installer/src/Config - do-install: ${INSTALL_DATA_DIR} -p ${PREFIX}/include/installer ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/libinstaller.a ${PREFIX}/lib/ diff --git a/lua50-app/Makefile b/lua50-app/Makefile index 4c701884b5..b21600961d 100644 --- a/lua50-app/Makefile +++ b/lua50-app/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/06/01 20:11:56 hoka_adam Exp $ +# $NetBSD: Makefile,v 1.2 2007/06/02 03:34:43 hoka_adam Exp $ -DISTNAME= bsdinstaller-20070528 PKGNAME= lua50-app-0.1 CATEGORIES= devel -MASTER_SITES= http://rnrdoctor.sytes.net/~replaced/bsdinstaller/ +.include "../../wip/bsdinstaller/bsdinstaller.mk" + WRKSRC= ${WRKDIR}/${DISTNAME}/installer/src/lib/lua/app MAINTAINER= adam.hoka@gmail.com diff --git a/lua50-dfui/Makefile b/lua50-dfui/Makefile index 6b610035c0..a1b8958759 100644 --- a/lua50-dfui/Makefile +++ b/lua50-dfui/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/05/31 19:31:15 hoka_adam Exp $ +# $NetBSD: Makefile,v 1.2 2007/06/02 03:34:43 hoka_adam Exp $ -DISTNAME= bsdinstaller-20070528 PKGNAME= lua50-dfui-0.1 CATEGORIES= devel -MASTER_SITES= http://rnrdoctor.sytes.net/~replaced/bsdinstaller/ +.include "../../wip/bsdinstaller/bsdinstaller.mk" + WRKSRC= ${WRKDIR}/${DISTNAME}/installer/src/lib/lua/dfui/ MAINTAINER= adam.hoka@gmail.com COMMENT= DFUI binding for Lua 5.0.x - do-install: ${INSTALL_PROGRAM} -o root -g wheel -m 444 ${WRKSRC}/ldfui.so ${PREFIX}/lib/lua/5.0/ ${INSTALL_DATA} -o root -g wheel -m 444 ${WRKSRC}/dfui.lua ${PREFIX}/share/lua/5.0/ diff --git a/lua50-filename/Makefile b/lua50-filename/Makefile index 354d68a248..398e31b507 100644 --- a/lua50-filename/Makefile +++ b/lua50-filename/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/06/01 20:13:26 hoka_adam Exp $ +# $NetBSD: Makefile,v 1.2 2007/06/02 03:34:43 hoka_adam Exp $ -DISTNAME= bsdinstaller-20070528 PKGNAME= lua50-filename-0.1 CATEGORIES= devel -MASTER_SITES= http://rnrdoctor.sytes.net/~replaced/bsdinstaller/ +.include "../../wip/bsdinstaller/bsdinstaller.mk" + WRKSRC= ${WRKDIR}/${DISTNAME}/installer/src/lib/lua/filename MAINTAINER= adam.hoka@gmail.com diff --git a/lua50-pty/Makefile b/lua50-pty/Makefile index 2fef4e7bc7..81ed0b9b19 100644 --- a/lua50-pty/Makefile +++ b/lua50-pty/Makefile @@ -1,17 +1,13 @@ -# $NetBSD: Makefile,v 1.3 2007/06/01 18:00:10 hoka_adam Exp $ +# $NetBSD: Makefile,v 1.4 2007/06/02 03:34:43 hoka_adam Exp $ DISTNAME= bsdinstaller-20070528 PKGNAME= lua50-pty-0.1 CATEGORIES= devel -MASTER_SITES= http://rnrdoctor.sytes.net/~replaced/bsdinstaller/ +.include "../../wip/bsdinstaller/bsdinstaller.mk" + WRKSRC= ${WRKDIR}/${DISTNAME}/installer/src/lib/lua/pty -FILESDIR= ${.CURDIR}/../../wip/bsdinstaller/files - -post-extract: - ${CP} ${FILESDIR}/Config ${WRKDIR}/${DISTNAME}/installer/src/Config - MAINTAINER= adam.hoka@gmail.com COMMENT= Pty (pseudo-terminal) bindings for Lua 5.0.x diff --git a/lua50/Makefile b/lua50/Makefile index a0a97fcae7..8cc09ed1bb 100644 --- a/lua50/Makefile +++ b/lua50/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2007/06/01 18:00:07 hoka_adam Exp $ -# +# $NetBSD: Makefile,v 1.3 2007/06/02 03:34:43 hoka_adam Exp $ DISTNAME= lua-5.0.3 +PKGNAME= lua50-5.0.3 CATEGORIES= lang MASTER_SITES= ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \ ftp://ftp.ntua.gr/pub/lang/lua/ \ diff --git a/lua50/buildlink3.mk b/lua50/buildlink3.mk index 441f3a885a..ba0fd28353 100644 --- a/lua50/buildlink3.mk +++ b/lua50/buildlink3.mk @@ -1,19 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/05/31 02:30:17 hoka_adam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2007/06/02 03:34:43 hoka_adam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LUA_BUILDLINK3_MK:= ${LUA_BUILDLINK3_MK}+ +LUA50_BUILDLINK3_MK:= ${LUA50_BUILDLINK3_MK}+ .if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= lua +BUILDLINK_DEPENDS+= lua50 .endif -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlua} -BUILDLINK_PACKAGES+= lua -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lua +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlua50} +BUILDLINK_PACKAGES+= lua50 +BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lua50 -.if ${LUA_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.lua+= lua>=5.0.3 -BUILDLINK_PKGSRCDIR.lua?= ../../wip/lua50 -.endif # LUA_BUILDLINK3_MK +.if ${LUA50_BUILDLINK3_MK} == "+" +BUILDLINK_API_DEPENDS.lua50+= lua50>=5.0.3 +BUILDLINK_PKGSRCDIR.lua50?= ../../wip/lua50 +.endif # LUA50_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}