pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

chezscheme: Fixed PLIST for Darwin & i386 Linux.



Module Name:	pkgsrc-wip
Committed By:	Aleksej Lebedev <root%zta.lk@localhost>
Pushed By:	zhtw
Date:		Thu May 18 21:00:06 2017 +0200
Changeset:	826f1bd9df29702c6f6e028ffa7831542f734ca5

Modified Files:
	chezscheme/Makefile
	chezscheme/PLIST
	chezscheme/options.mk

Log Message:
chezscheme: Fixed PLIST for Darwin & i386 Linux.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=826f1bd9df29702c6f6e028ffa7831542f734ca5

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

diffstat:
 chezscheme/Makefile   | 16 +++++++++++++++-
 chezscheme/PLIST      |  8 ++++----
 chezscheme/options.mk |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)

diffs:
diff --git a/chezscheme/Makefile b/chezscheme/Makefile
index b2cb857ba1..caf2b90aea 100644
--- a/chezscheme/Makefile
+++ b/chezscheme/Makefile
@@ -40,8 +40,22 @@ do-configure:
                                     --temproot=${DESTDIR} \
                                     LDFLAGS="${LDFLAGS}"
 
+ONLY_FOR_PLATFORM+=	Linux-*-x86_64 Darwin-*-x86_64
+ONLY_FOR_PLATFORM+=	Linux-*-i386 Darwin-*-i386
+.if ${OPSYS} == Linux
+PLIST_SUBST+=	OS=le
+.elif ${OPSYS} == Darwin
+PLIST_SUBST+=	OS=osx
+.endif
+
+.if ${MACHINE_ARCH} == i386
+PLIST_SUBST+=	M=i3
+.elif ${MACHINE_ARCH} == x86_64
+PLIST_SUBST+=	M=a6
+.endif
+
 BUILD_TARGET=	build
-PLIST_SUBST+=   T=${T}
+PLIST_SUBST+=   T=${THR}
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/chezscheme/PLIST b/chezscheme/PLIST
index 1e7e5ff722..4b8ad8b5b9 100644
--- a/chezscheme/PLIST
+++ b/chezscheme/PLIST
@@ -28,9 +28,9 @@ lib/csv${PKGVERSION}/examples/setof.ss
 lib/csv${PKGVERSION}/examples/socket.ss
 lib/csv${PKGVERSION}/examples/template.ss
 lib/csv${PKGVERSION}/examples/unify.ss
-lib/csv${PKGVERSION}/${T}a6le/petite.boot
-lib/csv${PKGVERSION}/${T}a6le/scheme-script.boot
-lib/csv${PKGVERSION}/${T}a6le/scheme.boot
-lib/csv${PKGVERSION}/${T}a6le/scheme.h
+lib/csv${PKGVERSION}/${T}${M}${OS}/petite.boot
+lib/csv${PKGVERSION}/${T}${M}${OS}/scheme-script.boot
+lib/csv${PKGVERSION}/${T}${M}${OS}/scheme.boot
+lib/csv${PKGVERSION}/${T}${M}${OS}/scheme.h
 man/man1/petite.1
 man/man1/scheme.1
diff --git a/chezscheme/options.mk b/chezscheme/options.mk
index d25a4f9fbe..cf25473def 100644
--- a/chezscheme/options.mk
+++ b/chezscheme/options.mk
@@ -7,5 +7,5 @@ PKG_SUGGESTED_OPTIONS=	threads
 
 .if !empty(PKG_OPTIONS:Mthreads)
 CONFIGURE_ARGS+=--threads
-T=t
+THR=t
 .endif


Home | Main Index | Thread Index | Old Index