Wed Jul 8 15:15:15 2009 UTC ()
user-destdir support


(joerg)
diff -r1.25 -r1.26 pkgsrc/audio/xmms-dflowers/Makefile
diff -r1.5 -r1.6 pkgsrc/audio/xmms-dflowers/distinfo
diff -r1.4 -r1.5 pkgsrc/audio/xmms-dflowers/patches/patch-aa
cvs diff -r1.25 -r1.26 pkgsrc/audio/xmms-dflowers/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/xmms-dflowers/Attic/Makefile 2006/10/04 20:44:20 1.25
+++ pkgsrc/audio/xmms-dflowers/Attic/Makefile 2009/07/08 15:15:15 1.26
@@ -1,18 +1,22 @@ @@ -1,18 +1,22 @@
1# $NetBSD: Makefile,v 1.25 2006/10/04 20:44:20 wiz Exp $ 1# $NetBSD: Makefile,v 1.26 2009/07/08 15:15:15 joerg Exp $
2# 2#
3 3
4DISTNAME= dflowers-1.2 4DISTNAME= dflowers-1.2
5PKGNAME= xmms-${DISTNAME} 5PKGNAME= xmms-${DISTNAME}
6PKGREVISION= 4 6PKGREVISION= 4
7CATEGORIES= audio 7CATEGORIES= audio
8MASTER_SITES= ${MASTER_SITE_LOCAL} 8MASTER_SITES= ${MASTER_SITE_LOCAL}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11# HOMEPAGE= http://www.shell.linux.se/bm/index.php?page=xmmsplugin 11# HOMEPAGE= http://www.shell.linux.se/bm/index.php?page=xmmsplugin
12# AWOL 12# AWOL
13COMMENT= XMMS plugin for dual flower scope 13COMMENT= XMMS plugin for dual flower scope
14 14
 15PKG_DESTDIR_SUPPORT= user-destdir
 16
15USE_LIBTOOL= YES 17USE_LIBTOOL= YES
16 18
 19INSTALLATION_DIRS= lib/xmms/Visualization
 20
17.include "../../audio/xmms/buildlink3.mk" 21.include "../../audio/xmms/buildlink3.mk"
18.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/audio/xmms-dflowers/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/xmms-dflowers/Attic/distinfo 2005/02/23 20:39:54 1.5
+++ pkgsrc/audio/xmms-dflowers/Attic/distinfo 2009/07/08 15:15:15 1.6
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.5 2005/02/23 20:39:54 agc Exp $ 1$NetBSD: distinfo,v 1.6 2009/07/08 15:15:15 joerg Exp $
2 2
3SHA1 (dflowers-1.2.tar.gz) = 5f7b518652a6df3677fdeaffa5014ad0171dd426 3SHA1 (dflowers-1.2.tar.gz) = 5f7b518652a6df3677fdeaffa5014ad0171dd426
4RMD160 (dflowers-1.2.tar.gz) = 40fc89003846f180ca3b803c1ac1eade9c428e80 4RMD160 (dflowers-1.2.tar.gz) = 40fc89003846f180ca3b803c1ac1eade9c428e80
5Size (dflowers-1.2.tar.gz) = 47953 bytes 5Size (dflowers-1.2.tar.gz) = 47953 bytes
6SHA1 (patch-aa) = 23999676cc61311cfc69206e67653c6a01e4f1e5 6SHA1 (patch-aa) = 8d6d6d4bf513fe19f4886a4220437ccc87ea17e4
cvs diff -r1.4 -r1.5 pkgsrc/audio/xmms-dflowers/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/xmms-dflowers/patches/Attic/patch-aa 2002/09/21 01:32:23 1.4
+++ pkgsrc/audio/xmms-dflowers/patches/Attic/patch-aa 2009/07/08 15:15:15 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.4 2002/09/21 01:32:23 jlam Exp $ 1$NetBSD: patch-aa,v 1.5 2009/07/08 15:15:15 joerg Exp $
2 2
3--- Makefile.orig Sat Jun 9 14:37:36 2001 3--- Makefile.orig Sat Jun 9 14:37:36 2001
4+++ Makefile 4+++ Makefile
5@@ -1,13 +1,9 @@ 5@@ -1,13 +1,9 @@
6 # Change paths if necessary 6 # Change paths if necessary
7  7
8-CC = gcc 8-CC = gcc
9-OPT = -m486 -O2 9-OPT = -m486 -O2
10 #OPT = -mpentium -O6 10 #OPT = -mpentium -O6
11 #OPT = -mcpu=k6 -march=k6 -O6 11 #OPT = -mcpu=k6 -march=k6 -O6
12-CONF= -DNO_WIN_DECORATIONS 12-CONF= -DNO_WIN_DECORATIONS
13-CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread` 13-CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread`
14-LFLAGS = -shared -fPIC -L/usr/local/lib 14-LFLAGS = -shared -fPIC -L/usr/local/lib
@@ -39,18 +39,19 @@ $NetBSD: patch-aa,v 1.4 2002/09/21 01:32 @@ -39,18 +39,19 @@ $NetBSD: patch-aa,v 1.4 2002/09/21 01:32
39- $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $<  39- $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $<
40  40
41 clean: 41 clean:
42- rm -f *.o core *.so*  42- rm -f *.o core *.so*
43+ rm -f *.o core *.so* *.la *.so *.lo 43+ rm -f *.o core *.so* *.la *.so *.lo
44+ rm -fr .libs 44+ rm -fr .libs
45  45
46 distclean: 46 distclean:
47 rm -f *.o core *~ 47 rm -f *.o core *~
48  48
49-install: 49-install:
50- install libdflowers.so $(INSTALL-DIR) 50- install libdflowers.so $(INSTALL-DIR)
51+install: libdflowers.la 51+install: libdflowers.la
52+ ${LIBTOOL} install libdflowers.la $(INSTALL-DIR) 52+ ${LIBTOOL} install libdflowers.la ${DESTDIR}$(INSTALL-DIR)
53 mkdir -p $(XMMS_DATADIR)/$(THEME_SUBDIR) 53- mkdir -p $(XMMS_DATADIR)/$(THEME_SUBDIR)
 54+ mkdir -p ${DESTDIR}$(XMMS_DATADIR)/$(THEME_SUBDIR)
54- install bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR) 55- install bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR)
55+ $(BSD_INSTALL_DATA) bg_*.xpm $(XMMS_DATADIR)/$(THEME_SUBDIR) 56+ $(BSD_INSTALL_DATA) bg_*.xpm ${DESTDIR}$(XMMS_DATADIR)/$(THEME_SUBDIR)
56+ 57+