summaryrefslogtreecommitdiffstats
path: root/windowmanagers
diff options
context:
space:
mode:
authorFlorian Franzmann2016-08-05 16:52:24 +0200
committerFlorian Franzmann2016-08-06 13:19:10 +0200
commit010e5b64ead5d9e729db381a512ee5057c5fb3c7 (patch)
treeba2860331ed226e3e56765fd80c31cadc57a7948 /windowmanagers
parent20ea868db72fe597db408890e01ed3e542e6e945 (diff)
windowmanagers/fvwm: version 2.6.6
Diffstat (limited to 'windowmanagers')
-rwxr-xr-xwindowmanagers/fvwm/BUILD6
-rwxr-xr-xwindowmanagers/fvwm/DETAILS13
-rw-r--r--windowmanagers/fvwm/HISTORY4
-rwxr-xr-xwindowmanagers/fvwm/PRE_BUILD8
4 files changed, 21 insertions, 10 deletions
diff --git a/windowmanagers/fvwm/BUILD b/windowmanagers/fvwm/BUILD
index f6d2bdc573..b1f5b99501 100755
--- a/windowmanagers/fvwm/BUILD
+++ b/windowmanagers/fvwm/BUILD
@@ -1,8 +1,2 @@
-if [[ "${FVWM_BRANCH}" == "scm" ]]; then
- aclocal &&
- autoheader &&
- automake --add-missing &&
- autoreconf
-fi &&
OPTS="$OPTS $FVWM_OPTS" &&
default_build
diff --git a/windowmanagers/fvwm/DETAILS b/windowmanagers/fvwm/DETAILS
index f6589adb48..e2ceff7e0d 100755
--- a/windowmanagers/fvwm/DETAILS
+++ b/windowmanagers/fvwm/DETAILS
@@ -11,13 +11,18 @@ else
if [[ "${FVWM_BRANCH}" == "unstable" ]] ; then
VERSION=2.7.0
SOURCE_HASH=sha512:45ca6ff8c4303e11a916aeeedbef070066e216804be165a6fc36129314927818efe720024b69eb248a0a7884ca869cf47854a4ecfad7bdfaeb9b392c0bd2d6a1
- else
- VERSION=2.6.5
- SOURCE_HASH=sha512:a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698
- fi
SOURCE=fvwm-${VERSION}.tar.bz2
+ SOURCE_URL[0]=ftp://ftp.fvwm.org/pub/fvwm/version-2/${SOURCE}
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/fvwm-${VERSION}
+ else
+ VERSION=2.6.6
+ XVERSION=$(echo $VERSION | tr '.' '_')
+ SOURCE_HASH=sha512:0a9a0d9054b4fa0122743c59312201023b844935803a6f07495e8ee54228148d04d490b8c15d3183bc05ffd5dfe3a2edb519e7a15891fadc23e394e9ac8753e4
+ SOURCE=fvwm-${VERSION}.tar.gz
SOURCE_URL[0]=ftp://ftp.fvwm.org/pub/fvwm/version-2/${SOURCE}
+ SOURCE_URL[0]=https://github.com/fvwmorg/fvwm/archive/version-${XVERSION}.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/fvwm-version-${XVERSION}
+ fi
fi
WEB_SITE=http://www.fvwm.org
ENTERED=20040524
diff --git a/windowmanagers/fvwm/HISTORY b/windowmanagers/fvwm/HISTORY
index 38bef69bf3..6ce21ede4b 100644
--- a/windowmanagers/fvwm/HISTORY
+++ b/windowmanagers/fvwm/HISTORY
@@ -1,3 +1,7 @@
+2016-08-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.6.6
+ * BUILD, PRE_BUILD: move autoconf etc. to PRE_BUILD
+
2014-07-03 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: Use get_scm_version
diff --git a/windowmanagers/fvwm/PRE_BUILD b/windowmanagers/fvwm/PRE_BUILD
new file mode 100755
index 0000000000..858f4a19a3
--- /dev/null
+++ b/windowmanagers/fvwm/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+aclocal &&
+autoheader &&
+automake --add-missing &&
+autoreconf
+