summaryrefslogtreecommitdiff
path: root/audio/herrie/patches/patch-aa
blob: 2aa1cb57526fef5fe4073f2deab5efac8570de0f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
$NetBSD: patch-aa,v 1.4 2008/07/16 07:21:23 bjs Exp $

--- configure.orig	2008-07-15 11:59:07.000000000 -0400
+++ configure
@@ -33,7 +33,7 @@ APP_LINGUAS='ca da de es fi ga nl pl pt_
 CFG_AO=oss
 unset CFG_BINEXT
 CFG_CURSES_HEADER=ncurses
-CFG_CURSES_LIB=ncursesw
+CFG_CURSES_LIB=ncurses
 CFG_HTTP=yes
 CFG_MODPLUG=yes
 CFG_MP3=yes
@@ -64,7 +64,7 @@ Darwin)
 	LDFLAGS="$LDFLAGS -lresolv"
 	[ "$PREFIX" = "" ] && PREFIX=/opt/local
 	;;
-FreeBSD)
+FreeBSD|DragonFly)
 	CFG_SETPROCTITLE=yes
 	[ "$PREFIX" = "" ] && PREFIX=/usr/local
 	[ "$MANDIR" = "" ] && MANDIR=$PREFIX/man
@@ -320,13 +320,13 @@ oss)
 	NetBSD|OpenBSD)
 		CFLAGS="$CFLAGS -DOSS_HEADER=\\<soundcard.h\\>"
 		LDFLAGS="$LDFLAGS -lossaudio"
-		OSS_DEVICE="/dev/audio"
+		OSS_DEVICE="$DEVOSSAUDIO"
 		;;
 	*)
 		# The OSS-through-ALSA compat may generate noise
 		[ "$OS" = "Linux" ] && CFLAGS_main="$CFLAGS_main -DCLOSE_STDERR"
 		CFLAGS="$CFLAGS -DOSS_HEADER=\\<sys/soundcard.h\\>"
-		OSS_DEVICE="/dev/dsp"
+		OSS_DEVICE="$DEVOSSAUDIO"
 		;;
 	esac
 	CFG_VOLUME=yes
@@ -364,7 +364,7 @@ echo "- Using $CFG_AO audio output"
 echo
 
 # Perform a simple compiler test
-eval $CC $SRCDIR/src/conftest.c $CFLAGS $LDFLAGS -o conftest$CFG_BINEXT
+eval ${LIBTOOL} --mode=link $CC $SRCDIR/src/conftest.c $CFLAGS $LDFLAGS -o conftest$CFG_BINEXT
 if [ $? -ne 0 ]
 then
 	echo "Error: some dependencies are missing"
@@ -391,13 +391,13 @@ done
 all: $APP_NAME$CFG_BINEXT $APP_NAME.1.gz $SRCDIR/$APP_NAME.conf.sample $MOS
 $APP_NAME$CFG_BINEXT: $OBJS
 	# Linking $APP_NAME$CFG_BINEXT
-	$DOIT$CC $OBJS $LDFLAGS -o $APP_NAME$CFG_BINEXT
+	$DOIT\${LIBTOOL} --mode=link $CC $OBJS $LDFLAGS -o $APP_NAME$CFG_BINEXT
 $APP_NAME.1.gz: $MANFILES Makefile
 	# Generating manual page $APP_NAME.1.gz
-	${DOIT}sed $MANREGEX $MANFILES | gzip -9 > $APP_NAME.1.gz
+	${DOIT}sed $MANREGEX $MANFILES > $APP_NAME.1
 clean:
 	# Removing $APP_NAME$CFG_BINEXT $APP_NAME.1.gz *.dSYM *.mo *.o
-	${DOIT}rm -f $APP_NAME$CFG_BINEXT $APP_NAME.1.gz *.mo *.o
+	${DOIT}rm -f $APP_NAME$CFG_BINEXT $APP_NAME.1 *.mo *.o
 	${DOIT}rm -Rf *.dSYM
 distclean: clean
 	# Removing Makefile
@@ -406,29 +406,29 @@ Makefile: $0 `dirname $0`/depends
 	# WARNING: Your Makefile is outdated. Please re-run $0!
 install: all
 	# Installing \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT
-	${DOIT}mkdir -p \$(DESTDIR)$BINDIR
-	$DOIT$INSTALL $CFG_STRIP $APP_NAME$CFG_BINEXT \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT
+	${DOIT}\${BSD_INSTALL_PROGRAM_DIR} \$(DESTDIR)$BINDIR
+	$DOIT\${BSD_INSTALL_PROGRAM} $CFG_STRIP $APP_NAME$CFG_BINEXT \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT
 	# Installing \$(DESTDIR)$MANDIR/man1/$APP_NAME.1.gz
-	${DOIT}mkdir -p \$(DESTDIR)$MANDIR/man1
-	$DOIT$INSTALL -m 444 $APP_NAME.1.gz \$(DESTDIR)$MANDIR/man1/$APP_NAME.1.gz
+	${DOIT}\${BSD_INSTALL_MAN_DIR} \$(DESTDIR)$MANDIR/man1
+	$DOIT\${BSD_INSTALL_MAN} $APP_NAME.1 \$(DESTDIR)$MANDIR/man1/$APP_NAME.1
 	# Installing \$(DESTDIR)$CONFDIR/$APP_NAME.conf.sample
-	${DOIT}mkdir -p \$(DESTDIR)$CONFDIR
-	$DOIT$INSTALL -m 444 $SRCDIR/$APP_NAME.conf.sample \$(DESTDIR)$CONFDIR/$APP_NAME.conf.sample
+	#${DOIT}\${BSD_INSTALL_DATA_DIR} \$(DESTDIR)$CONFDIR
+	#$DOIT$\${BSD_INSTALL_DATA} $SRCDIR/$APP_NAME.conf.sample \$(DESTDIR)$CONFDIR/$APP_NAME.conf
 EOF
 for i in $CFG_LINGUAS
 do
 	echo "	# Installing \$(DESTDIR)$TRANSDIR/$i/LC_MESSAGES/$APP_NAME.mo"
-	echo "	${DOIT}mkdir -p \$(DESTDIR)$TRANSDIR/$i/LC_MESSAGES"
-	echo "	$DOIT$INSTALL -m 444 $i.mo \$(DESTDIR)$TRANSDIR/$i/LC_MESSAGES/$APP_NAME.mo"
+	echo "	${DOIT}\${BSD_INSTALL_DATA_DIR} \$(DESTDIR)$TRANSDIR/$i/LC_MESSAGES"
+	echo "	$DOIT\${BSD_INSTALL_DATA} $i.mo \$(DESTDIR)$TRANSDIR/$i/LC_MESSAGES/$APP_NAME.mo"
 done
 cat << EOF
 uninstall:
 	# Uninstalling \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT
 	${DOIT}rm -f \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT
-	# Uninstalling \$(DESTDIR)$MANDIR/man1/$APP_NAME.1.gz
-	${DOIT}rm -f \$(DESTDIR)$MANDIR/man1/$APP_NAME.1.gz
-	# Uninstalling \$(DESTDIR)$CONFDIR/$APP_NAME.conf.sample
-	${DOIT}rm -f  \$(DESTDIR)$CONFDIR/$APP_NAME.conf.sample
+	# Uninstalling \$(DESTDIR)$MANDIR/man1/$APP_NAME.1
+	${DOIT}rm -f \$(DESTDIR)$MANDIR/man1/$APP_NAME.1
+	# Uninstalling \$(DESTDIR)$EGDIR/$APP_NAME.conf
+	${DOIT}rm -f  \$(DESTDIR)$EGDIR/$APP_NAME.conf
 EOF
 for i in $CFG_LINGUAS
 do
@@ -445,7 +445,7 @@ do
 	done
 	echo "$i.o: Makefile $SRCDIR/src/$i.c $SRCDIR/src/stdinc.h $DEPS"
 	echo "	# Compiling $i.o"
-	echo "	$DOIT$CC -c $SRCDIR/src/$i.c $CFLAGS `eval echo \\\$CFLAGS_\$i` -o $i.o"
+	echo "	$DOIT\${LIBTOOL} --mode=compile $CC -c $SRCDIR/src/$i.c $CFLAGS `eval echo \\\$CFLAGS_\$i` -o $i.o"
 done
 for i in $CFG_LINGUAS
 do