summaryrefslogtreecommitdiffstats
path: root/display/fbterm
diff options
context:
space:
mode:
authorJustin Boffemmyer2009-11-29 10:52:21 -0500
committerJustin Boffemmyer2009-11-29 11:01:32 -0500
commit6a4bab8d7466830216dd7acdd7c8ccc05c9971cf (patch)
tree39b0239ef89c1e12c7305edf56e851dc7dd780de /display/fbterm
parente9f756249bbf23026aba8536228e13dabb113389 (diff)
display/fbterm: updated to 1.6
Diffstat (limited to 'display/fbterm')
-rwxr-xr-xdisplay/fbterm/DEPENDS12
-rwxr-xr-xdisplay/fbterm/DETAILS4
-rw-r--r--display/fbterm/HISTORY9
-rwxr-xr-xdisplay/fbterm/PRE_BUILD4
-rw-r--r--display/fbterm/configure_exit_1.patch25
5 files changed, 51 insertions, 3 deletions
diff --git a/display/fbterm/DEPENDS b/display/fbterm/DEPENDS
index 2222fab4ec..8eadf07df2 100755
--- a/display/fbterm/DEPENDS
+++ b/display/fbterm/DEPENDS
@@ -1,3 +1,13 @@
depends g++ &&
depends fontconfig &&
-depends freetype2
+depends freetype2 &&
+
+optional_depends gpm \
+ "--enable-gpm" \
+ "--disable-gpm" \
+ "Enable gpm (mouse) support?" &&
+
+optional_depends libx86 \
+ "--enable-vesa" \
+ "--disable-vesa" \
+ "Support vesa cards (non-framebuffer ability)?"
diff --git a/display/fbterm/DETAILS b/display/fbterm/DETAILS
index 2d35874061..32204c5a16 100755
--- a/display/fbterm/DETAILS
+++ b/display/fbterm/DETAILS
@@ -1,8 +1,8 @@
SPELL=fbterm
- VERSION=1.5
+ VERSION=1.6
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
- SOURCE_HASH=sha512:9085d0e54e48c52b5e4369d979b274a2bbb56305112f5cbc21ac7138ac4340a2b105b987299604d54df59910524843c882e737449438659a487405f51c62fa14
+ SOURCE_HASH=sha512:09b46b7dd86329da94633d46655560aeee1ac6149cc667f1be3634511dbeb40f0cefe24ed90983534b169409fa6772c513a2a6286cd534f5070491f22ed5aaac
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://code.google.com/p/${SPELL}/ "
LICENSE[0]=GPL
diff --git a/display/fbterm/HISTORY b/display/fbterm/HISTORY
index 141beb6947..65ca3cf6da 100644
--- a/display/fbterm/HISTORY
+++ b/display/fbterm/HISTORY
@@ -1,3 +1,12 @@
+2009-11-29 Justin Boffemmyer <flux@sourcemage.org>
+ * DETAILS: version 1.6
+ * DEPENDS: added optional_depends for libx86 (vesa support) and gpm
+ (mouse support)
+ * PRE_BUILD: created, apply upstream patch configure_exit_1.patch and
+ fix critical typos in the configure script via sed
+ * configure_exit_1.patch: upstream patch to fix the exit status of the
+ configure script
+
2009-05-24 Justin Boffemmyer <flux@sourcemage.org>
* DETAILS: version 1.5
diff --git a/display/fbterm/PRE_BUILD b/display/fbterm/PRE_BUILD
new file mode 100755
index 0000000000..52577eaee6
--- /dev/null
+++ b/display/fbterm/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/configure_exit_1.patch &&
+sed -i 's/enalbe/enable/' configure
diff --git a/display/fbterm/configure_exit_1.patch b/display/fbterm/configure_exit_1.patch
new file mode 100644
index 0000000000..662ce16f9f
--- /dev/null
+++ b/display/fbterm/configure_exit_1.patch
@@ -0,0 +1,25 @@
+diff -ru configure configure
+--- configure 2009-11-14 09:00:00.000000000 +0800
++++ configure 2009-11-15 09:45:40.000000000 +0800
+@@ -5754,6 +5754,11 @@
+ [ "$SIGNALFD" = "yes" ] && $as_echo "#define HAVE_SIGNALFD 1" >>confdefs.h
+
+
++[ "$GPM_WARN" = "yes" ] && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gpm.h doesn't exist! gpm mouse support will be disabled!" >&5
++$as_echo "$as_me: WARNING: gpm.h doesn't exist! gpm mouse support will be disabled!" >&2;}
++[ "$VESA_WARN" = "yes" ] && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libx86.h doesn't exist! VESA support will be disabled!" >&5
++$as_echo "$as_me: WARNING: libx86.h doesn't exist! VESA support will be disabled!" >&2;}
++
+ ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile im/Makefile terminfo/Makefile doc/Makefile doc/fbterm.1"
+
+ ac_config_links="$ac_config_links im/input_key.h:src/input_key.h im/immessage.h:src/immessage.h"
+@@ -7236,8 +7241,3 @@
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+
+-
+-[ "$GPM_WARN" = "yes" ] && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gpm.h doesn't exist! gpm mouse support will be disabled!" >&5
+-$as_echo "$as_me: WARNING: gpm.h doesn't exist! gpm mouse support will be disabled!" >&2;}
+-[ "$VESA_WARN" = "yes" ] && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libx86.h doesn't exist! VESA support will be disabled!" >&5
+-$as_echo "$as_me: WARNING: libx86.h doesn't exist! VESA support will be disabled!" >&2;}
+