mrust*: cleanup/cosmetics; pkglint changes

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: mrust*: cleanup/cosmetics; pkglint changes
From: Dave Berger <pkgsrc-mrust%web5by5.com@localhost>
Date: Wed, 12 Jan 2022 14:50:11 +0000
Module Name:	pkgsrc-wip
Committed By:	Dave Berger <pkgsrc-mrust%web5by5.com@localhost>
Pushed By:	dave
Date:		Wed Jan 12 09:50:11 2022 -0500
Changeset:	225552d187ad4fca4b8b0db964cc3f1e84e0f95e

Modified Files:
	mrust-mrustc/Makefile
	mrust/Makefile
	mrust/Makefile.common

Log Message:
mrust*: cleanup/cosmetics; pkglint changes

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

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

diffstat:
 mrust-mrustc/Makefile | 97 ---------------------------------------------------
 mrust/Makefile        | 11 +++---
 mrust/Makefile.common | 51 ++++++++++-----------------
 3 files changed, 25 insertions(+), 134 deletions(-)

diffs:
diff --git a/mrust-mrustc/Makefile b/mrust-mrustc/Makefile
index 240bf2de38..8eed85e30f 100644
--- a/mrust-mrustc/Makefile
+++ b/mrust-mrustc/Makefile
@@ -39,101 +39,4 @@ do-install:
 		${INSTALL} bin/mrustc ${DESTDIR}${PREFIX}/bin; }
 
 
-##### ###
-##### ### PLIST components
-##### ###
-#####
-##### # Stub libraries for functions missing from base system.
-##### .if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || \
-#####     !empty(MACHINE_PLATFORM:MDarwin-9.*-i386) || \
-#####     !empty(MACHINE_PLATFORM:MDarwin-1[0-9].*) || \
-#####     ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \
-#####     ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" || \
-#####     ${OPSYS} == "Linux"
-##### PLIST.ocaml-stub=	yes
-##### .endif
-#####
-##### # Optional components built only on certain platforms.
-##### .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-#####     !empty(MACHINE_ARCH:M*arm*) || (${MACHINE_ARCH} == "aarch64") || \
-#####     (${MACHINE_ARCH} == "x86_64")
-##### BUILD_TARGET+=		opt opt.opt
-##### TEST_PROGRAM+=		ocamltest.opt
-##### PLIST.ocaml-opt=	yes
-##### .  if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \
-#####       empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
-#####       (${MACHINE_ARCH} != "aarch64")
-##### PLIST.ocaml-prof=	yes
-##### .  endif
-##### .endif
-#####
-##### # XXX This conditional is not complete.  It should match the
-##### # conditional in ocaml-x.y.z/configure.
-##### .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64") || \
-#####     (${MACHINE_ARCH} == "aarch64") || (${MACHINE_ARCH} == "powerpc") || \
-#####     !empty(MACHINE_ARCH:Mearm*)
-##### .  if !empty(MACHINE_PLATFORM:MLinux-*-*) || \
-#####       !empty(MACHINE_PLATFORM:MFreeBSD-*-*) || \
-#####       !empty(MACHINE_PLATFORM:MDragonFly-*-*) || \
-#####       !empty(MACHINE_PLATFORM:MNetBSD-*-*) || \
-#####       !empty(MACHINE_PLATFORM:MDarwin-*-*) || \
-#####       !empty(MACHINE_PLATFORM:MSunOS-*-*)
-##### PLIST.ocaml-nat=	yes
-##### .  endif
-##### .endif
-#####
-##### # Spacetime profiling is only available for native code on 64-bit targets.
-##### .if (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "aarch64")
-##### PLIST.ocaml-spacetime=	yes
-##### .endif
-#####
-##### # clock_gettime(2), required by POSIX, is necessary for the
-##### # instrumented_runtime feature.
-##### # It is missing on macOS before 10.12.
-##### .if ${OPSYS} != "Darwin" || ${OS_VERSION:R:R} >= 16
-##### PLIST.instrumented_runtime=	yes
-##### .endif
-#####
-##### # This is needed because ${WRKSRC}/build/partial-install.sh uses
-##### # $PWD as part of its script.  However, with /bin/sh on SunOS
-##### # (cd work/foo-1.0 && echo $PWD) will show that the value of PWD is
-##### # set before the cd takes place and is then passed down.  So the end
-##### # result is when ./build/partial-install.sh is called, PWD is set
-##### # to /usr/pkgsrc/devel/ocaml instead of ${WRKSRC}.  /bin/ksh, which
-##### # is what ${SH} is on SunOS, doesn't exhibit this behaviour.
-##### .if ${OPSYS} == "SunOS"
-##### INSTALL_MAKE_FLAGS+=	SHELL=${SH:Q}
-##### .endif
-
-#INSTALLATION_DIRS=	${PKGMANDIR}/man1
-
-##### OPSYSVARS+=		EXTRA_RT_LIBS
-##### EXTRA_RT_LIBS.NetBSD=	-lcurses
-##### EXTRA_RT_LIBS.*=
-
-##### PRINT_PLIST_AWK+=	{ gsub(/lib\/ocaml\/${PKGMANDIR:S|/|\\/|}/, "lib/ocaml/$${PKGMANDIR}"); }
-
-#####do-test:
-#####	cd ${WRKSRC} && ${MAKE_PROGRAM} ${TEST_PROGRAM}
-#####	cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all
-
-##### .if ${OPSYS} == "Darwin"
-##### .PHONY: fix-darwin-install-name
-##### post-install: fix-darwin-install-name
-##### fix-darwin-install-name:
-##### 	for f in ${DESTDIR}${PREFIX}/lib/ocaml/*.so \
-##### 		${DESTDIR}${PREFIX}/lib/ocaml/stublibs/*.so; do \
-##### 		install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
-##### 	done
-##### .endif
-
-#post-install:
-#	set -e ; cd ${DESTDIR}${PREFIX}/lib/ocaml/${PKGMANDIR}/man1;	\
-#	for m in *; do							\
-#	  ln -sf ${PREFIX}/lib/ocaml/${PKGMANDIR}/man1/$$m		\
-#		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/$$m;		\
-#	done
-
-##.include "../../mk/dlopen.buildlink3.mk"
-##### .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mrust/Makefile b/mrust/Makefile
index a86b9fe55d..37450676ad 100644
--- a/mrust/Makefile
+++ b/mrust/Makefile
@@ -1,12 +1,15 @@
 # $NetBSD: Makefile,v 1.1 2022/01/11 20:10:00 dlb Exp $
 
+SKIP_MRUSTC_SRC=	true
 .include "../../wip/mrust/Makefile.common"
 
-PKGNAME=	mrust-${SNAPSTAMP}
-COMMENT=	mrustc meta package (builds several other "mrust-" packages)
-DISTFILES=	
+##PKGNAME=	mrust-${SNAPSTAMP}
+COMMENT=	Meta package for mrustc (builds other "mrust-" packages)
+DISTFILES=
 
-SUBST_STAGE.atomic-pathfix=	none
+.if defined(MR_OUTDIR)
+.  undef MR_OUTDIR
+.endif
 
 DEPENDS+=	mrust-mrustc>=${SNAPSTAMP}:../../wip/mrust-mrustc
 DEPENDS+=	mrust-minicargo>=${SNAPSTAMP}:../../wip/mrust-minicargo
diff --git a/mrust/Makefile.common b/mrust/Makefile.common
index ae30ca00d2..c46ceab107 100644
--- a/mrust/Makefile.common
+++ b/mrust/Makefile.common
@@ -1,9 +1,18 @@
 # $NetBSD: Makefile.common,v 1.1 2021/12/04 08:08:43 xxxx Exp $
-# used by lang/mrust-mrustc/Makefile
-# used by lang/mrust-minicargo/Makefile
-# used by lang/mrust-libs/Makefile
-# used by lang/mrust-rustc/Makefile
-# used by lang/mrust-cargo/Makefile
+#
+### used by lang/mrust-mrustc/Makefile
+### used by lang/mrust-minicargo/Makefile
+### used by lang/mrust-libs/Makefile
+### used by lang/mrust-rustc/Makefile
+### used by lang/mrust-cargo/Makefile
+### used by lang/mrust/Makefile
+#
+# used by wip/mrust-mrustc/Makefile
+# used by wip/mrust-minicargo/Makefile
+# used by wip/mrust-libs/Makefile
+# used by wip/mrust-rustc/Makefile
+# used by wip/mrust-cargo/Makefile
+# used by wip/mrust/Makefile
 # used by (etc)
 
 GITHUB_PROJECT=	mrustc
@@ -27,13 +36,6 @@ LICENSE=	mit
 
 USE_LANGUAGES+=		c++14
 USE_TOOLS+=		gmake
-###GNU_CONFIGURE=		yes
-#CONFIGURE_ENV+=	BDB_LIBS=${BDB_LINK:Q}
-#CONFIGURE_ARGS+=	-prefix ${PREFIX}
-#CONFIGURE_ARGS+=	-with-pthread
-#CONFIGURE_ARGS+=	-host ${MACHINE_GNU_PLATFORM:Q}
-#CONFIGURE_ARGS+=	--without-x
-#CPPFLAGS+=		-DDB_DBM_HSEARCH
 
 RUSTVER=		1.39.0
 
@@ -65,14 +67,9 @@ MAKE_ENV+=		RUSTC_VERSION=${RUSTVER}
 #MAKE_ENV+=		RUSTC_TARGET=${MACHINE_ARCH}-unknown-${OPSYS:tl}
 ##
 
-#DISTINFO_FILE=	${.CURDIR}/../../lang/ocaml/distinfo
-#PATCHDIR=	${.CURDIR}/../../lang/ocaml/patches
 
 .include "../../mk/bsd.prefs.mk"
 
-###.if ${OPSYS} == "Linux"
-###INSTALL_UNSTRIPPED=	yes
-###.endif
 
 #.if ${OPSYS} == "Darwin"
 #CONFIGURE_ENV+=	CC="${CC} -arch ${MACHINE_ARCH} ${CFLAGS}"
@@ -82,33 +79,21 @@ MAKE_ENV+=		RUSTC_VERSION=${RUSTVER}
 #CONFIGURE_ENV+=	CC="${CC} ${CFLAGS}"
 #.endif
 
-###.include "../../mk/bdb.buildlink3.mk"
-
-#BDB_LINK=	${BDB_LIBS}
-#.if empty(BDBBASE:M/usr)
-#BDB_LINK+=	-L${BDBBASE}/lib ${COMPILER_RPATH_FLAG}${BDBBASE}/lib
-#.endif
 
+.if !defined(SKIP_MRUSTC_SRC)
 SUBST_CLASSES+=			atomic-pathfix
 SUBST_STAGE.atomic-pathfix=	pre-configure
 SUBST_MESSAGE.atomic-pathfix=	Configuring default path for libatomic.so
 SUBST_FILES.atomic-pathfix=	src/trans/target.cpp
 SUBST_SED.atomic-pathfix=	-e '/define.*BACKEND_C_OPTS_GNU/s|"atomic"|"atomic", "-L", "${PREFIX}/lib"|'
+.endif
+
 
 post-patch:
-	@if [ -e ${WRKSRC} ]; then (cd ${WRKSRC};			\
+	if [ -e ${WRKSRC} ]; then (cd ${WRKSRC};			\
 	    ${MV} rust-version rust-version.dist;			\
 	    ${ECHO} ${RUSTVER} > rust-version;				\
 	    ${TOUCH} -t 200101010101 rust-version); fi
 
-#post-extract: cp-gnu-config
-
-#.PHONY: cp-gnu-config
-#cp-gnu-config:
-#	${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/
-#	${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/
 
 ##.include "../../mk/atomic64.mk"	# DLBFLAG: will this be needed?
-###.include "../../mk/pthread.buildlink3.mk"
-
-# url2pkg-marker (please do not remove this line.)
Prev by Date: biolibc: Update to 0.2.1.12
Next by Date: fastq-trim: Update to 0.0.0.51
Previous by Thread: biolibc: Update to 0.2.1.12
Next by Thread: fastq-trim: Update to 0.0.0.51
Indexes:
Home | Main Index | Thread Index | Old Index