diff --git a/video/vbetool/pci-compile-fix.patch b/video/vbetool/pci-compile-fix.patch deleted file mode 100644 index 1939ef4a4..000000000 --- a/video/vbetool/pci-compile-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../vbetool/pci-compile-fix.patch -# Copyright (C) 2007 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- vbetool-0.7/vbetool.c.orig 2006-07-26 09:27:21.000000000 +0800 -+++ vbetool-0.7/vbetool.c 2007-08-08 14:22:41.000000000 +0800 -@@ -8,7 +8,6 @@ - version 2 - */ - --#include - #include - #include - #include -@@ -17,6 +16,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/video/vbetool/vbetool-1.1-linking.patch b/video/vbetool/vbetool-1.1-linking.patch new file mode 100644 index 000000000..b7eb99953 --- /dev/null +++ b/video/vbetool/vbetool-1.1-linking.patch @@ -0,0 +1,34 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../vbetool/vbetool-1.1-linking.patch +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Decription: Do not link explicitely against libpci.a + +--- vbetool-1.1/Makefile.am.orig 2011-05-12 10:45:05.264002074 +0200 ++++ vbetool-1.1/Makefile.am 2011-05-12 10:46:00.696002074 +0200 +@@ -2,7 +2,7 @@ + + sbin_PROGRAMS = vbetool + +-vbetool_LDADD = $(libdir)/libpci.a ++vbetool_LDADD = -lpci -lz -lx86 + + man_MANS = vbetool.1 + vbetool_SOURCES = vbetool.c $(x86) +@@ -14,4 +14,3 @@ + $(RM) Makefile.in aclocal.m4 config.h.in stamp-h.in configure + + AM_CFLAGS = -g -Wall -pedantic -std=gnu99 +-AM_LDFLAGS = -lz -lx86 diff --git a/video/vbetool/vbetool.conf b/video/vbetool/vbetool.conf index e1795332c..d5dee4fc6 100644 --- a/video/vbetool/vbetool.conf +++ b/video/vbetool/vbetool.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../vbetool/vbetool.conf -# Copyright (C) 2007 The OpenSDE Project +# Copyright (C) 2007 - 2011 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -12,10 +12,6 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- - -if [[ $libdir = *lib64 ]]; then - var_append makeopt " " "LDFLAGS='-L/lib64 -lz'" -else - var_append makeopt " " "LDFLAGS='-L/lib -lz'" -fi +# regenerate Makefile.in because we patch Makefile.am +hook_add preconf 9 'autoreconf -vf' diff --git a/video/vbetool/vbetool.desc b/video/vbetool/vbetool.desc index e415ad22f..72dabf164 100644 --- a/video/vbetool/vbetool.desc +++ b/video/vbetool/vbetool.desc @@ -29,7 +29,7 @@ [L] GPL [S] Beta -[V] 0.2 +[V] 1.1 [P] X -----5---9 800.000 -[D] 3115710190 vbetool_0.7-1.tar.gz http://www.codon.org.uk/~mjg59/vbetool/download/ +[D] 4236927021 vbetool-1.1.tar.gz http://www.codon.org.uk/~mjg59/vbetool/download/