Wed Nov 29 16:34:40 2017 UTC ()
Clean up PLIST.

Since we install the one built file in the package Makefile, no need
to patch the dist install target.


(hauke)
diff -r1.3 -r1.4 pkgsrc/lang/micropython/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/micropython/PLIST
diff -r1.4 -r1.5 pkgsrc/lang/micropython/distinfo
diff -r1.2 -r1.3 pkgsrc/lang/micropython/patches/patch-unix_Makefile
cvs diff -r1.3 -r1.4 pkgsrc/lang/micropython/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/micropython/Makefile 2017/11/29 15:13:31 1.3
+++ pkgsrc/lang/micropython/Makefile 2017/11/29 16:34:40 1.4
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.3 2017/11/29 15:13:31 hauke Exp $ 1# $NetBSD: Makefile,v 1.4 2017/11/29 16:34:40 hauke Exp $
2 2
3DISTNAME= micropython-1.9.2 3DISTNAME= micropython-1.9.2
 4PKGREVISION= 1
4CATEGORIES= lang 5CATEGORIES= lang
5MASTER_SITES= http://micropython.org/resources/source/ 6MASTER_SITES= http://micropython.org/resources/source/
6EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
7 8
8MAINTAINER= agc@NetBSD.org 9MAINTAINER= agc@NetBSD.org
9HOMEPAGE= https://micropython.org/ 10HOMEPAGE= https://micropython.org/
10COMMENT= Embedded version of python 3 11COMMENT= Embedded version of python 3
11LICENSE= mit 12LICENSE= mit
12 13
13DIST_SUBDIR= ${PKGNAME_NOREV} 14DIST_SUBDIR= ${PKGNAME_NOREV}
14BUILD_DIRS= unix 15BUILD_DIRS= unix
15 16
16USE_TOOLS+= pax gmake pkg-config 17USE_TOOLS+= pax gmake pkg-config
cvs diff -r1.2 -r1.3 pkgsrc/lang/micropython/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/micropython/PLIST 2017/11/29 15:13:31 1.2
+++ pkgsrc/lang/micropython/PLIST 2017/11/29 16:34:40 1.3
@@ -1,7 +1,2 @@ @@ -1,7 +1,2 @@
1@comment $NetBSD: PLIST,v 1.2 2017/11/29 15:13:31 hauke Exp $ 1@comment $NetBSD: PLIST,v 1.3 2017/11/29 16:34:40 hauke Exp $
2bin/micropython 2bin/micropython
3@pkgdir share/examples/micropython/unix 
4@pkgdir share/examples/micropython/network 
5@pkgdir share/examples/micropython/hwapi 
6@pkgdir share/examples/micropython/embedding 
7@pkgdir share/examples/micropython/SDdatalogger 
cvs diff -r1.4 -r1.5 pkgsrc/lang/micropython/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/micropython/distinfo 2017/11/29 15:13:31 1.4
+++ pkgsrc/lang/micropython/distinfo 2017/11/29 16:34:40 1.5
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.4 2017/11/29 15:13:31 hauke Exp $ 1$NetBSD: distinfo,v 1.5 2017/11/29 16:34:40 hauke Exp $
2 2
3SHA1 (micropython-1.9.2/micropython-1.9.2.tar.xz) = c14b2e7ebaefe86e60f4b11cf738947cf8204fba 3SHA1 (micropython-1.9.2/micropython-1.9.2.tar.xz) = c14b2e7ebaefe86e60f4b11cf738947cf8204fba
4RMD160 (micropython-1.9.2/micropython-1.9.2.tar.xz) = 9c22131546c3e49bfa28b5f71994b20ee819d094 4RMD160 (micropython-1.9.2/micropython-1.9.2.tar.xz) = 9c22131546c3e49bfa28b5f71994b20ee819d094
5SHA512 (micropython-1.9.2/micropython-1.9.2.tar.xz) = 67d070d47c19a100d164f9b4e4ec7eba10cf5ee49089f5f4d6a8338a9d72d6cffa41c2f6de73c8b169ba8011961b8ef197241fa5bea6813f77f65ef4cf2f4e4b 5SHA512 (micropython-1.9.2/micropython-1.9.2.tar.xz) = 67d070d47c19a100d164f9b4e4ec7eba10cf5ee49089f5f4d6a8338a9d72d6cffa41c2f6de73c8b169ba8011961b8ef197241fa5bea6813f77f65ef4cf2f4e4b
6Size (micropython-1.9.2/micropython-1.9.2.tar.xz) = 6699860 bytes 6Size (micropython-1.9.2/micropython-1.9.2.tar.xz) = 6699860 bytes
7SHA1 (patch-lib_utils_printf.c) = 6c152cd10a5fb0091d1149a0a50b202df6a6e931 7SHA1 (patch-lib_utils_printf.c) = 6c152cd10a5fb0091d1149a0a50b202df6a6e931
8SHA1 (patch-mpy-cross_mpconfigport.h) = 78cf0865c60bf8fbbecb318e4f0597662076459e 8SHA1 (patch-mpy-cross_mpconfigport.h) = 78cf0865c60bf8fbbecb318e4f0597662076459e
9SHA1 (patch-py_mkenv.mk) = ff844cd4bcb6f9a2a27e02a62a066b4b70899c88 9SHA1 (patch-py_mkenv.mk) = ff844cd4bcb6f9a2a27e02a62a066b4b70899c88
10SHA1 (patch-unix_Makefile) = 51a636af55719e454f1464aa7c1c06c0808de56a 10SHA1 (patch-unix_Makefile) = 459483caf54b9180f67bd07bbfa7fcf6088de1cc
11SHA1 (patch-unix_mpconfigport.h) = 544c0217ffcc8755adbb8c63a4b325af9b7ff8a2 11SHA1 (patch-unix_mpconfigport.h) = 544c0217ffcc8755adbb8c63a4b325af9b7ff8a2
12SHA1 (patch-unix_mpthreadport.c) = 5a021a4b1b7426ea7bae302870a04008381ee9c7 12SHA1 (patch-unix_mpthreadport.c) = 5a021a4b1b7426ea7bae302870a04008381ee9c7
cvs diff -r1.2 -r1.3 pkgsrc/lang/micropython/patches/patch-unix_Makefile (expand / switch to unified diff)

--- pkgsrc/lang/micropython/patches/patch-unix_Makefile 2017/11/29 15:13:32 1.2
+++ pkgsrc/lang/micropython/patches/patch-unix_Makefile 2017/11/29 16:34:40 1.3
@@ -1,31 +1,14 @@ @@ -1,31 +1,14 @@
1$NetBSD: patch-unix_Makefile,v 1.2 2017/11/29 15:13:32 hauke Exp $ 1$NetBSD: patch-unix_Makefile,v 1.3 2017/11/29 16:34:40 hauke Exp $
2 2
3cpp(1) only accepts one file for input, we want cc -E here. 3cpp(1) only accepts one file for input, we want cc -E here.
4 4
5Set up for pkgsrc install 
6 
7--- unix/Makefile.orig 2017-08-23 01:50:11.000000000 +0000 5--- unix/Makefile.orig 2017-08-23 01:50:11.000000000 +0000
8+++ unix/Makefile 6+++ unix/Makefile
9@@ -73,6 +73,7 @@ LDFLAGS_ARCH = -Wl,-map,$@.map -Wl,-dead 7@@ -73,6 +73,7 @@ LDFLAGS_ARCH = -Wl,-map,$@.map -Wl,-dead
10 else 8 else
11 # Use gcc syntax for map file 9 # Use gcc syntax for map file
12 LDFLAGS_ARCH = -Wl,-Map=$@.map,--cref -Wl,--gc-sections 10 LDFLAGS_ARCH = -Wl,-Map=$@.map,--cref -Wl,--gc-sections
13+CPP = $(CC) -E 11+CPP = $(CC) -E
14 endif 12 endif
15 LDFLAGS = $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA) 13 LDFLAGS = $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
16  14
17@@ -193,12 +194,10 @@ test: $(PROG) $(TOP)/tests/run-tests 
18  
19 # install micropython in /usr/local/bin 
20 TARGET = micropython 
21-PREFIX = $(DESTDIR)/usr/local 
22-BINDIR = $(PREFIX)/bin 
23+BINDIR = $(DESTDIR)$(PREFIX)/bin 
24  
25 install: micropython 
26- install -d $(BINDIR) 
27- install $(TARGET) $(BINDIR)/$(TARGET) 
28+ ${BSD_INSTALL_PROGRAM} $(TARGET) $(BINDIR)/$(TARGET) 
29  
30 # uninstall micropython 
31 uninstall: