smake: Updated to schilytools-2018-09-26

[Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Thu Sep 27 14:30:43 2018 +0200
Changeset:	c7d6a8c05fb81a0545b3022d930be2f92fa7c856

Modified Files:
	smake/Makefile
	smake/Makefile.common
	smake/TODO
	smake/distinfo

Log Message:
smake: Updated to schilytools-2018-09-26

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

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

diffstat:
 smake/Makefile        |  2 +-
 smake/Makefile.common | 79 ++++++++++++++++++++++++++++-----------------------
 smake/TODO            |  6 ++--
 smake/distinfo        |  8 +++---
 4 files changed, 51 insertions(+), 44 deletions(-)

diffs:
diff --git a/smake/Makefile b/smake/Makefile
index fcd7a530f0..2509fb870c 100644
--- a/smake/Makefile
+++ b/smake/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	schily-2018-09-04
+DISTNAME=	schily-2018-09-26
 PKGNAME=	smake-1.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=schilytools/}
diff --git a/smake/Makefile.common b/smake/Makefile.common
index ee193f40be..2bf568663a 100644
--- a/smake/Makefile.common
+++ b/smake/Makefile.common
@@ -3,50 +3,57 @@
 # used by wip/bosh/Makefile
 
 # All packages based on the schilytools tarball should include this Makefile
-# fragment to inherit and share the same pkgsrc specific platform hacks.
+# fragment to inherit and share the same pkgsrc platform specific code.
 
 # Map PKGSRC_COMPILER to CCOM used by schilytools build system.
 .if !empty(PKGSRC_COMPILER:Mgcc)
 MAKE_FLAGS+=	CCOM=gcc
 .elif !empty(PKGSRC_COMPILER:Mclang)
 MAKE_FLAGS+=	CCOM=clang
-# The following compilers are untested
-.elif !empty(PKGSRC_COMPILER:Micc)
-MAKE_FLAGS+=	CCOM=icc
+# Other compilers are currently untested, try to use them as cc
 .else
 MAKE_FLAGS+=	CCOM=cc
 .endif
 
+# OS rules
+# Some rules were copied from old packages (that are now part of schilytools
+# too) to not break what people have done in the past.
 pre-configure:
-
-# OS rules (including ones from old packages to not break what was there before)
-pre-configure:
-	set +e; cd ${WRKSRC}/RULES &&					\
-		 for i in arm mipsel x86_64 sparc64 powerpc;		\
-		 do							\
-			${LN} -sf i386-netbsd-gcc.rul "$$i"-netbsd-gcc.rul; \
-			${LN} -sf i386-netbsd-cc.rul "$$i"-netbsd-cc.rul; \
-		 done
-	set +e; cd ${WRKSRC}/RULES &&					\
-		${LN} -sf i586-linux-gcc.rul x86_64-linux-gcc.rul;	\
-		${LN} -sf i586-linux-cc.rul x86_64-linux-cc.rul;	\
-		${LN} -sf i386-freebsd-gcc.rul x86_64-freebsd-gcc.rul;	\
-		${LN} -sf i386-freebsd-cc.rul x86_64-freebsd-cc.rul;	\
-		${LN} -sf i386-freebsd-gcc.rul amd64-freebsd-gcc.rul;	\
-		${LN} -sf i386-freebsd-cc.rul amd64-freebsd-cc.rul;	\
-		${LN} -sf x86_64-netbsd-cc.rul amd64-openbsd-cc.rul;	\
-		${LN} -sf sun4-sunos5-cc.rul sun4v-sunos5-cc.rul;	\
-		${LN} -sf sun4-sunos5-gcc.rul sun4v-sunos5-gcc.rul;	\
-		${LN} -sf i386-darwin-clang.rul x86_64-darwin-clang.rul
-	set -e; cd ${WRKSRC}/RULES &&					\
-		for suffix in netbsd-clang.rul netbsd-cc.rul netbsd-gcc.rul; \
-		do							\
-			if [ ! -f ${MACHINE}-$$suffix ]; then		\
-				${LN} -s i386-$$suffix ${MACHINE}-$$suffix; \
-			fi;						\
-		done
-	set -e; cd ${WRKSRC}/RULES &&					\
-		if [ ! -f i386-netbsd-clang.rul ]; then			\
-			${SED} -e 's/cc-gcc.rul/cc-$$(C_ARCH).rul/'	\
-				i386-netbsd-gcc.rul >i386-netbsd-clang.rul; \
-		fi
+	@printf "Create OS rules...\n"
+	@cd ${WRKSRC}/RULES && . ${WRKSRC}/RULES/MKLINKS
+	@printf "Create pkgsrc OS rules...\n"
+	@cd ${WRKSRC}/RULES && unset r ;				\
+	for i in arm mipsel x86_64 sparc64 powerpc ;			\
+	do								\
+		r="$$r i386-netbsd-gcc.rul@$$i-netbsd-gcc.rul" ;	\
+		r="$$r i386-netbsd-cc.rul@$$i-netbsd-cc.rul" ;		\
+	done ;								\
+	r="$$r i386-freebsd-gcc.rul@x86_64-freebsd-gcc.rul" ;		\
+	r="$$r i386-freebsd-cc.rul@x86_64-freebsd-cc.rul" ;		\
+	${SED} -e 's/cc-gcc.rul/cc-$$(C_ARCH).rul/'			\
+		 i386-netbsd-gcc.rul >pkgsrc_i386-netbsd-clang.rul ;	\
+	r="$$r pkgsrc_i386-netbsd-clang.rul%i386-netbsd-clang.rul@localhost" ;	\
+	for i in netbsd-clang.rul netbsd-cc.rul netbsd-gcc.rul ;	\
+	do								\
+		r="$$r i386-$$i@${MACHINE}-$$i" ;			\
+	done ;								\
+									\
+	for i in $$r ;							\
+	do								\
+		existing=$$(printf "%s\n" $$i | ${SED} -e 's/@.*//') ;	\
+		target=$$(printf "%s\n" $$i | ${SED} -e 's/.*@//') ;	\
+		printf "%s " "$$target";				\
+		if ! test -e "$$existing" ;				\
+		then							\
+			printf "(Link target %s not present)\n"		\
+				"$$existing";				\
+			continue ;					\
+		fi;							\
+		if ! test -e "$$target" ;				\
+		then							\
+			${LN} -s "$$existing" "$$target" ;		\
+			printf "(created)\n" ;				\
+		else							\
+			printf "(already present)\n" ;			\
+		fi;							\
+	done
diff --git a/smake/TODO b/smake/TODO
index 93cee2c90a..51fd3211e4 100644
--- a/smake/TODO
+++ b/smake/TODO
@@ -1,11 +1,11 @@
 [X] Provide Makefile.common for all other packages based on schilytools
     All the platform specific code should be at a central location. This is
     the right place because smake is the recommended make for schilytools.
-[ ] Add the current platform hacks from archivers/star
-[ ] Add the current platform hacks from sysutils/cdrtools
-[ ] Add smake as tool for use with USE_TOOLS
+[X] Add the current platform hacks from archivers/star
+[X] Add the current platform hacks from sysutils/cdrtools
 [X] Test with gcc compiler
 [X] Test with clang compiler
+[ ] Add smake as tool for use with USE_TOOLS
 
 [ ] Test with Intel compiler
 [ ] Test commercial UNIX compilers
diff --git a/smake/distinfo b/smake/distinfo
index 99ef37fb31..f797e286dc 100644
--- a/smake/distinfo
+++ b/smake/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (schily-2018-09-04.tar.bz2) = bc1f86abd2269261c004488ed4b7fd6384200857
-RMD160 (schily-2018-09-04.tar.bz2) = f565288e1da41277111593447a5f17bd9b129ff5
-SHA512 (schily-2018-09-04.tar.bz2) = c0a8f638c31534589cb3ca3e98ca611639ad817bb4ce7147d06c5c946f16b087073d6df28d0c6f8e24ff2a87c92e88e83a9b01620e6fa7bf1303804ca1c25a97
-Size (schily-2018-09-04.tar.bz2) = 4294348 bytes
+SHA1 (schily-2018-09-26.tar.bz2) = 41693b863f5badc96f23f8c8f83390fbe7df539e
+RMD160 (schily-2018-09-26.tar.bz2) = 2c8a70c712960a3f77c0faf632bf9d76969a5518
+SHA512 (schily-2018-09-26.tar.bz2) = 5670bee370ca9408ebb827f5017f2d1505d25c2981c70bfe5e8e8648beba4228d778c2290ce623dcc9361a752e977cccf40b3174598e0a1c616171ce79af5885
+Size (schily-2018-09-26.tar.bz2) = 4297286 bytes