dma(8): Add a fixed version number instead of running git every time.
authorSascha Wildner <saw@online.de>
Fri, 21 Feb 2014 18:41:44 +0000 (19:41 +0100)
committerSascha Wildner <saw@online.de>
Fri, 21 Feb 2014 18:41:44 +0000 (19:41 +0100)
Use 0.9+. It's what FreeBSD took and that's a good idea.

Remove unused get-version.sh script again.

libexec/dma/dma-mbox-create/Makefile
libexec/dma/dma/Makefile
libexec/dma/get-version.sh [deleted file]

index 0b8a14e..daed610 100644 (file)
@@ -3,7 +3,7 @@
 CFLAGS+=-I${.CURDIR}/..
 CFLAGS+= -DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME
 CFLAGS+=-DCONF_PATH='"/etc/dma"'
-CFLAGS+=-DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.7"'
+CFLAGS+=-DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"'
 
 PROG=  dma-mbox-create
 NOMAN=
index ecd9c57..6c26cf0 100644 (file)
@@ -1,11 +1,9 @@
-version!=       sh get-version.sh
-
 .PATH: ${.CURDIR}/..
 
 CFLAGS+=-I${.CURDIR}/..
 CFLAGS+= -DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME
 CFLAGS+=-DCONF_PATH='"/etc/dma"'
-CFLAGS+=-DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"${version}"'
+CFLAGS+=-DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"'
 
 DPADD=  ${LIBSSL} ${LIBCRYPTO}
 LDADD=  -lssl -lcrypto
diff --git a/libexec/dma/get-version.sh b/libexec/dma/get-version.sh
deleted file mode 100644 (file)
index aecc333..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-gitver=$(git describe 2>/dev/null | tr - .)
-filever=$(cat VERSION)
-
-version=${gitver}
-: ${version:=$filever}
-
-echo "$version"