Wed Jun 11 12:57:44 2008 UTC ()
Some improvements and fixes:
 * Drop AUTO_MKDIRS.
   It is not works well with directory name contains "@". PR 38921.
 * Honor PKGMANDIR and PKGLOCALEDIR.
 * Add DESTDIR support
 * Instead of custom post-install target, patch to original install target.
   Now exaile command can take option arguments as man page said.

Bump PKGREVISION.


(obache)
diff -r1.10 -r1.11 pkgsrc/audio/exaile/Makefile
diff -r1.7 -r1.8 pkgsrc/audio/exaile/distinfo
diff -r1.4 -r1.5 pkgsrc/audio/exaile/patches/patch-aa
cvs diff -r1.10 -r1.11 pkgsrc/audio/exaile/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/exaile/Makefile 2008/05/30 17:18:23 1.10
+++ pkgsrc/audio/exaile/Makefile 2008/06/11 12:57:44 1.11
@@ -1,39 +1,34 @@ @@ -1,39 +1,34 @@
1# $NetBSD: Makefile,v 1.10 2008/05/30 17:18:23 drochner Exp $ 1# $NetBSD: Makefile,v 1.11 2008/06/11 12:57:44 obache Exp $
2# 2#
3 3
4DISTNAME= exaile_0.2.13 4DISTNAME= exaile_0.2.13
5PKGNAME= exaile-0.2.13 5PKGNAME= exaile-0.2.13
 6PKGREVISION= 1
6CATEGORIES= audio 7CATEGORIES= audio
7MASTER_SITES= http://www.exaile.org/files/ 8MASTER_SITES= http://www.exaile.org/files/
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.exaile.org/ 11HOMEPAGE= http://www.exaile.org/
11COMMENT= Music player 12COMMENT= Music player
12 13
 14PKG_DESTDIR_SUPPORT= user-destdir
 15
13USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
14USE_TOOLS+= pkg-config gmake intltool msgfmt 17USE_TOOLS+= pkg-config gmake intltool msgfmt
15USE_DIRS+= xdg-1.1 18USE_DIRS+= xdg-1.1
16 19
17AUTO_MKDIRS= yes 
18 
19PYTHON_PATCH_SCRIPTS= exaile.py 20PYTHON_PATCH_SCRIPTS= exaile.py
20MAKE_ENV+= PYTHONBIN=${PYTHONBIN} 21MAKE_ENV+= PYTHONBIN=${PYTHONBIN}
21 22MAKE_FLAGS+= PKGLOCALEDIR=${PKGLOCALEDIR}
22EX= ${PREFIX}/bin/exaile 
23post-install: 
24 ${ECHO} "#!/bin/sh" > ${EX} 
25 ${ECHO} "cd ${PREFIX}/share/exaile" >> ${EX} 
26 ${ECHO} exec "${PYTHONBIN} ${PREFIX}/lib/exaile/exaile.py" >> ${EX} 
27 chmod 755 ${EX} 
28 23
29.include "../../sysutils/desktop-file-utils/desktopdb.mk" 24.include "../../sysutils/desktop-file-utils/desktopdb.mk"
30.include "../../lang/python/application.mk" 25.include "../../lang/python/application.mk"
31.include "../../x11/py-gtk2/buildlink3.mk" 26.include "../../x11/py-gtk2/buildlink3.mk"
32.include "../../sysutils/py-dbus/buildlink3.mk" 27.include "../../sysutils/py-dbus/buildlink3.mk"
33.include "../../audio/py-mutagen/buildlink3.mk" 28.include "../../audio/py-mutagen/buildlink3.mk"
34.include "../../multimedia/py-gstreamer0.10/buildlink3.mk" 29.include "../../multimedia/py-gstreamer0.10/buildlink3.mk"
35.include "../../textproc/py-elementtree/buildlink3.mk" 30.include "../../textproc/py-elementtree/buildlink3.mk"
36.include "../../databases/py-sqlite2/buildlink3.mk" 31.include "../../databases/py-sqlite2/buildlink3.mk"
37.include "../../sysutils/py-notify/buildlink3.mk" 32.include "../../sysutils/py-notify/buildlink3.mk"
38.include "../../sysutils/desktop-file-utils/desktopdb.mk" 33.include "../../sysutils/desktop-file-utils/desktopdb.mk"
39.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/audio/exaile/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/exaile/distinfo 2008/06/11 11:37:55 1.7
+++ pkgsrc/audio/exaile/distinfo 2008/06/11 12:57:44 1.8
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.7 2008/06/11 11:37:55 drochner Exp $ 1$NetBSD: distinfo,v 1.8 2008/06/11 12:57:44 obache Exp $
2 2
3SHA1 (exaile_0.2.13.tar.gz) = 8cc754c55333dad750d27e45a4e16f53c1f1522c 3SHA1 (exaile_0.2.13.tar.gz) = 8cc754c55333dad750d27e45a4e16f53c1f1522c
4RMD160 (exaile_0.2.13.tar.gz) = 6b839da1a996207ae18555937d251ffaaebde028 4RMD160 (exaile_0.2.13.tar.gz) = 6b839da1a996207ae18555937d251ffaaebde028
5Size (exaile_0.2.13.tar.gz) = 1267717 bytes 5Size (exaile_0.2.13.tar.gz) = 1267717 bytes
6SHA1 (patch-aa) = 2947a4a4a8ff7b13812c3d94fcc741e8e69b0a55 6SHA1 (patch-aa) = 168a55605cbd98baf8294d2e9661f4d24be31349
7SHA1 (patch-ab) = 46d55fb1e5175aafc9d414bf17b045f1eaf3b3bb 7SHA1 (patch-ab) = 46d55fb1e5175aafc9d414bf17b045f1eaf3b3bb
cvs diff -r1.4 -r1.5 pkgsrc/audio/exaile/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/exaile/patches/Attic/patch-aa 2008/06/11 11:37:55 1.4
+++ pkgsrc/audio/exaile/patches/Attic/patch-aa 2008/06/11 12:57:44 1.5
@@ -1,36 +1,62 @@ @@ -1,36 +1,62 @@
1$NetBSD: patch-aa,v 1.4 2008/06/11 11:37:55 drochner Exp $ 1$NetBSD: patch-aa,v 1.5 2008/06/11 12:57:44 obache Exp $
2 2
3--- Makefile.orig 2008-06-11 03:42:53 +0300 3--- Makefile.orig 2008-04-02 01:42:17.000000000 +0000
4+++ Makefile 2008-06-11 03:43:25 +0300 4+++ Makefile
5@@ -6,15 +6,14 @@ all: compile mmkeys.so translations 5@@ -6,15 +6,14 @@ all: compile mmkeys.so translations
6 @echo "Type: 'make install' now" 6 @echo "Type: 'make install' now"
7  7
8 compile: 8 compile:
9- -bzr version-info --format=python > xl/version.py 9- -bzr version-info --format=python > xl/version.py
10- python -m compileall xl lib 10- python -m compileall xl lib
11- python -O -m compileall xl lib 11- python -O -m compileall xl lib
12+ ${PYTHONBIN} -m compileall xl lib 12+ ${PYTHONBIN} -m compileall xl lib
13+ ${PYTHONBIN} -O -m compileall xl lib 13+ ${PYTHONBIN} -O -m compileall xl lib
14  14
15 mmkeys.so: 15 mmkeys.so:
16 cd mmkeys && make mmkeys.so && cd .. && cp mmkeys/mmkeys.so . 16 cd mmkeys && make mmkeys.so && cd .. && cp mmkeys/mmkeys.so .
17  17
18 translations: 18 translations:
19- python po/createpot.py compile 19- python po/createpot.py compile
20+ ${PYTHONBIN} po/createpot.py compile 20+ ${PYTHONBIN} po/createpot.py compile
21  21
22 make-install-dirs:  22 make-install-dirs:
23 mkdir -p $(DESTDIR)$(PREFIX)/bin 23 mkdir -p $(DESTDIR)$(PREFIX)/bin
24@@ -37,10 +36,10 @@ make-install-dirs:  24@@ -36,11 +35,11 @@ make-install-dirs:
 25 mkdir -p $(DESTDIR)$(PREFIX)/share/exaile/sql
25 mkdir -p $(DESTDIR)$(PREFIX)/share/exaile/xl 26 mkdir -p $(DESTDIR)$(PREFIX)/share/exaile/xl
26 mkdir -p $(DESTDIR)$(PREFIX)/share/exaile/xl/plugins 27 mkdir -p $(DESTDIR)$(PREFIX)/share/exaile/xl/plugins
27 mkdir -p $(DESTDIR)$(PREFIX)/share/locale 28- mkdir -p $(DESTDIR)$(PREFIX)/share/locale
28- mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 29- mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
29+ mkdir -p $(DESTDIR)$(PREFIX)/man/man1 30+ mkdir -p $(DESTDIR)$(PREFIX)/${PKGLOCALEDIR}/locale
 31+ mkdir -p $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1
30  32
31 install: make-install-dirs 33 install: make-install-dirs
32- install -m 644 exaile.1 $(DESTDIR)$(PREFIX)/share/man/man1 34- install -m 644 exaile.1 $(DESTDIR)$(PREFIX)/share/man/man1
33+ install -m 644 exaile.1 $(DESTDIR)$(PREFIX)/man/man1 35+ install -m 644 exaile.1 $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1
34 install -m 644 exaile.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile 36 install -m 644 exaile.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
35 install -m 644 exaile.glade $(DESTDIR)$(PREFIX)/share/exaile 37 install -m 644 exaile.glade $(DESTDIR)$(PREFIX)/share/exaile
36 install -m 644 equalizer.ini $(DESTDIR)$(PREFIX)/share/exaile 38 install -m 644 equalizer.ini $(DESTDIR)$(PREFIX)/share/exaile
 39@@ -66,18 +65,18 @@ install: make-install-dirs
 40 $(DESTDIR)$(PREFIX)/share/pixmaps/exaile.png
 41 install -m 644 exaile.desktop $(DESTDIR)$(PREFIX)/share/applications/
 42 cd $(DESTDIR)$(PREFIX)/bin && \
 43- /bin/echo -e \
 44+ echo \
 45 "#!/bin/sh\n" \
 46 "cd $(PREFIX)/share/exaile\n" \
 47- "exec python $(PREFIX)$(LIBDIR)/exaile/exaile.py \"\$$@\"" \
 48- > exaile && \
 49+ "exec ${PYTHONBIN} $(PREFIX)$(LIBDIR)/exaile/exaile.py \"\$$@\"" \
 50+ | awk '{gsub(/\\n[ ]*/, "\n");print}' > exaile && \
 51 chmod 755 exaile
 52 for f in `find po -name exaile.mo` ; do \
 53 install -d -m 755 \
 54- `echo $$f | sed "s|^po|$(DESTDIR)$(PREFIX)/share/locale|" | \
 55+ `echo $$f | sed "s|^po|$(DESTDIR)$(PREFIX)/${PKGLOCALEDIR}/locale|" | \
 56 xargs dirname` && \
 57 install -m 644 $$f \
 58- `echo $$f | sed "s|^po|$(DESTDIR)$(PREFIX)/share/locale|"` ; \
 59+ `echo $$f | sed "s|^po|$(DESTDIR)$(PREFIX)/${PKGLOCALEDIR}/locale|"` ; \
 60 done
 61
 62 clean: