summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--wm/ion3-devel/Makefile24
-rw-r--r--wm/ion3-devel/PLIST6
-rw-r--r--wm/ion3-devel/distinfo12
-rw-r--r--wm/ion3-devel/patches/patch-ac2
-rw-r--r--wm/ion3-devel/patches/patch-ak2
5 files changed, 28 insertions, 18 deletions
diff --git a/wm/ion3-devel/Makefile b/wm/ion3-devel/Makefile
index 3d1da00c406..bce4084663c 100644
--- a/wm/ion3-devel/Makefile
+++ b/wm/ion3-devel/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.23 2007/07/17 20:20:08 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2007/08/06 09:52:31 ghen Exp $
#
-DISTNAME= ion-3rc-20070708
-PKGNAME= ${DISTNAME:S/-3ds-/3-/}
-PKGREVISION= 1
-CATEGORIES= wm x11
-MASTER_SITES= http://modeemi.fi/~tuomov/dl/
+DISTNAME= ion-3rc-20070720
+PKGNAME= ${DISTNAME:S/-3rc-/3-/}
+CATEGORIES= wm x11
+MASTER_SITES= http://modeemi.fi/~tuomov/dl/
+MASTER_SITES+= ${MASTER_SITE_FREEBSD_LOCAL:=philip/}
-MAINTAINER= philip@FreeBSD.org
-HOMEPAGE= http://modeemi.fi/~tuomov/ion/
-COMMENT= Keyboard friendly tiling window manager
+MAINTAINER= philip@FreeBSD.org
+HOMEPAGE= http://modeemi.fi/~tuomov/ion/
+COMMENT= Keyboard friendly tiling window manager
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
@@ -39,6 +39,12 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX}
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+MAKE_ENV+= PKGSRC_LIBRT=-lrt
+.endif
+
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../lang/lua/buildlink3.mk"
.include "../../x11/xextproto/buildlink3.mk"
diff --git a/wm/ion3-devel/PLIST b/wm/ion3-devel/PLIST
index 9afd8f8509f..c12cc815f8e 100644
--- a/wm/ion3-devel/PLIST
+++ b/wm/ion3-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/07/17 20:20:08 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/08/06 09:52:31 ghen Exp $
bin/ion3
bin/pwm3
lib/ion3/bin/ion-completefile
@@ -15,8 +15,8 @@ lib/ion3/lc/ioncore_wd.lc
lib/ion3/lc/ioncore_winprops.lc
lib/ion3/lc/mod_dock.lc
lib/ion3/lc/mod_menu.lc
-lib/ion3/lc/mod_query_chdir.lc
lib/ion3/lc/mod_query.lc
+lib/ion3/lc/mod_query_chdir.lc
lib/ion3/lc/mod_sm.lc
lib/ion3/lc/mod_sp.lc
lib/ion3/lc/mod_statusbar.lc
@@ -44,8 +44,8 @@ share/doc/ion3/README
share/doc/ion3/RELNOTES
share/examples/ion3/cfg_defaults.lua
share/examples/ion3/cfg_dock.lua
-share/examples/ion3/cfg_ioncore.lua
share/examples/ion3/cfg_ion.lua
+share/examples/ion3/cfg_ioncore.lua
share/examples/ion3/cfg_kludges.lua
share/examples/ion3/cfg_layouts.lua
share/examples/ion3/cfg_menu.lua
diff --git a/wm/ion3-devel/distinfo b/wm/ion3-devel/distinfo
index 933883cb567..65b42e056f2 100644
--- a/wm/ion3-devel/distinfo
+++ b/wm/ion3-devel/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.8 2007/07/12 13:54:01 joerg Exp $
+$NetBSD: distinfo,v 1.9 2007/08/06 09:52:31 ghen Exp $
-SHA1 (ion-3rc-20070708.tar.gz) = 84bc9871d9f3c6f37d614d7e9eb54021d3e866e5
-RMD160 (ion-3rc-20070708.tar.gz) = 85947dc1b1dd7abd4304a42e2e946a7641cda8c4
-Size (ion-3rc-20070708.tar.gz) = 655000 bytes
+SHA1 (ion-3rc-20070720.tar.gz) = 583042c8c713d0e12146369d2775ae80d5f9be2d
+RMD160 (ion-3rc-20070720.tar.gz) = a97944850d88b81dd20d234f3f114e9f3038d0b3
+Size (ion-3rc-20070720.tar.gz) = 655409 bytes
SHA1 (patch-aa) = 16c548331f747c1cfbfa94b6241128afffdb10fb
SHA1 (patch-ab) = f16cb96af26a779398fc791b1381b34ec4526794
-SHA1 (patch-ac) = cf0194f39d4823ea890e7afa66485565acb30684
+SHA1 (patch-ac) = d36125e5e9ad91d1e26e4e54b9ab819d7413354a
SHA1 (patch-ae) = 7a81f82b6d7f1aebd5f4d07cb778392cb61c4f19
SHA1 (patch-ag) = 9db03d4511e77390f51c917ebcc2f403773ca649
SHA1 (patch-ah) = b30b29fb383838c9008920dfc0435f7a815f963f
SHA1 (patch-aj) = 08e04586bd0432ea1242ea16d3ab3edf72e34ec1
-SHA1 (patch-ak) = e3951c02a5b70e9ff8ec00567f27bc5a96575e25
+SHA1 (patch-ak) = e55342e8bea6a4c6c05a1af2018df466161114b3
SHA1 (patch-al) = d80745093f26a94d900e4bdddbb5a4c9d9e07191
SHA1 (patch-am) = 6a55713477b0408ce4700762558116f53da0084e
diff --git a/wm/ion3-devel/patches/patch-ac b/wm/ion3-devel/patches/patch-ac
index ade0b1e8993..6818d4828ee 100644
--- a/wm/ion3-devel/patches/patch-ac
+++ b/wm/ion3-devel/patches/patch-ac
@@ -1,3 +1,5 @@
+$NetBSD: patch-ac,v 1.4 2007/08/06 09:52:31 ghen Exp $
+
--- etc/Makefile.orig 2007-06-04 09:17:40.000000000 +0200
+++ etc/Makefile 2007-06-04 09:17:59.000000000 +0200
@@ -26,5 +26,5 @@
diff --git a/wm/ion3-devel/patches/patch-ak b/wm/ion3-devel/patches/patch-ak
index c9782d09308..2e183f3d345 100644
--- a/wm/ion3-devel/patches/patch-ak
+++ b/wm/ion3-devel/patches/patch-ak
@@ -1,3 +1,5 @@
+$NetBSD: patch-ak,v 1.3 2007/08/06 09:52:31 ghen Exp $
+
--- utils/ion-completefile/Makefile.orig 2007-06-13 14:02:20.000000000 +0200
+++ utils/ion-completefile/Makefile 2007-06-13 14:03:01.000000000 +0200
@@ -8,7 +8,7 @@