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 context 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,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2008/05/30 17:18:23 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/11 12:57:44 obache Exp $
 #
 
 DISTNAME=	exaile_0.2.13
 PKGNAME=	exaile-0.2.13
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.exaile.org/files/
 
@@ -10,21 +11,15 @@
 HOMEPAGE=	http://www.exaile.org/
 COMMENT=	Music player
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config gmake intltool msgfmt
 USE_DIRS+=		xdg-1.1
 
-AUTO_MKDIRS=			yes
-
 PYTHON_PATCH_SCRIPTS=	exaile.py
 MAKE_ENV+=	PYTHONBIN=${PYTHONBIN}
-
-EX=	${PREFIX}/bin/exaile
-post-install:
-	${ECHO} "#!/bin/sh" > ${EX}
-	${ECHO} "cd ${PREFIX}/share/exaile" >> ${EX}
-	${ECHO} exec "${PYTHONBIN} ${PREFIX}/lib/exaile/exaile.py" >> ${EX}
-	chmod 755 ${EX}
+MAKE_FLAGS+=	PKGLOCALEDIR=${PKGLOCALEDIR}
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../lang/python/application.mk"
cvs diff -r1.7 -r1.8 pkgsrc/audio/exaile/distinfo (expand / switch to context 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 @@
-$NetBSD: distinfo,v 1.7 2008/06/11 11:37:55 drochner Exp $
+$NetBSD: distinfo,v 1.8 2008/06/11 12:57:44 obache Exp $
 
 SHA1 (exaile_0.2.13.tar.gz) = 8cc754c55333dad750d27e45a4e16f53c1f1522c
 RMD160 (exaile_0.2.13.tar.gz) = 6b839da1a996207ae18555937d251ffaaebde028
 Size (exaile_0.2.13.tar.gz) = 1267717 bytes
-SHA1 (patch-aa) = 2947a4a4a8ff7b13812c3d94fcc741e8e69b0a55
+SHA1 (patch-aa) = 168a55605cbd98baf8294d2e9661f4d24be31349
 SHA1 (patch-ab) = 46d55fb1e5175aafc9d414bf17b045f1eaf3b3bb
cvs diff -r1.4 -r1.5 pkgsrc/audio/exaile/patches/Attic/patch-aa (expand / switch to context 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,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2008/06/11 11:37:55 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2008/06/11 12:57:44 obache Exp $
 
---- Makefile.orig	2008-06-11 03:42:53 +0300
-+++ Makefile	2008-06-11 03:43:25 +0300
+--- Makefile.orig	2008-04-02 01:42:17.000000000 +0000
++++ Makefile
 @@ -6,15 +6,14 @@ all: compile mmkeys.so translations
  	@echo "Type: 'make install' now"
  
@@ -21,16 +21,42 @@
  
  make-install-dirs: 
  	mkdir -p $(DESTDIR)$(PREFIX)/bin
-@@ -37,10 +36,10 @@ make-install-dirs: 
+@@ -36,11 +35,11 @@ make-install-dirs: 
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/exaile/sql
  	mkdir -p $(DESTDIR)$(PREFIX)/share/exaile/xl
  	mkdir -p $(DESTDIR)$(PREFIX)/share/exaile/xl/plugins
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/locale
+-	mkdir -p $(DESTDIR)$(PREFIX)/share/locale
 -	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
-+	mkdir -p $(DESTDIR)$(PREFIX)/man/man1
++	mkdir -p $(DESTDIR)$(PREFIX)/${PKGLOCALEDIR}/locale
++	mkdir -p $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1
  
  install: make-install-dirs
 -	install -m 644 exaile.1 $(DESTDIR)$(PREFIX)/share/man/man1
-+	install -m 644 exaile.1 $(DESTDIR)$(PREFIX)/man/man1
++	install -m 644 exaile.1 $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1
  	install -m 644 exaile.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
  	install -m 644 exaile.glade $(DESTDIR)$(PREFIX)/share/exaile
  	install -m 644 equalizer.ini $(DESTDIR)$(PREFIX)/share/exaile
+@@ -66,18 +65,18 @@ install: make-install-dirs
+ 	$(DESTDIR)$(PREFIX)/share/pixmaps/exaile.png
+ 	install -m 644 exaile.desktop $(DESTDIR)$(PREFIX)/share/applications/
+ 	cd $(DESTDIR)$(PREFIX)/bin && \
+-	  /bin/echo -e \
++	  echo \
+ 	    "#!/bin/sh\n" \
+ 	    "cd $(PREFIX)/share/exaile\n" \
+-	    "exec python $(PREFIX)$(LIBDIR)/exaile/exaile.py \"\$$@\"" \
+-	    > exaile && \
++	    "exec ${PYTHONBIN} $(PREFIX)$(LIBDIR)/exaile/exaile.py \"\$$@\"" \
++	    | awk '{gsub(/\\n[ 	]*/, "\n");print}' > exaile && \
+ 	  chmod 755 exaile
+ 	for f in `find po -name exaile.mo` ; do \
+ 	  install -d -m 755 \
+-	    `echo $$f | sed "s|^po|$(DESTDIR)$(PREFIX)/share/locale|" | \
++	    `echo $$f | sed "s|^po|$(DESTDIR)$(PREFIX)/${PKGLOCALEDIR}/locale|" | \
+ 	      xargs dirname` && \
+ 	  install -m 644 $$f \
+-	    `echo $$f | sed "s|^po|$(DESTDIR)$(PREFIX)/share/locale|"` ; \
++	    `echo $$f | sed "s|^po|$(DESTDIR)$(PREFIX)/${PKGLOCALEDIR}/locale|"` ; \
+ 	  done
+ 
+ clean: