Wed Oct 7 15:14:47 2009 UTC ()
Use --mode argument for libtool.


(joerg)
diff -r1.3 -r1.4 pkgsrc/audio/xmms-dspectral/distinfo
diff -r1.2 -r1.3 pkgsrc/audio/xmms-dspectral/patches/patch-aa
cvs diff -r1.3 -r1.4 pkgsrc/audio/xmms-dspectral/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/xmms-dspectral/Attic/distinfo 2009/07/08 15:05:52 1.3
+++ pkgsrc/audio/xmms-dspectral/Attic/distinfo 2009/10/07 15:14:47 1.4
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.3 2009/07/08 15:05:52 joerg Exp $ 1$NetBSD: distinfo,v 1.4 2009/10/07 15:14:47 joerg Exp $
2 2
3SHA1 (dspectral-1.2.tar.gz) = da32adcdcfef1cc2e32e4d5013623be64922c430 3SHA1 (dspectral-1.2.tar.gz) = da32adcdcfef1cc2e32e4d5013623be64922c430
4RMD160 (dspectral-1.2.tar.gz) = 7cdbdeadb8309d90ff1d42deb0704dc495b81728 4RMD160 (dspectral-1.2.tar.gz) = 7cdbdeadb8309d90ff1d42deb0704dc495b81728
5Size (dspectral-1.2.tar.gz) = 41866 bytes 5Size (dspectral-1.2.tar.gz) = 41866 bytes
6SHA1 (patch-aa) = 899b6e52c33b54df2d95c7c276a3b1c54fd44e31 6SHA1 (patch-aa) = 396884805bcdda5f57e6851afba7ad44036f0c50
cvs diff -r1.2 -r1.3 pkgsrc/audio/xmms-dspectral/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/xmms-dspectral/patches/Attic/patch-aa 2009/07/08 15:05:52 1.2
+++ pkgsrc/audio/xmms-dspectral/patches/Attic/patch-aa 2009/10/07 15:14:47 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.2 2009/07/08 15:05:52 joerg Exp $ 1$NetBSD: patch-aa,v 1.3 2009/10/07 15:14:47 joerg Exp $
2 2
3--- Makefile.orig Sat Jan 20 06:19:26 2001 3--- Makefile.orig Sat Jan 20 06:19:26 2001
4+++ Makefile 4+++ Makefile
5@@ -1,12 +1,12 @@ 5@@ -1,12 +1,12 @@
6 # Change paths & OPT if necessary 6 # Change paths & OPT if necessary
7  7
8-CC = gcc 8-CC = gcc
9-OPT = -m486 -O2 9-OPT = -m486 -O2
10+#CC = gcc 10+#CC = gcc
11+OPT = -O2 11+OPT = -O2
12 #OPT = -mpentium -O6 12 #OPT = -mpentium -O6
13 #OPT = -mcpu=k6 -march=k6 -O6 13 #OPT = -mcpu=k6 -march=k6 -O6
14-CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread` 14-CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
@@ -24,33 +24,33 @@ $NetBSD: patch-aa,v 1.2 2009/07/08 15:05 @@ -24,33 +24,33 @@ $NetBSD: patch-aa,v 1.2 2009/07/08 15:05
24 THEME_SUBDIR=dspectral_themes 24 THEME_SUBDIR=dspectral_themes
25 XMMS_DATADIR_FLAGS=-DTHEMEDIR=\"$(XMMS_DATADIR)/$(THEME_SUBDIR)/\" 25 XMMS_DATADIR_FLAGS=-DTHEMEDIR=\"$(XMMS_DATADIR)/$(THEME_SUBDIR)/\"
26  26
27-all: libdspectral.so 27-all: libdspectral.so
28+.SUFFIXES: .c .lo 28+.SUFFIXES: .c .lo
29  29
30-libdspectral.so: $(OBJ)  30-libdspectral.so: $(OBJ)
31- $(CC) -o libdspectral.so $(OBJ) $(LFLAGS) 31- $(CC) -o libdspectral.so $(OBJ) $(LFLAGS)
32+all: libdspectral.la 32+all: libdspectral.la
33  33
34-.c.o: 34-.c.o:
35- $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $<  35- $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $<
36+libdspectral.la: $(OBJ)  36+libdspectral.la: $(OBJ)
37+ ${LIBTOOL} $(CC) -o libdspectral.la $(OBJ) $(LFLAGS) -module -avoid-version -rpath $(INSTALL-DIR) 37+ ${LIBTOOL} --mode=link $(CC) -o libdspectral.la $(OBJ) $(LFLAGS) -module -avoid-version -rpath $(INSTALL-DIR)
38+ 38+
39+.c.lo: 39+.c.lo:
40+ ${LIBTOOL} $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $<  40+ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $<
41  41
42 clean: 42 clean:
43- rm -f *.o core *.so*  43- rm -f *.o core *.so*
44+ rm -f *.o core *.so* *.lo *.la 44+ rm -f *.o core *.so* *.lo *.la
45+ rm -fr .libs 45+ rm -fr .libs
46  46
47 distclean: 47 distclean:
48 rm -f *.o core *~ 48 rm -f *.o core *~
49  49
50 install: 50 install:
51- install libdspectral.so $(INSTALL-DIR)  51- install libdspectral.so $(INSTALL-DIR)
52- mkdir -p $(XMMS_DATADIR)/$(THEME_SUBDIR) 52- mkdir -p $(XMMS_DATADIR)/$(THEME_SUBDIR)
53- install bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR) 53- install bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR)
54+ ${LIBTOOL} ${INSTALL} libdspectral.la ${DESTDIR}$(INSTALL-DIR)  54+ ${LIBTOOL} --mode=install ${INSTALL} libdspectral.la ${DESTDIR}$(INSTALL-DIR)
55+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(XMMS_DATADIR)/$(THEME_SUBDIR) 55+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(XMMS_DATADIR)/$(THEME_SUBDIR)
56+ ${BSD_INSTALL_DATA} bg_*.xpm ${DESTDIR}$(XMMS_DATADIR)/$(THEME_SUBDIR) 56+ ${BSD_INSTALL_DATA} bg_*.xpm ${DESTDIR}$(XMMS_DATADIR)/$(THEME_SUBDIR)