Re: WIP: audio/exaile

2010-03-18 Thread Giovanni Bechis 

Jacob Meuser wrote:

why not install the .mo files?  they no longer build them in the
install target, so there's no can't clean without root privs
issue any more.


You are right, here is another diff.
 Cheers
  Giovanni
Index: Makefile
===
RCS file: /cvs/ports/audio/exaile/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile22 Dec 2009 15:43:15 -  1.7
+++ Makefile18 Mar 2010 08:18:03 -
@@ -2,16 +2,15 @@
 
 COMMENT =  music manager and player for GTK+ written in Python
 
-V =0.3.0.1
-PKGNAME =  ${DISTNAME}p0
-
-DISTNAME = exaile-${V}
+V =0.3.1
+P =0
+DISTNAME = exaile-${V}.${P}
 
 CATEGORIES =   audio x11
 
 HOMEPAGE = http://www.exaile.org/
 
-MASTER_SITES = http://www.launchpad.net/exaile/0.3.0/$V/+download/
+MASTER_SITES = http://www.launchpad.net/exaile/$V/$V/+download/
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
@@ -40,12 +39,16 @@ RUN_DEPENDS =   :dbus-python-=0.82.1:x11/
 USE_X11 =  Yes
 USE_GMAKE =Yes
 NO_REGRESS =   Yes
+# Regress requires py-mox which is not yet available
+# REGRESS_TARGET=  test
+# REGRESS_DEPENDS=::devel/py-nose
 
 CONFIGURE_STYLE =none
-ALL_TARGET =   compile
 SUBST_VARS +=  MODPY_SITEPKG
 
 post-configure:
-   ${SUBST_CMD} ${WRKSRC}/Makefile ${WRKSRC}/data/exaile.desktop 
${WRKSRC}/plugins/Makefile
+   ${SUBST_CMD} ${WRKSRC}/Makefile ${WRKSRC}/data/exaile.desktop \
+   ${WRKSRC}/plugins/Makefile ${WRKSRC}/tools/generate-launcher
+   @rm -rf ${WRKSRC}/plugins/daap*
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/audio/exaile/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo29 Oct 2009 08:33:46 -  1.2
+++ distinfo18 Mar 2010 08:18:03 -
@@ -1,5 +1,5 @@
-MD5 (exaile-0.3.0.1.tar.gz) = xr0UzqdHqAhXCzBOZHVE8Q==
-RMD160 (exaile-0.3.0.1.tar.gz) = b3cFwZLWewD2/myB/tNDDohosPo=
-SHA1 (exaile-0.3.0.1.tar.gz) = 1Yjj+2pYuk0PhNMTbPByRia76H4=
-SHA256 (exaile-0.3.0.1.tar.gz) = R+tDMqgDsKixbcW5DpLXjbe/FrmpRnypiTE0rNJq5U0=
-SIZE (exaile-0.3.0.1.tar.gz) = 1528077
+MD5 (exaile-0.3.1.0.tar.gz) = 6VVO6btJrz0bOoVw5Ron2g==
+RMD160 (exaile-0.3.1.0.tar.gz) = 4XzwAB106osqneMVrOn4GGXenmo=
+SHA1 (exaile-0.3.1.0.tar.gz) = k4torQYr7tBxhAMGJJLJ2ok6uIY=
+SHA256 (exaile-0.3.1.0.tar.gz) = aCOfxA2iO6cjJ7EDUqNR6gA4mVXWMblvaa4EqYYWYvA=
+SIZE (exaile-0.3.1.0.tar.gz) = 1899451
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/audio/exaile/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  29 Oct 2009 08:33:47 -  1.2
+++ patches/patch-Makefile  18 Mar 2010 08:18:03 -
@@ -1,49 +1,80 @@
 $OpenBSD: patch-Makefile,v 1.2 2009/10/29 08:33:47 giovanni Exp $
 Makefile.orig  Mon Aug 24 23:25:03 2009
-+++ Makefile   Wed Sep  2 10:28:25 2009
-@@ -1,16 +1,16 @@
--PREFIX ?= /usr/local
-+PREFIX = ${TRUEPREFIX}
- LIBINSTALLDIR ?= /lib
--XDGCONFDIR ?= /etc/xdg
-+XDGCONFDIR ?= ${PREFIX}/share/exaile/xdg
- 
--EXAILELIBDIR = $(DESTDIR)$(PREFIX)$(LIBINSTALLDIR)/exaile
-+EXAILELIBDIR = $(DESTDIR)${MODPY_SITEPKG}/exaile
- EXAILESHAREDIR = $(DESTDIR)$(PREFIX)/share/exaile
+--- Makefile.orig  Tue Mar 16 02:52:51 2010
 Makefile   Thu Mar 18 09:10:29 2010
+@@ -1,9 +1,9 @@
+-PREFIX?= /usr/local
++PREFIX?= ${TRUEPREFIX}
+ LIBINSTALLDIR ?= /lib
+-XDGCONFDIR?= /etc/xdg
++XDGCONFDIR?= ${PREFIX}/share/exaile/xdg
+ 
+-EXAILELIBDIR  = $(DESTDIR)$(PREFIX)$(LIBINSTALLDIR)/exaile
+-EXAILESHAREDIR= $(DESTDIR)$(PREFIX)/share/exaile
++EXAILELIBDIR  = $(DESTDIR)${MODPY_SITEPKG}/exaile
++EXAILESHAREDIR= $(DESTDIR)${TRUEPREFIX}/share/exaile
+ EXAILECONFDIR = $(DESTDIR)$(XDGCONFDIR)/exaile
  
- all: compile
+ .PHONY: dist test coverage clean sanitycheck
+@@ -17,12 +17,12 @@ all_no_locale: compile
@echo Ready to install...
  
  compile:
 -  python -m compileall -q xl xlgui
 -  -python -O -m compileall -q xl xlgui
-+  ${MODPY_BIN} -m compileall xl lib xlgui
-+  -${MODPY_BIN} -O -m compileall xl lib xlgui
-   cd plugins  make  cd ..
++  ${MODPY_BIN} -m compileall -q xl xlgui
++  -${MODPY_BIN} -O -m compileall -q xl xlgui
+   $(MAKE) -C plugins compile
  
  make-install-dirs:
-@@ -87,8 +87,8 @@ install-target: make-install-dirs
-   # the printf here is for bsd compat, dont use echo!
-   cd $(DESTDIR)$(PREFIX)/bin  \
-printf #!/bin/sh\n\
--   exec python $(PREFIX)$(LIBINSTALLDIR)/exaile/exaile.py \
--   --datadir=$(PREFIX)/share/exaile/data --startgui \\...@\ \
-+   exec ${MODPY_BIN} ${MODPY_SITEPKG}/exaile/exaile.py \
-+   --datadir=$(PREFIX)/share/exaile/data --no-hal --startgui \\...@\ \
- exaile  \
-chmod 755 exaile
-   cd

Re: WIP: audio/exaile

2010-03-17 Thread Jacob Meuser 
On Wed, Mar 17, 2010 at 07:43:50PM +0100, Giovanni Bechis wrote:
 Update to latest 0.3.0.1, lot of bugs fixed and new features added,
 this release is *NOT* backward compatible, so please backup your settings.
 I have disabled 2 plugins, daapserver and daapclient because they
 don't compile with our python, diffs are welcome.
 Use patch -E to apply the diff.
  Cheers
   Giovanni

why not install the .mo files?  they no longer build them in the
install target, so there's no can't clean without root privs
issue any more.

-- 
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org

Index: Makefile
===
RCS file: /cvs/ports/audio/exaile/Makefile,v
retrieving revision 1.7
diff -N -u -p Makefile
--- Makefile22 Dec 2009 15:43:15 -  1.7
+++ Makefile18 Mar 2010 03:28:59 -
@@ -2,16 +2,15 @@
 
 COMMENT =  music manager and player for GTK+ written in Python
 
-V =0.3.0.1
-PKGNAME =  ${DISTNAME}p0
+V =0.3.1
+P =0
+DISTNAME = exaile-${V}.${P}
 
-DISTNAME = exaile-${V}
-
 CATEGORIES =   audio x11
 
 HOMEPAGE = http://www.exaile.org/
 
-MASTER_SITES = http://www.launchpad.net/exaile/0.3.0/$V/+download/
+MASTER_SITES = http://www.launchpad.net/exaile/$V/$V/+download/
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
@@ -42,10 +41,11 @@ USE_GMAKE = Yes
 NO_REGRESS =   Yes
 
 CONFIGURE_STYLE =none
-ALL_TARGET =   compile
 SUBST_VARS +=  MODPY_SITEPKG
 
 post-configure:
-   ${SUBST_CMD} ${WRKSRC}/Makefile ${WRKSRC}/data/exaile.desktop 
${WRKSRC}/plugins/Makefile
+   ${SUBST_CMD} ${WRKSRC}/Makefile ${WRKSRC}/data/exaile.desktop \
+   ${WRKSRC}/plugins/Makefile ${WRKSRC}/tools/generate-launcher
+   @rm -rf ${WRKSRC}/plugins/daap*
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/audio/exaile/distinfo,v
retrieving revision 1.2
diff -N -u -p distinfo
--- distinfo29 Oct 2009 08:33:46 -  1.2
+++ distinfo18 Mar 2010 03:28:59 -
@@ -1,5 +1,5 @@
-MD5 (exaile-0.3.0.1.tar.gz) = xr0UzqdHqAhXCzBOZHVE8Q==
-RMD160 (exaile-0.3.0.1.tar.gz) = b3cFwZLWewD2/myB/tNDDohosPo=
-SHA1 (exaile-0.3.0.1.tar.gz) = 1Yjj+2pYuk0PhNMTbPByRia76H4=
-SHA256 (exaile-0.3.0.1.tar.gz) = R+tDMqgDsKixbcW5DpLXjbe/FrmpRnypiTE0rNJq5U0=
-SIZE (exaile-0.3.0.1.tar.gz) = 1528077
+MD5 (exaile-0.3.1.0.tar.gz) = 6VVO6btJrz0bOoVw5Ron2g==
+RMD160 (exaile-0.3.1.0.tar.gz) = 4XzwAB106osqneMVrOn4GGXenmo=
+SHA1 (exaile-0.3.1.0.tar.gz) = k4torQYr7tBxhAMGJJLJ2ok6uIY=
+SHA256 (exaile-0.3.1.0.tar.gz) = aCOfxA2iO6cjJ7EDUqNR6gA4mVXWMblvaa4EqYYWYvA=
+SIZE (exaile-0.3.1.0.tar.gz) = 1899451
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/audio/exaile/patches/patch-Makefile,v
retrieving revision 1.2
diff -N -u -p patches/patch-Makefile
--- patches/patch-Makefile  29 Oct 2009 08:33:47 -  1.2
+++ patches/patch-Makefile  18 Mar 2010 03:28:59 -
@@ -1,49 +1,80 @@
 $OpenBSD: patch-Makefile,v 1.2 2009/10/29 08:33:47 giovanni Exp $
 Makefile.orig  Mon Aug 24 23:25:03 2009
-+++ Makefile   Wed Sep  2 10:28:25 2009
-@@ -1,16 +1,16 @@
--PREFIX ?= /usr/local
-+PREFIX = ${TRUEPREFIX}
- LIBINSTALLDIR ?= /lib
--XDGCONFDIR ?= /etc/xdg
-+XDGCONFDIR ?= ${PREFIX}/share/exaile/xdg
+--- Makefile.orig  Mon Mar 15 18:52:51 2010
 Makefile   Wed Mar 17 20:17:59 2010
+@@ -1,9 +1,9 @@
+-PREFIX?= /usr/local
++PREFIX?= ${TRUEPREFIX}
+ LIBINSTALLDIR ?= /lib
+-XDGCONFDIR?= /etc/xdg
++XDGCONFDIR?= ${PREFIX}/share/exaile/xdg
  
--EXAILELIBDIR = $(DESTDIR)$(PREFIX)$(LIBINSTALLDIR)/exaile
-+EXAILELIBDIR = $(DESTDIR)${MODPY_SITEPKG}/exaile
- EXAILESHAREDIR = $(DESTDIR)$(PREFIX)/share/exaile
+-EXAILELIBDIR  = $(DESTDIR)$(PREFIX)$(LIBINSTALLDIR)/exaile
+-EXAILESHAREDIR= $(DESTDIR)$(PREFIX)/share/exaile
++EXAILELIBDIR  = $(DESTDIR)${MODPY_SITEPKG}/exaile
++EXAILESHAREDIR= $(DESTDIR)${TRUEPREFIX}/share/exaile
+ EXAILECONFDIR = $(DESTDIR)$(XDGCONFDIR)/exaile
  
- all: compile
+ .PHONY: dist test coverage clean sanitycheck
+@@ -17,12 +17,12 @@ all_no_locale: compile
@echo Ready to install...
  
  compile:
 -  python -m compileall -q xl xlgui
 -  -python -O -m compileall -q xl xlgui
-+  ${MODPY_BIN} -m compileall xl lib xlgui
-+  -${MODPY_BIN} -O -m compileall xl lib xlgui
-   cd plugins  make  cd ..
++  ${MODPY_BIN} -m compileall -q xl xlgui
++  -${MODPY_BIN} -O -m compileall -q xl xlgui
+   $(MAKE) -C plugins compile
  
  make-install-dirs:
-@@ -87,8 +87,8 @@ install-target: make-install-dirs
-   # the printf here is for bsd compat, dont use echo!
-   cd $(DESTDIR)$(PREFIX)/bin  \
-printf #!/bin/sh\n\
--   exec python $(PREFIX)$(LIBINSTALLDIR)/exaile/exaile.py \
--   --datadir=$(PREFIX)/share/exaile/data --startgui \\...@\ \