ports

commit a97f3c4493271c0facfc6dbac8b6c983e55fa861
parent 170f47a03d3ec951661f87e8d60dbff7567f3930
Author: Daniel Bainton <dpb@driftaway.org>
Date:   Thu, 27 Mar 2014 22:05:18 +0000

Define package version in just one file

Diffstat:
M
file/file.mk
 | 
2
+-
M
file/mkfile
 | 
2
+-
A
file/v.mk
 | 
1
+
M
mksh/mkfile
 | 
3
++-
M
mksh/mksh.mk
 | 
6
++++--
A
mksh/v.mk
 | 
2
++
M
zlib/depsinc.mk
 | 
5
+++--
M
zlib/mkfile
 | 
2
+-
A
zlib/v.mk
 | 
1
+

9 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/file/file.mk b/file/file.mk
@@ -1,4 +1,4 @@
-v = 5.17
+<../../v.mk
 BIN = file
 OBJ = `{ls *.c | sed 's/.$/o/'}
 TARG = magic.mgc
diff --git a/file/mkfile b/file/mkfile
@@ -1,6 +1,6 @@
 <$mkbuild/mk.3rdparty
 
-v = 5.17
+<v.mk
 src = file-$v/src
 url = $mirror/file-$v.tar.gz
 mkfile = ../../file.mk
diff --git a/file/v.mk b/file/v.mk
@@ -0,0 +1 @@
+v = 5.17
diff --git a/mksh/mkfile b/mksh/mkfile
@@ -1,6 +1,7 @@
 <$mkbuild/mk.3rdparty
 
+<v.mk
 src = mksh
-url = $mirror/mksh-R47.tar.gz
+url = $mirror/mksh-$v.tar.gz
 mkfile = ../mksh.mk
 
diff --git a/mksh/mksh.mk b/mksh/mksh.mk
@@ -1,3 +1,5 @@
+<../v.mk
+
 BIN = mksh
 OBJ = \
 	edit.o \
@@ -26,7 +28,7 @@ INSTALL_SYMLINK = \
 	mksh.1 $MANDIR/man1/sh.1 \
 	mksh $BINDIR/ksh \
 	mksh.1 $MANDIR/man1/ksh.1
-LOCAL_CFLAGS = "\
+LOCAL_CFLAGS = \
 	-I.  -DMKSH_BUILDSH -D_GNU_SOURCE -DSETUID_CAN_FAIL_WITH_EAGAIN \
 	-DHAVE_ATTRIBUTE_BOUNDED=0 -DHAVE_ATTRIBUTE_FORMAT=1 \
 	-DHAVE_ATTRIBUTE_NORETURN=1 -DHAVE_ATTRIBUTE_UNUSED=1 \
@@ -45,7 +47,7 @@ LOCAL_CFLAGS = "\
 	-DHAVE_LANGINFO_CODESET=1 -DHAVE_SELECT=1 -DHAVE_SETRESUGID=1 \
 	-DHAVE_SETGROUPS=1 -DHAVE_STRERROR=1 -DHAVE_STRSIGNAL=1 -DHAVE_STRLCPY=1 \
 	-DHAVE_FLOCK_DECL=1 -DHAVE_REVOKE_DECL=1 -DHAVE_SYS_ERRLIST_DECL=0 \
-	-DHAVE_SYS_SIGLIST_DECL=0 -DHAVE_PERSISTENT_HISTORY=1 -DMKSH_BUILD_R=471"
+	-DHAVE_SYS_SIGLIST_DECL=0 -DHAVE_PERSISTENT_HISTORY=1 -DMKSH_BUILD_R=$BUILD
 
 histrap.o: signames.inc
 
diff --git a/mksh/v.mk b/mksh/v.mk
@@ -0,0 +1,2 @@
+v = R47
+BUILD = 471
diff --git a/zlib/depsinc.mk b/zlib/depsinc.mk
@@ -1,3 +1,4 @@
+<$zlib_DEPDIR/v.mk
 
-DEPS_CFLAGS = $DEPS_CFLAGS -I$zlib_DEPDIR/zlib-1.2.8
-DEPS_LDFLAGS = $DEPS_LDFLAGS -L$zlib_DEPDIR/zlib-1.2.8 -lz
+DEPS_CFLAGS = $DEPS_CFLAGS -I$zlib_DEPDIR/zlib-$v
+DEPS_LDFLAGS = $DEPS_LDFLAGS -L$zlib_DEPDIR/zlib-$v -lz
diff --git a/zlib/mkfile b/zlib/mkfile
@@ -1,6 +1,6 @@
 <$mkbuild/mk.3rdparty
 
-v = 1.2.8
+<v.mk
 src = zlib-$v
 url = $mirror/zlib-$v.tar.gz
 mkfile = ../zlib.mk
diff --git a/zlib/v.mk b/zlib/v.mk
@@ -0,0 +1 @@
+v = 1.2.8