Attachment #257052 for bug #284281

Lines 15-21 LIB_DEPENDS= libao.so:audio/libao Link Here

(-)b/comms/aldo/Makefile (-1 lines)
15	USES= autoreconf compiler:c++0x localbase	15	USES= autoreconf compiler:c++0x localbase
16		16
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
19		18
20	PLIST_FILES= bin/aldo \	19	PLIST_FILES= bin/aldo \
21	share/man/man1/aldo.1.gz	20	share/man/man1/aldo.1.gz

Added Link Here

(-)b/comms/aldo/files/patch-VERSION (+6 lines)
1	--- VERSION.orig 2013-07-16 10:33:43 UTC
2	+++ VERSION
3	@@ -1,2 +1 @@
4	-0.7.7
5	-
6	+0.7.8




--- 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




--- 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




--- 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@
- 

Return to bug 284281

Removed Link Here

(-)a/comms/aldo/files/patch-configure (-12 lines)
1	--- configure.orig 2012-03-31 11:55:36 UTC
2	+++ configure
3	@@ -2725,9 +2725,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"'
4
5
6
7	-CPPFLAGS="-I${includedir}"
8	-LDFLAGS="-L${libdir}"
9	-LIBS="-L${libdir} ${LIBS}"
10
11	# Checks for programs.
12	ac_ext=cpp

Added Link Here

(-)b/comms/aldo/files/patch-configure.ac (+36 lines)
1	--- configure.ac.orig 2013-07-16 10:33:43 UTC
2	+++ configure.ac
3	@@ -2,22 +2,17 @@ AC_PREREQ([2.59])
4	# Process this file with autoconf to produce a configure script.
5
6	AC_PREREQ([2.59])
7	-AC_INIT([aldo], [0.7.7], [Giuseppe Martino denever@users.sf.net])
8	+AC_INIT([aldo], [0.7.8], [Giuseppe Martino denever@users.sf.net])
9	AC_CONFIG_AUX_DIR(config)
10	-AC_CONFIG_HEADER([config.h])
11	-AM_INIT_AUTOMAKE([dist-bzip2])
12	+AC_CONFIG_HEADERS([config.h])
13	+AM_INIT_AUTOMAKE
14
15	-CPPFLAGS="-I${includedir}"
16	-LDFLAGS="-L${libdir}"
17	-LIBS="-L${libdir} ${LIBS}"
18	-
19	# Checks for programs.
20	AC_PROG_CXX
21	AC_PROG_INSTALL
22	#AC_PROG_RANLIB
23
24	# Checks for header files.
25	-AC_HEADER_STDC
26	AC_CHECK_LIB(ao, main)
27	AC_CHECK_HEADERS(ao/ao.h, [], [echo "Error! You need to have libao (www.xiph.org/ao) around.";exit -1])
28
29	@@ -27,7 +22,6 @@ AC_C_INLINE
30	AC_C_INLINE
31
32	# Checks for library functions.
33	-AC_PROG_GCC_TRADITIONAL
34	AC_CHECK_FUNCS([floor])
35
36	AC_CONFIG_FILES([Makefile

Removed Link Here

(-)a/comms/aldo/files/patch-include_Makefile.in (-12 lines)
1	--- include/Makefile.in.orig 2012-03-31 11:55:36 UTC
2	+++ include/Makefile.in
3	@@ -105,7 +105,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
4	SET_MAKE = @SET_MAKE@
5	SHELL = @SHELL@
6	STRIP = @STRIP@
7	-VERSION = @VERSION@
8	+VERSION = "@VERSION@"
9	abs_builddir = @abs_builddir@
10	abs_srcdir = @abs_srcdir@
11	abs_top_builddir = @abs_top_builddir@
12	-