diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile index f9291b02cde2..26c540287f34 100644 --- a/comms/aldo/Makefile +++ b/comms/aldo/Makefile @@ -15,7 +15,6 @@ LIB_DEPENDS= libao.so:audio/libao USES= autoreconf compiler:c++0x localbase GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share PLIST_FILES= bin/aldo \ share/man/man1/aldo.1.gz diff --git a/comms/aldo/files/patch-VERSION b/comms/aldo/files/patch-VERSION new file mode 100644 index 000000000000..0a22ab2f1da9 --- /dev/null +++ b/comms/aldo/files/patch-VERSION @@ -0,0 +1,6 @@ +--- VERSION.orig 2013-07-16 10:33:43 UTC ++++ VERSION +@@ -1,2 +1 @@ +-0.7.7 +- ++0.7.8 diff --git a/comms/aldo/files/patch-configure b/comms/aldo/files/patch-configure deleted file mode 100644 index ecac41752b54..000000000000 --- a/comms/aldo/files/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.orig 2012-03-31 11:55:36 UTC -+++ configure -@@ -2725,9 +2725,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' - - - --CPPFLAGS="-I${includedir}" --LDFLAGS="-L${libdir}" --LIBS="-L${libdir} ${LIBS}" - - # Checks for programs. - ac_ext=cpp diff --git a/comms/aldo/files/patch-configure.ac b/comms/aldo/files/patch-configure.ac new file mode 100644 index 000000000000..dcd4d66d58d9 --- /dev/null +++ b/comms/aldo/files/patch-configure.ac @@ -0,0 +1,36 @@ +--- configure.ac.orig 2013-07-16 10:33:43 UTC ++++ configure.ac +@@ -2,22 +2,17 @@ AC_PREREQ([2.59]) + # Process this file with autoconf to produce a configure script. + + AC_PREREQ([2.59]) +-AC_INIT([aldo], [0.7.7], [Giuseppe Martino denever@users.sf.net]) ++AC_INIT([aldo], [0.7.8], [Giuseppe Martino denever@users.sf.net]) + AC_CONFIG_AUX_DIR(config) +-AC_CONFIG_HEADER([config.h]) +-AM_INIT_AUTOMAKE([dist-bzip2]) ++AC_CONFIG_HEADERS([config.h]) ++AM_INIT_AUTOMAKE + +-CPPFLAGS="-I${includedir}" +-LDFLAGS="-L${libdir}" +-LIBS="-L${libdir} ${LIBS}" +- + # Checks for programs. + AC_PROG_CXX + AC_PROG_INSTALL + #AC_PROG_RANLIB + + # Checks for header files. +-AC_HEADER_STDC + AC_CHECK_LIB(ao, main) + AC_CHECK_HEADERS(ao/ao.h, [], [echo "Error! You need to have libao (www.xiph.org/ao) around.";exit -1]) + +@@ -27,7 +22,6 @@ AC_C_INLINE + AC_C_INLINE + + # Checks for library functions. +-AC_PROG_GCC_TRADITIONAL + AC_CHECK_FUNCS([floor]) + + AC_CONFIG_FILES([Makefile diff --git a/comms/aldo/files/patch-include_Makefile.in b/comms/aldo/files/patch-include_Makefile.in deleted file mode 100644 index 370528edcfa7..000000000000 --- a/comms/aldo/files/patch-include_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- include/Makefile.in.orig 2012-03-31 11:55:36 UTC -+++ include/Makefile.in -@@ -105,7 +105,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --VERSION = @VERSION@ -+VERSION = "@VERSION@" - abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@