[UPDATE] devel/tortoisehg
Hi,
this is the diff to update Tortoisehg to 2.6.
You need Mercurial 2.4 to use this version of tortoisehg.
Changelog: https://bitbucket.org/tortoisehg/thg/wiki/ReleaseNotes
Is it ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/tortoisehg/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile8 Sep 2012 08:03:03 - 1.5
+++ Makefile27 Nov 2012 08:20:27 -
@@ -2,7 +2,7 @@
COMMENT = series of applications for Mercurial
-MODPY_EGG_VERSION =2.5
+MODPY_EGG_VERSION =2.6
DISTNAME = tortoisehg-${MODPY_EGG_VERSION}
CATEGORIES = devel
@@ -26,7 +26,7 @@ BUILD_DEPENDS = x11/py-qt4 \
RUN_DEPENDS = ${BUILD_DEPENDS} \
editors/py-qscintilla \
- devel/mercurial>=2.3.1 \
+ devel/mercurial>=2.4 \
devel/py-iniparse
NO_REGRESS = Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/tortoisehg/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo8 Sep 2012 08:03:03 - 1.5
+++ distinfo27 Nov 2012 08:20:27 -
@@ -1,2 +1,2 @@
-SHA256 (tortoisehg-2.5.tar.gz) = j7H92QUX6cJMNvYgU+6oYq6lXkPuKLG4mISHmFOLGr0=
-SIZE (tortoisehg-2.5.tar.gz) = 9767802
+SHA256 (tortoisehg-2.6.tar.gz) = UMocSQ/q6xEkCa1N6Tg7L+80dD6wxlx9w/DXpAtJyJU=
+SIZE (tortoisehg-2.6.tar.gz) = 9794047
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/tortoisehg/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 8 Sep 2012 08:03:03 - 1.5
+++ pkg/PLIST 27 Nov 2012 08:20:27 -
@@ -110,6 +110,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/modeltest.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/mq.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/mq.pyc
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/mqutil.py
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/mqutil.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/p4pending.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/p4pending.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/pathedit.py
[UPDATE] devel/mercurial
Hi,
this is the diff to update Mercurial to 2.4.
Changelog:
http://mercurial.selenic.com/wiki/WhatsNew#Mercurial_2.4_.282012-11-1.29
Is it ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile8 Sep 2012 08:00:45 - 1.49
+++ Makefile27 Nov 2012 08:20:17 -
@@ -2,7 +2,7 @@
COMMENT = fast, lightweight source control management
-MODPY_EGG_VERSION =2.3.1
+MODPY_EGG_VERSION =2.4
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.33
diff -u -p -r1.33 distinfo
--- distinfo8 Sep 2012 08:00:45 - 1.33
+++ distinfo27 Nov 2012 08:20:17 -
@@ -1,2 +1,2 @@
-SHA256 (mercurial-2.3.1.tar.gz) = 71h/3TsGLgjrQBLnhw9NCgD9g08RV4v7qAMTsQ+AhUE=
-SIZE (mercurial-2.3.1.tar.gz) = 3558058
+SHA256 (mercurial-2.4.tar.gz) = OIeFNYiBzrRAm6obgYDCyE1fNU6ozvGJI91JEAzVIQM=
+SIZE (mercurial-2.4.tar.gz) = 3607276
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -r1.25 PLIST
--- pkg/PLIST 8 Sep 2012 08:00:45 - 1.25
+++ pkg/PLIST 27 Nov 2012 08:20:17 -
@@ -527,7 +527,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style-monoblue.css
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style-paper.css
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style.css
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/template-vars.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/transaction.py
lib/python${MODPY_VERSION}/site-packages/mercurial/transaction.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/treediscovery.py
Re: UPDATE: audio/deadbeef
On Thu, Nov 29, 2012 at 12:14:33AM +0600, Alexandr Shadchin wrote: > On Mon, Nov 19, 2012 at 11:33:09PM +0600, Alexandr Shadchin wrote: > > Hi, > > > > This update package deadbeef to the latest release 0.5.6. > > Tested on amd64. > > > > Split package on -main, -gtk2 and -gtk3. > > Please make review this change. > > > > Comments ? OK ? > > > > Fix BUILD_DEPENDS. The gtk2 sub-package should have a @pkgpath marker so upgrading from the older package to the new main + gtk2 package set will have the expected result. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: x11/enlightenment (e16) sndio backend
On Wed, Nov 28, 2012 at 01:15:41PM +0100, Jonathan Armani wrote: > Hi, > > Diff that implement an sndio backend to e16 > Lightly tested and sounds still works, can a daily e16 user confirm it ? > > With input from brad@, thanks ! fwiw sndio specific bits look ok and a quick e16 test proves it manages to plays sounds. ok ratchov@ -- Alexandre
Re: new: print/xprintproto
On Wed, Nov 28, 2012 at 10:36:40PM +0100, Pascal Stumpf wrote: > On Tue, 21 Aug 2012 11:03:15 +0200, Pascal Stumpf wrote: > > printproto was removed from Xenocara a while ago, but it is needed for > > CDE. Note that making printing actually work in CDE is still WIP, but > > importing this to CVS simplifies things for me. > > Any ok to import these two? (attached again) merge PFRAG.shared in PLIST for libXp, and remove empty patches dir, then it's ok for me. Landry
Re: new: print/xprintproto
On Tue, 21 Aug 2012 11:03:15 +0200, Pascal Stumpf wrote: > printproto was removed from Xenocara a while ago, but it is needed for > CDE. Note that making printing actually work in CDE is still WIP, but > importing this to CVS simplifies things for me. Any ok to import these two? (attached again) xprintproto.tgz Description: xprintproto.tgz libXp.tgz Description: libXp.tgz
[wip] luma 3.0.7 using py-qt4
On Mon, Nov 05, 2012 at 05:18:35PM +0100, Landry Breuil wrote:
> Hi,
>
> after mnemosyne, databases/luma is the last py-qt3 user in the tree.
> Lets give it a shot, updating to a wip-tarball for 3.0.6, link found on
> http://sourceforge.net/mailarchive/forum.php?thread_name=BANLkTing24N%3Do4qxmxt%3D-pvK6tsuEzRNaA%40mail.gmail.com&forum_name=luma-devel
>
> No formal release was done on sourceforge, the linked tarball lacks the
> templates for displaying some objects (added them from the git tree to
> files/), upstream git is somewhat dead,there are less plugins than in
> the previous qt3 version, but it works in basic usage (browsing/etc)
A real release was made on SF, see http://bugs.debian.org/689714. The
templates are in the tarball, but not installed by default hence the
post-install hack.
I intend to commit that soon (and dump py-qt3 to the Attic \o/) so if
you really use luma speak now or stay silent forever.
Landry
Index: Makefile
===
RCS file: /cvs/ports/databases/luma/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile20 Dec 2011 18:55:08 - 1.8
+++ Makefile28 Nov 2012 21:17:03 -
@@ -4,9 +4,8 @@
COMMENT= Qt-based LDAP browser and utility
-MODPY_EGG_VERSION=2.4
+MODPY_EGG_VERSION=3.0.7
DISTNAME= luma-${MODPY_EGG_VERSION}
-REVISION = 3
CATEGORIES=databases x11
@@ -18,28 +17,19 @@
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=luma/}
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=luma/}
MODULES= lang/python
-RUN_DEPENDS= x11/py-qt3 \
+RUN_DEPENDS= x11/py-qt4 \
+ devel/desktop-file-utils \
+ x11/gtk+2,-guic \
databases/py-ldap
-USE_GROFF =Yes
NO_REGRESS=Yes
-pre-configure:
- cp ${FILESDIR}/setup.py ${WRKSRC}/setup.py
- rm ${WRKSRC}/bin/luma
- mv ${WRKSRC}/lib/luma/luma.py ${WRKSRC}/lib/luma/luma
-
+# install the damn templates
post-install:
- mv ${PREFIX}/bin/luma \
- ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/luma/luma
- ln -s ${TRUEPREFIX}/lib/python${MODPY_VERSION}/site-packages/luma/luma \
- ${PREFIX}/bin/luma
- ${INSTALL_DATA_DIR} ${PREFIX}/share/luma/
- cd ${WRKSRC}/share/luma && pax -rw icons i18n ${PREFIX}/share/luma/
- ${INSTALL_MAN} ${WRKSRC}/share/man/man1/luma.1 ${PREFIX}/man/man1/
+ cp -r ${WRKSRC}/luma/plugins/browser/templates \
+
${PREFIX}/lib/python${MODPY_VERSION}/site-packages/luma/plugins/browser/templates/
.include
Index: distinfo
===
RCS file: /cvs/ports/databases/luma/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo26 Aug 2009 16:53:21 - 1.1.1.1
+++ distinfo28 Nov 2012 21:17:03 -
@@ -1,5 +1,2 @@
-MD5 (luma-2.4.tar.bz2) = sVt8TcyubdztyRld1hYJRA==
-RMD160 (luma-2.4.tar.bz2) = o8g1heIYOP/oso3vRu9UlQKlu2k=
-SHA1 (luma-2.4.tar.bz2) = gO00KRHh3kcd8NBj1wyu4+C3kcM=
-SHA256 (luma-2.4.tar.bz2) = 1aZQsY0qUTGO9XnlQed5oiyngWBmuhEe+MbuQWI1Xtg=
-SIZE (luma-2.4.tar.bz2) = 642406
+SHA256 (luma-3.0.7.tar.gz) = thesJYCF4Xgg0x9vsGBVB+SIlReCEPWsmsByYZqZM4g=
+SIZE (luma-3.0.7.tar.gz) = 691026
Index: files/setup.py
===
RCS file: files/setup.py
diff -N files/setup.py
--- files/setup.py 26 Aug 2009 16:53:21 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-# $OpenBSD: setup.py,v 1.1.1.1 2009/08/26 16:53:21 sthen Exp $
-
-from distutils.core import setup
-import sys, os
-
-setup(
-name = "Luma",
-version = "2.4",
-description = "LDAP browser and utility",
-author = "Wido Depping",
-author_email = "wi...@users.sourceforge.net",
-license = "GPL",
-url = "http://luma.sourceforge.net/";,
-packages = ('luma',),
- package_dir = {'': 'lib'},
-scripts = ('lib/luma/luma',)
-)
Index: patches/patch-lib_luma_base_backend_PluginLoader_py
===
RCS file: patches/patch-lib_luma_base_backend_PluginLoader_py
diff -N patches/patch-lib_luma_base_backend_PluginLoader_py
--- patches/patch-lib_luma_base_backend_PluginLoader_py 26 Aug 2009 16:53:21
- 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-lib_luma_base_backend_PluginLoader_py,v 1.1.1.1 2009/08/26
16:53:21 sthen Exp $
lib/luma/base/backend/PluginLoader.py.orig Wed Aug 26 14:54:17 2009
-+++ lib/luma/base/backend/PluginLoader.py Wed Aug 26 14:55:33 2009
-@@ -45,7 +45,9 @@ class PluginLoader(object):
- self.PLUGINS = {}
-
- # get the base diretory of the plugins as a string
--self.pluginBaseDir = os.path.join(environment.lumaInstallationPrefix,
"lib",
Re: [www/uzbl] new port
On Wed, Nov 28, 2012 at 09:24:18PM +0100, Landry Breuil wrote:
> On Wed, Nov 21, 2012 at 10:57:22PM +0100, Dmitrij D. Czarkoff wrote:
> > Hello!
> >
> > I've made a port for Uzbl web browser (see attachment). The port comes in
> > two
> > flavors:
> >
> > * default (using webkit-gtk3)
> > * "gtk2" (using webkit)
> >
> > Works for me, but input is welcome. I believe this browser to be worth
> > inclusion in ports.
>
> Comments portswise :
>
> - this is not the way we fix the shebang for python scripts. see
> python module and MODPY_ADJ_FILES.
> - no need to RUN_DEPENDS on www/webkit, since you already LIB_DEPENDS on
> it. and for gtk2, no need to use 'www/webkit,' the extra comma is
> useless.
and added to that, share/uzbl/{docs,examples} is usually not the way we
do things, rather share/{doc,examples}/uzbl.
Landry
Re: [www/uzbl] new port
On Wed, Nov 21, 2012 at 10:57:22PM +0100, Dmitrij D. Czarkoff wrote: > Hello! > > I've made a port for Uzbl web browser (see attachment). The port comes in two > flavors: > > * default (using webkit-gtk3) > * "gtk2" (using webkit) > > Works for me, but input is welcome. I believe this browser to be worth > inclusion in ports. Comments portswise : - this is not the way we fix the shebang for python scripts. see python module and MODPY_ADJ_FILES. - no need to RUN_DEPENDS on www/webkit, since you already LIB_DEPENDS on it. and for gtk2, no need to use 'www/webkit,' the extra comma is useless. Landry
Re: x11/enlightenment (e16) sndio backend
On Wed, 28 Nov 2012 13:15:41 +0100
Jonathan Armani wrote:
> Hi,
>
> Diff that implement an sndio backend to e16
> Lightly tested and sounds still works, can a daily e16 user confirm it ?
>
> With input from brad@, thanks !
just adding some WANTLIB and distinfo on top of your diff. no problems
otherwise.
thanks
? enlight.diff
Index: Makefile
===
RCS file: /cvs/ports/x11/enlightenment/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- Makefile1 Sep 2012 14:36:58 - 1.60
+++ Makefile28 Nov 2012 20:14:05 -
@@ -7,7 +7,7 @@ DISTNAME= e16-$V
PKGNAME= enlightenment-$V
DOCS= e16-docs-0.16.8.0.2
THEMES=e16-themes-1.0.1
-REVISION= 0
+REVISION= 1
CATEGORIES=x11
@@ -22,10 +22,10 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += ICE Imlib2 SM X11 Xcomposite Xdamage Xext Xfixes Xft
-WANTLIB += Xinerama Xrandr Xrender audiofile c esd expat ffi fontconfig
+WANTLIB += Xinerama Xrandr Xrender audiofile c expat ffi fontconfig
WANTLIB += freetype glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
-WANTLIB += m pango-1.0 pangoft2-1.0 pangoxft-1.0 pcre pthread
-WANTLIB += sndio xcb z
+WANTLIB += harfbuzz icudata icule icuuc m pango-1.0 pangoft2-1.0
+WANTLIB += pangoxft-1.0 pcre pthread sndio xcb z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
@@ -34,10 +34,16 @@ DISTFILES= ${DISTNAME}.tar.gz \
${THEMES}.tar.gz
MODULES= devel/gettext
-LIB_DEPENDS= audio/esound \
- graphics/imlib2 \
- devel/glib2 \
- devel/pango
+
+AUTOCONF_VERSION= 2.65
+AUTOMAKE_VERSION= 1.11
+BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS}
+
+LIB_DEPENDS= devel/glib2 \
+ devel/libaudiofile \
+ devel/pango \
+ graphics/imlib2
RUN_DEPENDS= devel/desktop-file-utils
@@ -47,8 +53,22 @@ USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS+= --disable-sound_esound
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+
+post-extract:
+ cp -f ${FILESDIR}/sound_sndio.c ${WRKSRC}/src
+
+pre-configure:
+ cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal -I m4
+ cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoconf
+ cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoheader
+ cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} automake
post-configure:
@cd ${WRKDIR}/${DOCS} && ${SETENV} ${CONFIGURE_ENV} \
Index: distinfo
===
RCS file: /cvs/ports/x11/enlightenment/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo29 Sep 2011 20:04:44 - 1.9
+++ distinfo28 Nov 2012 20:14:05 -
@@ -1,12 +1,3 @@
-MD5 (e16-1.0.9.tar.gz) = rYUEQ2bv5ky2f0qOSaN/hA==
-MD5 (e16-docs-0.16.8.0.2.tar.gz) = Rrzcxc2tdhWZI2cc/OqT+Q==
-MD5 (e16-themes-1.0.1.tar.gz) = u9nP2WlhDCnHYnwroc4wlA==
-RMD160 (e16-1.0.9.tar.gz) = fArKZHFdlTH+nEqn5mOjxGR0a3M=
-RMD160 (e16-docs-0.16.8.0.2.tar.gz) = JG+fxW/WnNFItRj2sxdlVC5ig6c=
-RMD160 (e16-themes-1.0.1.tar.gz) = GcWaZ5wFt4+8/zQllnIOSWV+Puo=
-SHA1 (e16-1.0.9.tar.gz) = l5KQkLXWb6KAZ7IbF/SM7eofgbs=
-SHA1 (e16-docs-0.16.8.0.2.tar.gz) = dznXT6yb88j1/jhYyJdFBImSCi4=
-SHA1 (e16-themes-1.0.1.tar.gz) = rjTi3xKUGYeVc2v5U79pWrqTtxA=
SHA256 (e16-1.0.9.tar.gz) = 1DWECkpCnLIvJB14iegoJwYfbvXM2bvIcgr1He4FPSc=
SHA256 (e16-docs-0.16.8.0.2.tar.gz) =
uNjgyvRZMc5nL6UIipY2hVM6Zamoz+7hUjnZbzuRWT8=
SHA256 (e16-themes-1.0.1.tar.gz) = M85IxdVlGuOl1WdD9od1zLdj661wMG669+FiWHlAyGU=
Index: files/sound_sndio.c
===
RCS file: files/sound_sndio.c
diff -N files/sound_sndio.c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/sound_sndio.c 28 Nov 2012 20:14:05 -
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2012 Jonathan Armani
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIO
Re: [www/uzbl] new port
On Sat, Nov 24, 2012 at 02:11:45PM +0100, Dmitrij D. Czarkoff wrote: > On Sat, Nov 24, 2012 at 03:26:15AM -0800, Ryan Freeman wrote: > > Seems okay but I am incapable of understanding how to use the ui atm ;) > > Unless you altered home page, you have a link to list of commands (you might > want to bookmark it once you learn using bookmarks in Uzbl). Reading config > file (~/.config/uzbl/config) is enlightening as well. Yes, that is a handy homepage :) The info I needed was in the config as well, but it wasn't until i found this: http://www.uzbl.org/wiki/uzbl_tabbed that I found what I was looking for :) Now that I've played for awhile, it seems to be pretty slick and fast, and does indeed feel rather unixy compared to any browser I've ever used before. I haven't experienced any actual problems or crashes so here is one ok, just wait for at least one more from a senior dev :) running good on i386-current OK rfreeman@ -ryan
Re: UPDATE: audio/deadbeef
On Mon, Nov 19, 2012 at 11:33:09PM +0600, Alexandr Shadchin wrote:
> Hi,
>
> This update package deadbeef to the latest release 0.5.6.
> Tested on amd64.
>
> Split package on -main, -gtk2 and -gtk3.
> Please make review this change.
>
> Comments ? OK ?
>
Fix BUILD_DEPENDS.
--
Alexandr Shadchin
Index: Makefile
===
RCS file: /cvs/ports/audio/deadbeef/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile10 Aug 2012 17:25:01 - 1.2
+++ Makefile28 Nov 2012 17:54:35 -
@@ -2,9 +2,14 @@
SHARED_ONLY = Yes
-COMMENT = DeaDBeeF is an audio player
-DISTNAME = deadbeef-0.5.5
-REVISION = 0
+COMMENT-main = DeaDBeeF is an audio player
+COMMENT-gtk2 = gtk+2 gui for DeaDBeeF
+COMMENT-gtk3 = gtk+3 gui for DeaDBeeF
+VERSION = 0.5.6
+DISTNAME = deadbeef-${VERSION}
+PKGNAME-main = deadbeef-${VERSION}
+PKGNAME-gtk2 = deadbeef-gtk2-${VERSION}
+PKGNAME-gtk3 = deadbeef-gtk3-${VERSION}
CATEGORIES = audio
HOMEPAGE = http://deadbeef.sourceforge.net/
@@ -15,21 +20,34 @@ PERMIT_PACKAGE_FTP =Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB += FLAC GL ICE Imlib2 SM X11 Xcomposite Xcursor Xdamage
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 avcodec
-WANTLIB += avformat avutil bz2 c cairo cddb cdio crypto curl dbus-1
-WANTLIB += expat faad ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gsm gthread-2.0
-WANTLIB += gtk-x11-2.0 idn m mad mms mp3lame mpcdec ogg orc-0.4
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB += png pthread pthread-stubs schroedinger-1.0 sndfile
-WANTLIB += sndio speex ssl theoradec theoraenc vorbis vorbisenc
-WANTLIB += vorbisfile vpx wavpack x264 xcb xcb-render xcb-shm
-WANTLIB += xvidcore z zip
+WANTLIB += X11 Xext freetype glib-2.0 m pthread xcb z
+
+WANTLIB-main += ${WANTLIB}
+WANTLIB-main += FLAC Imlib2 avcodec avformat avutil c cddb cdio crypto
+WANTLIB-main += curl dbus-1 faad idn mad mms mpcdec ogg pcre sndfile
+WANTLIB-main += sndio ssl vorbis vorbisfile wavpack zip
+
+WANTLIB-gtk2 += ${WANTLIB}
+WANTLIB-gtk2 += GL ICE SM Xcomposite Xcursor Xdamage Xfixes Xi Xinerama
+WANTLIB-gtk2 += Xrandr Xrender atk-1.0 cairo expat ffi fontconfig gdk-x11-2.0
+WANTLIB-gtk2 += gdk_pixbuf-2.0 gio-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
+WANTLIB-gtk2 += gtk-x11-2.0 harfbuzz icudata icule icuuc pango-1.0
+WANTLIB-gtk2 += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs
+WANTLIB-gtk2 += xcb-render xcb-shm
+
+WANTLIB-gtk3 += ${WANTLIB}
+WANTLIB-gtk3 += GL ICE SM Xcomposite Xcursor Xdamage Xfixes Xi Xinerama
+WANTLIB-gtk3 += Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi cairo cairo-gobject
+WANTLIB-gtk3 += dbus-1 expat ffi fontconfig gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB-gtk3 += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 harfbuzz
+WANTLIB-gtk3 += icudata icule icuuc pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB-gtk3 += pcre pixman-1 png pthread-stubs xcb-render xcb-shm
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=deadbeef/}
EXTRACT_SUFX = .tar.bz2
+MULTI_PACKAGES = -main -gtk2 -gtk3
+
MODULES = devel/gettext \
textproc/intltool
@@ -40,10 +58,12 @@ BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPEN
BUILD_DEPENDS += devel/yasm
.endif
-RUN_DEPENDS = devel/desktop-file-utils \
+RUN_DEPENDS-main = devel/desktop-file-utils \
x11/gtk+2,-guic
+RUN_DEPENDS-gtk2 = audio/deadbeef,-main
+RUN_DEPENDS-gtk3 = audio/deadbeef,-main
-LIB_DEPENDS = archivers/libzip \
+LIB_DEPENDS-main = archivers/libzip \
audio/faad \
audio/flac \
audio/libcdio \
@@ -57,8 +77,9 @@ LIB_DEPENDS = archivers/libzip \
graphics/imlib2 \
multimedia/libmms \
net/curl \
- x11/dbus \
- x11/gtk+2
+ x11/dbus
+LIB_DEPENDS-gtk2 = x11/gtk+2
+LIB_DEPENDS-gtk3 = x11/gtk+3
USE_GMAKE =Yes
USE_LIBTOOL = gnu
@@ -81,7 +102,9 @@ CONFIGURE_ARGS +=${CONFIGURE_SHARED} \
--disable-wildmidi \
--disable-supereq \
--disable-src \
- --disable-mono2stereo
+ --disable-mono2stereo \
+ --disable-abstract-socket \
+ --enable-ffmpeg
CONFIGURE_ENV += CPPFLAGS='-I${LOCALBASE}/lib/libzip/include
-I${X11BASE}/include' \
LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib'
Index: distinfo
=
Re: x11/enlightenment (e16) sndio backend
On Wed, Nov 28, 2012 at 6:15 AM, Jonathan Armani wrote:
> Hi,
>
> Diff that implement an sndio backend to e16
> Lightly tested and sounds still works, can a daily e16 user confirm it ?
>
> With input from brad@, thanks !
I will differ to ratchov@ for the diff. I haven't dived yet in the
setup of sound on the OpenBSD machine.
thanks
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/enlightenment/Makefile,v
> retrieving revision 1.60
> diff -u -p -r1.60 Makefile
> --- Makefile1 Sep 2012 14:36:58 - 1.60
> +++ Makefile28 Nov 2012 09:28:02 -
> @@ -7,7 +7,7 @@ DISTNAME= e16-$V
> PKGNAME= enlightenment-$V
> DOCS= e16-docs-0.16.8.0.2
> THEMES=e16-themes-1.0.1
> -REVISION= 0
> +REVISION= 1
>
> CATEGORIES=x11
>
> @@ -22,7 +22,7 @@ PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP= Yes
>
> WANTLIB += ICE Imlib2 SM X11 Xcomposite Xdamage Xext Xfixes Xft
> -WANTLIB += Xinerama Xrandr Xrender audiofile c esd expat ffi fontconfig
> +WANTLIB += Xinerama Xrandr Xrender audiofile c expat ffi fontconfig
> WANTLIB += freetype glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
> WANTLIB += m pango-1.0 pangoft2-1.0 pangoxft-1.0 pcre pthread
> WANTLIB += sndio xcb z
> @@ -34,10 +34,16 @@ DISTFILES= ${DISTNAME}.tar.gz \
> ${THEMES}.tar.gz
>
> MODULES= devel/gettext
> -LIB_DEPENDS= audio/esound \
> - graphics/imlib2 \
> - devel/glib2 \
> - devel/pango
> +
> +AUTOCONF_VERSION= 2.65
> +AUTOMAKE_VERSION= 1.11
> +BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
> + ${MODGNU_AUTOMAKE_DEPENDS}
> +
> +LIB_DEPENDS= devel/glib2 \
> + devel/libaudiofile \
> + devel/pango \
> + graphics/imlib2
>
> RUN_DEPENDS= devel/desktop-file-utils
>
> @@ -47,8 +53,22 @@ USE_GMAKE= Yes
> USE_LIBTOOL= Yes
>
> CONFIGURE_STYLE= gnu
> +CONFIGURE_ARGS+= --disable-sound_esound
> CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
> LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
> +
> +post-extract:
> + cp -f ${FILESDIR}/sound_sndio.c ${WRKSRC}/src
> +
> +pre-configure:
> + cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal -I m4
> + cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoconf
> + cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoheader
> + cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} automake
>
> post-configure:
> @cd ${WRKDIR}/${DOCS} && ${SETENV} ${CONFIGURE_ENV} \
> Index: files/sound_sndio.c
> ===
> RCS file: files/sound_sndio.c
> diff -N files/sound_sndio.c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ files/sound_sndio.c 28 Nov 2012 09:28:02 -
> @@ -0,0 +1,121 @@
> +/*
> + * Copyright (c) 2012 Jonathan Armani
> + *
> + * Permission to use, copy, modify, and distribute this software for any
> + * purpose with or without fee is hereby granted, provided that the above
> + * copyright notice and this permission notice appear in all copies.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
> + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
> + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
> + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
> + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
> + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> + */
> +
> +#include "E.h"
> +#if defined(HAVE_SOUND) && defined(HAVE_SOUND_SNDIO)
> +#include "sound.h"
> +#include
> +
> +#ifdef USE_MODULES
> +#define Estrdup strdup
> +#endif
> +
> +struct _sample {
> + SoundSampleData ssd;
> +};
> +
> +static struct sio_hdl * hdl;
> +
> +static Sample *
> +_sound_sndio_Load(const char *file)
> +{
> + Sample *s;
> + int err;
> +
> + if (hdl == NULL)
> + return NULL;
> +
> + s = ECALLOC(Sample, 1);
> + if (!s)
> + return NULL;
> +
> + err = SoundSampleGetData(file, &s->ssd);
> + if (err)
> + {
> + Efree(s);
> + return NULL;
> + }
> +
> + return s;
> +}
> +
> +static void
> +_sound_sndio_Destroy(Sample * s)
> +{
> + if (!s)
> + return;
> +
> + _EFREE(s->ssd.data);
> + Efree(s);
> +}
> +
> +static void
> +_sound_sndio_Play(Sample * s)
> +{
> + struct sio_par params;
> + if (hdl == NULL || !s)
> + return;
> +
> + sio_initpar(¶ms);
> + params
UPDATE: Spectrwm-2.1.1
Hi, Update for Spectrwm to 2.1.1: * Avoid a free on an uninitialized variable by setting optval to NULL. * Fix fparseln flags to remove escape characters in the result. * Fix issue where rapid window crossing events might get ignored. * Validate bound spawn programs after conf is loaded. * Fix move/resize to bail if the window gets destroyed. * Fix bar clock not getting updated during periods of inactivity. Ok? Comments? Chers. -- Sending from my VCR... Index: Makefile === RCS file: /cvs/ports/x11/spectrwm/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile5 Nov 2012 12:12:36 - 1.5 +++ Makefile28 Nov 2012 14:41:46 - @@ -4,7 +4,7 @@ COMMENT=small tiling window manager SHARED_LIBS= swmhack 1.0 -DISTNAME= spectrwm-2.1.0 +DISTNAME= spectrwm-2.1.1 EXTRACT_SUFX= .tgz CATEGORIES=x11 Index: distinfo === RCS file: /cvs/ports/x11/spectrwm/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo5 Nov 2012 12:12:36 - 1.5 +++ distinfo28 Nov 2012 14:41:46 - @@ -1,2 +1,2 @@ -SHA256 (spectrwm-2.1.0.tgz) = G6smd9UWrHLgW47wVjdbIfCF9PVjuPVo+cGM0q1+xAU= -SIZE (spectrwm-2.1.0.tgz) = 106087 +SHA256 (spectrwm-2.1.1.tgz) = Q7EZPyGXS5dJOuYgNhvhuQV1HM6VgPwmZT/Y6m1wcSE= +SIZE (spectrwm-2.1.1.tgz) = 106471 Index: patches/patch-spectrwm_c === RCS file: /cvs/ports/x11/spectrwm/patches/patch-spectrwm_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-spectrwm_c --- patches/patch-spectrwm_c5 Sep 2012 20:33:43 - 1.3 +++ patches/patch-spectrwm_c28 Nov 2012 14:41:46 - @@ -1,7 +1,7 @@ $OpenBSD: patch-spectrwm_c,v 1.3 2012/09/05 20:33:43 gonzalo Exp $ spectrwm.c.origMon Aug 27 13:13:11 2012 -+++ spectrwm.c Wed Sep 5 08:56:28 2012 -@@ -260,7 +260,7 @@ u_int32_t swm_debug = 0 +--- spectrwm.c.origWed Nov 28 11:02:13 2012 spectrwm.c Wed Nov 28 11:36:23 2012 +@@ -261,7 +261,7 @@ u_int32_t swm_debug = 0 #define SWM_CONF_KEYMAPPING (1) #ifndef SWM_LIB
Re: Remove gkrellmss
On Tue, Nov 27, 2012 at 10:36 PM, Jonathan Armani wrote: > > Ok to remove gkrell mss plugin ? > > Description > Sound scope plugin for GkrellM2. *Uses ESD* Ok for me. Ciao, David
Re: Remove audio/bmp
On Tue, Nov 27, 2012 at 10:32 PM, Jonathan Armani wrote: > Hi, > > Diff to remove bmp, does someone still use it ? > I don't use it myself, so I'm not the guy that will backport xmms > backend, but I would like to remove esd and it is on my way. ok dcoppa@
x11/enlightenment (e16) sndio backend
Hi,
Diff that implement an sndio backend to e16
Lightly tested and sounds still works, can a daily e16 user confirm it ?
With input from brad@, thanks !
Index: Makefile
===
RCS file: /cvs/ports/x11/enlightenment/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- Makefile1 Sep 2012 14:36:58 - 1.60
+++ Makefile28 Nov 2012 09:28:02 -
@@ -7,7 +7,7 @@ DISTNAME= e16-$V
PKGNAME= enlightenment-$V
DOCS= e16-docs-0.16.8.0.2
THEMES=e16-themes-1.0.1
-REVISION= 0
+REVISION= 1
CATEGORIES=x11
@@ -22,7 +22,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += ICE Imlib2 SM X11 Xcomposite Xdamage Xext Xfixes Xft
-WANTLIB += Xinerama Xrandr Xrender audiofile c esd expat ffi fontconfig
+WANTLIB += Xinerama Xrandr Xrender audiofile c expat ffi fontconfig
WANTLIB += freetype glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += m pango-1.0 pangoft2-1.0 pangoxft-1.0 pcre pthread
WANTLIB += sndio xcb z
@@ -34,10 +34,16 @@ DISTFILES= ${DISTNAME}.tar.gz \
${THEMES}.tar.gz
MODULES= devel/gettext
-LIB_DEPENDS= audio/esound \
- graphics/imlib2 \
- devel/glib2 \
- devel/pango
+
+AUTOCONF_VERSION= 2.65
+AUTOMAKE_VERSION= 1.11
+BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS}
+
+LIB_DEPENDS= devel/glib2 \
+ devel/libaudiofile \
+ devel/pango \
+ graphics/imlib2
RUN_DEPENDS= devel/desktop-file-utils
@@ -47,8 +53,22 @@ USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS+= --disable-sound_esound
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+
+post-extract:
+ cp -f ${FILESDIR}/sound_sndio.c ${WRKSRC}/src
+
+pre-configure:
+ cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal -I m4
+ cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoconf
+ cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoheader
+ cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} automake
post-configure:
@cd ${WRKDIR}/${DOCS} && ${SETENV} ${CONFIGURE_ENV} \
Index: files/sound_sndio.c
===
RCS file: files/sound_sndio.c
diff -N files/sound_sndio.c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/sound_sndio.c 28 Nov 2012 09:28:02 -
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2012 Jonathan Armani
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "E.h"
+#if defined(HAVE_SOUND) && defined(HAVE_SOUND_SNDIO)
+#include "sound.h"
+#include
+
+#ifdef USE_MODULES
+#define Estrdup strdup
+#endif
+
+struct _sample {
+ SoundSampleData ssd;
+};
+
+static struct sio_hdl * hdl;
+
+static Sample *
+_sound_sndio_Load(const char *file)
+{
+ Sample *s;
+ int err;
+
+ if (hdl == NULL)
+ return NULL;
+
+ s = ECALLOC(Sample, 1);
+ if (!s)
+ return NULL;
+
+ err = SoundSampleGetData(file, &s->ssd);
+ if (err)
+ {
+ Efree(s);
+ return NULL;
+ }
+
+ return s;
+}
+
+static void
+_sound_sndio_Destroy(Sample * s)
+{
+ if (!s)
+ return;
+
+ _EFREE(s->ssd.data);
+ Efree(s);
+}
+
+static void
+_sound_sndio_Play(Sample * s)
+{
+ struct sio_par params;
+ if (hdl == NULL || !s)
+ return;
+
+ sio_initpar(¶ms);
+ params.bits = s->ssd.bit_per_sample;
+ params.pchan = s->ssd.channels;
+ params.rate = s->ssd.rate;
+
+ if (!sio_setpar(hdl, ¶ms))
+ return;
+ if (!sio_getpar(hdl, ¶ms))
+ return;
+ if (params.bits != s->ssd.bit_per_sample ||
+ params.pchan != s->ssd.channels ||
+params.rate != s->ssd.rate)
+ return;
+
+ if (!sio_start(hdl))
+ return;
+
+ sio_write(hdl, s->ssd.data, s->ssd.size);
+ sio_stop(hdl);
+}
+
+static int
+
Re: update: devel/git
On Mon, 26 Nov 2012 13:36:08 +0100, Pascal Stumpf wrote:
> Update to git 1.8.0.
>
> - Don't install docs other than manpages. They just consume a lot of
> build time.
>
> - re-enable threads now that we have rthreads
>
> - apparently no need for gtar
>
> There's one test that fails (last one in t-basic.sh), but other than
> that, regress passes. Haven't tested gitweb or svn functionality.
Updated diff for 1.8.0.1.
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- Makefile21 Feb 2012 22:19:31 - 1.85
+++ Makefile28 Nov 2012 10:15:57 -
@@ -4,17 +4,13 @@ COMMENT-main =GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V =1.7.6
+V =1.8.0.1
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
PKGNAME-x11 = git-x11-${V}
CATEGORIES = devel
-REVISION-main =4
-REVISION-svn = 2
-REVISION-x11 = 2
-
HOMEPAGE = http://git-scm.com/
MAINTAINER = Benoit Lecocq
@@ -25,34 +21,25 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-DOC_DISTFILES =git-manpages-${V}${EXTRACT_SUFX} \
- git-htmldocs-${V}${EXTRACT_SUFX}
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} ${DOC_DISTFILES}
+DOC_DISTFILE = git-manpages-${V}${EXTRACT_SUFX}
+DISTFILES =${DISTNAME}${EXTRACT_SUFX} ${DOC_DISTFILE}
EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
-MASTER_SITES = http://distfiles.nl/ \
- ftp://ftp.kernel.org/pub/software/scm/git/ \
- ftp://ftp.de.kernel.org/pub/software/scm/git/ \
- ftp://ftp.au.kernel.org/pub/software/scm/git/
-
-TAR = ${LOCALBASE}/bin/gtar
+MASTER_SITES = http://git-core.googlecode.com/files/
-MODULES = converters/libiconv x11/tk
+MODULES = devel/gettext x11/tk
-BUILD_DEPENDS =archivers/gtar \
- devel/p5-Error \
- textproc/asciidoc \
- textproc/xmlto
+BUILD_DEPENDS =devel/p5-Error
MULTI_PACKAGES = -main -svn -x11
-WANTLIB-main = c expat crypto curl ssl z ${MODLIBICONV_WANTLIB}
+WANTLIB-main = c expat crypto curl pthread ssl z ${MODGETTEXT_WANTLIB}
RUN_DEPENDS-main = net/rsync \
devel/p5-Error \
devel/cvsps \
- ${MODLIBICONV_RUN_DEPENDS}
+ ${MODGETTEXT_RUN_DEPENDS}
LIB_DEPENDS-main = net/curl \
- ${MODLIBICONV_LIB_DEPENDS}
+ ${MODGETTEXT_LIB_DEPENDS}
RUN_DEPENDS-svn = ${BASE_PKGPATH} \
devel/p5-Term-ReadKey \
@@ -91,29 +78,17 @@ SKIP_TESTS =t9502-gitweb-standalone-pa
post-extract:
@mkdir -p ${WRKSRC}/doc
-.for distfile in ${DOC_DISTFILES}
- @cd ${WRKSRC}/doc && ${TAR} -xzf
${FULLDISTDIR}/${distfile}${EXTRACT_SUFX}
-.endfor
- @rm -f ${WRKSRC}/doc/man1/git-p4import.1
+ @cd ${WRKSRC}/doc && ${TAR} -xzf ${FULLDISTDIR}/${DOC_DISTFILE}
@cd ${WRKSRC} && perl -pi -e
"s|/usr/share/git|${TRUEPREFIX}/share/git|g" \
- Documentation/git-clone.txt Documentation/git-init.txt \
- doc/man1/git-clone.1 doc/man1/git-init.1 doc/git-clone.txt \
- doc/git-init.txt doc/git-clone.html doc/git-init.html
-
-post-build:
- @cd ${WRKBUILD}/Documentation && ${MAKE_ENV} ${MAKE_PROGRAM} man
+ doc/man1/git-clone.1 doc/man1/git-init.1 doc/man1/gitweb.1
post-install:
${INSTALL_DATA} ${WRKBUILD}/libgit.a ${PREFIX}/lib
${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
${INSTALL_DATA} ${WRKBUILD}/contrib/emacs/*.el \
${PREFIX}/share/emacs/site-lisp
- cd ${WRKBUILD}/Documentation && \
- ${MAKE_ENV} ${MAKE_PROGRAM} mandir=${TRUEPREFIX}/man install-man
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/git
cd ${WRKBUILD}/doc && \
- pax -rw *.html howto/*.html *.txt howto/*.txt \
- ${PREFIX}/share/doc/git
+ pax -rw . ${PREFIX}/man
${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/post-receive-email \
${PREFIX}/share/git-core/templates/hooks/post-receive-email.sample
chown -R ${BINOWN}:${BINGRP} ${PREFIX}/libexec/git
@@ -125,6 +100,6 @@ post-install:
do-regress:
cd ${WRKSRC}/t && rm -f ${SKIP_TESTS}
cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} \
- HOME=${WRKDIST}/t/trash TAR=${TAR} test
+ HOME=${WRKDIST}/t/trash test
.include
Index: distinfo
===
RCS file: /cvs/ports/de
