CVS commit: pkgsrc/lang

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang
From: "Nikita" <nikita%netbsd.org@localhost>
Date: Sun, 30 Apr 2023 20:18:08 +0000

Module Name:    pkgsrc
Committed By:   nikita
Date:           Sun Apr 30 20:18:08 UTC 2023

Modified Files:
        pkgsrc/lang/chicken5: Makefile
        pkgsrc/lang/chicken5-boot: Makefile buildlink3.mk
Added Files:
        pkgsrc/lang/chicken5: Makefile.common

Log Message:
chicken5, chicken5-boot: split shared mk code off into Makefile.common.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/chicken5/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/chicken5/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/chicken5-boot/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/chicken5-boot/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/chicken5/Makefile
diff -u pkgsrc/lang/chicken5/Makefile:1.7 pkgsrc/lang/chicken5/Makefile:1.8
--- pkgsrc/lang/chicken5/Makefile:1.7   Wed Apr 26 18:11:51 2023
+++ pkgsrc/lang/chicken5/Makefile       Sun Apr 30 20:18:08 2023
@@ -1,19 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2023/04/26 18:11:51 nikita Exp $
+# $NetBSD: Makefile,v 1.8 2023/04/30 20:18:08 nikita Exp $
 
-DISTNAME=      chicken-5.3.0
-CATEGORIES=    lang
-MASTER_SITES=  http://code.call-cc.org/releases/${PKGVERSION_NOREV}/
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://www.call-cc.org/
-COMMENT=       Scheme to C compiler, handling R5RS
-LICENSE=       modified-bsd
-
-MAKE_JOBS_SAFE=        no
-
-USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake
-UNLIMIT_RESOURCES=     datasize
+.include "Makefile.common"
 
 BUILD_DEFS+=           CHICKEN_BINARY_VERSION
 CHICKEN_BINARY_VERSION=        11
@@ -23,32 +10,6 @@ OWN_DIRS+=   ${PREFIX}/lib/chicken/${CHICK
 
 BUILD_TARGET=          all
 
-.include "../../mk/bsd.prefs.mk"
-
-# PLATFORM detection:
-.if ${OPSYS:M*BSD} || ${OPSYS} == "DragonFly"
-PLATFORM=              bsd
-.elif ${OPSYS} == "Linux"
-PLATFORM=              linux
-.elif ${OPSYS} == "Darwin"
-PLATFORM=              macosx
-.elif ${OPSYS} == "SunOS"
-PLATFORM=              solaris
-.elif ${OPSYS} == "Haiku"
-PLATFORM=              haiku
-.else
-#PLATFORM+=            ${OPSYS} == "Interix"
-# possible choices left: aix android cross-linux-mingw cygwin hurd mingw
-#                        mingw-msys
-PKG_SKIP_REASON+=      "${OPSYS} is not supported"
-.endif
-
-MAKE_FILE=     GNUmakefile
-MAKE_ENV+=     C_COMPILER=${CC:Q}
-MAKE_ENV+=     HOST=   # fix ${HOST} prepending ${CC}
-# Need to have these in MAKE_FLAGS, MAKE_ENV is not enough due to the
-# way the build system overrides them.
-MAKE_FLAGS+=   PLATFORM=${PLATFORM:Q} PREFIX=${PREFIX} DESTDIR=${DESTDIR}
 MAKE_FLAGS+=   MANDIR=${PREFIX}/${PKGMANDIR}
 MAKE_FLAGS+=   INFODIR=${PREFIX}/${PKGINFODIR}
 MAKE_FLAGS+=   DOCDIR=${PREFIX}/share/doc/${PKGNAME_NOREV}

Index: pkgsrc/lang/chicken5-boot/Makefile
diff -u pkgsrc/lang/chicken5-boot/Makefile:1.2 pkgsrc/lang/chicken5-boot/Makefile:1.3
--- pkgsrc/lang/chicken5-boot/Makefile:1.2      Sun Apr 30 19:50:42 2023
+++ pkgsrc/lang/chicken5-boot/Makefile  Sun Apr 30 20:18:08 2023
@@ -1,52 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2023/04/30 19:50:42 nikita Exp $
+# $NetBSD: Makefile,v 1.3 2023/04/30 20:18:08 nikita Exp $
 
-DISTNAME=      chicken-5.3.0
-PKGNAME=       ${DISTNAME:S/chicken/chicken5-boot/}
-CATEGORIES=    lang
-MASTER_SITES=  http://code.call-cc.org/releases/${PKGVERSION_NOREV}/
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://www.call-cc.org/
-COMMENT=       Scheme to C compiler, handling R5RS (bootstrap)
-LICENSE=       modified-bsd
+.include "../../lang/chicken5/Makefile.common"
 
-MAKE_JOBS_SAFE=        no
-
-USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake
-UNLIMIT_RESOURCES=     datasize
+PKGNAME=       ${DISTNAME:S/chicken/chicken5-boot/}
 
 BUILD_TARGET=          boot-chicken
 WRKSRC=                        ${WRKDIR}/chicken-${PKGVERSION_NOREV}
 INSTALLATION_DIRS+=    libexec
 
-.include "../../mk/bsd.prefs.mk"
-
-# PLATFORM detection:
-.if ${OPSYS:M*BSD} || ${OPSYS} == "DragonFly"
-PLATFORM=              bsd
-.elif ${OPSYS} == "Linux"
-PLATFORM=              linux
-.elif ${OPSYS} == "Darwin"
-PLATFORM=              macosx
-.elif ${OPSYS} == "SunOS"
-PLATFORM=              solaris
-.elif ${OPSYS} == "Haiku"
-PLATFORM=              haiku
-.else
-#PLATFORM+=            ${OPSYS} == "Interix"
-# possible choices left: aix android cross-linux-mingw cygwin hurd mingw
-#                        mingw-msys
-PKG_SKIP_REASON+=      "${OPSYS} is not supported"
-.endif
-
-MAKE_FILE=     GNUmakefile
-MAKE_ENV+=     C_COMPILER=${CC:Q}
-MAKE_ENV+=     HOST=   # fix ${HOST} prepending ${CC}
-# Need to have these in MAKE_FLAGS, MAKE_ENV is not enough due to the
-# way the build system overrides them.
-MAKE_FLAGS+=   PLATFORM=${PLATFORM:Q}
-
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/chicken-boot ${DESTDIR}${PREFIX}/libexec/chicken-bootstrap
 

Index: pkgsrc/lang/chicken5-boot/buildlink3.mk
diff -u pkgsrc/lang/chicken5-boot/buildlink3.mk:1.1 pkgsrc/lang/chicken5-boot/buildlink3.mk:1.2
--- pkgsrc/lang/chicken5-boot/buildlink3.mk:1.1 Wed Apr 26 18:09:54 2023
+++ pkgsrc/lang/chicken5-boot/buildlink3.mk     Sun Apr 30 20:18:08 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2023/04/26 18:09:54 nikita Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2023/04/30 20:18:08 nikita Exp $
 
 BUILDLINK_TREE+=       chicken5-boot
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        chicken5-boot
 CHICKEN5_BOOT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.chicken5-boot+=  chicken5-boot>=5.3.0
-BUILDLINK_ABI_DEPENDS.chicken5-boot?=  chicken5-boot>=5.3.0
+BUILDLINK_ABI_DEPENDS.chicken5-boot+=  chicken5-boot>=5.3.0
 BUILDLINK_PKGSRCDIR.chicken5-boot?=    ../../lang/chicken5-boot
 
 BUILDLINK_FILES.chicken5-boot+=                libexec/chicken-bootstrap

Added files:

Index: pkgsrc/lang/chicken5/Makefile.common
diff -u /dev/null pkgsrc/lang/chicken5/Makefile.common:1.1
--- /dev/null   Sun Apr 30 20:18:08 2023
+++ pkgsrc/lang/chicken5/Makefile.common        Sun Apr 30 20:18:08 2023
@@ -0,0 +1,44 @@
+# $NetBSD: Makefile.common,v 1.1 2023/04/30 20:18:08 nikita Exp $
+# used by lang/chicken5-boot/Makefile
+
+DISTNAME=      chicken-5.3.0
+CATEGORIES=    lang
+MASTER_SITES=  http://code.call-cc.org/releases/${PKGVERSION_NOREV}/
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://www.call-cc.org/
+COMMENT=       Scheme to C compiler, handling R5RS
+LICENSE=       modified-bsd
+
+MAKE_JOBS_SAFE=        no
+
+USE_LIBTOOL=           yes
+USE_TOOLS+=            gmake
+UNLIMIT_RESOURCES=     datasize
+
+.include "../../mk/bsd.prefs.mk"
+
+# PLATFORM detection:
+.if ${OPSYS:M*BSD} || ${OPSYS} == "DragonFly"
+PLATFORM=              bsd
+.elif ${OPSYS} == "Linux"
+PLATFORM=              linux
+.elif ${OPSYS} == "Darwin"
+PLATFORM=              macosx
+.elif ${OPSYS} == "SunOS"
+PLATFORM=              solaris
+.elif ${OPSYS} == "Haiku"
+PLATFORM=              haiku
+.else
+#PLATFORM+=            ${OPSYS} == "Interix"
+# possible choices left: aix android cross-linux-mingw cygwin hurd mingw
+#                        mingw-msys
+PKG_SKIP_REASON+=      "${OPSYS} is not supported"
+.endif
+
+MAKE_FILE=     GNUmakefile
+MAKE_ENV+=     C_COMPILER=${CC:Q}
+MAKE_ENV+=     HOST=   # fix ${HOST} prepending ${CC}
+# Need to have these in MAKE_FLAGS, MAKE_ENV is not enough due to the
+# way the build system overrides them.
+MAKE_FLAGS+=   PLATFORM=${PLATFORM:Q} PREFIX=${PREFIX} DESTDIR=${DESTDIR}

Prev by Date: CVS commit: pkgsrc/sysutils/acl
Next by Date: CVS commit: pkgsrc/cad/gtkwave
Previous by Thread: CVS commit: pkgsrc/sysutils/acl
Next by Thread: CVS commit: pkgsrc/cad/gtkwave
Indexes:

Home | Main Index | Thread Index | Old Index