Updated ion3.

This commit is contained in:
Paulo Matias 2008-01-07 20:37:08 +00:00 committed by Thomas Klausner
parent c9591a50b5
commit 18433f1d3a
7 changed files with 37 additions and 36 deletions

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.3 2007/12/04 19:56:32 pmatias Exp $
# $NetBSD: Makefile,v 1.4 2008/01/07 20:37:08 pmatias Exp $
#
DISTNAME= ion-3rc-20071130
PKGNAME= ion3-20071130
DISTNAME= ion-3rc-20080103
PKGNAME= ion3-20080103
CATEGORIES= wm x11
MASTER_SITES= http://iki.fi/tuomov/dl/

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2007/11/03 01:50:07 pmatias Exp $
@comment $NetBSD: PLIST,v 1.2 2008/01/07 20:37:08 pmatias Exp $
bin/ion3
bin/pwm3
lib/ion3/bin/ion-completefile
@ -10,6 +10,7 @@ lib/ion3/lc/ioncore_ext.lc
lib/ion3/lc/ioncore_luaext.lc
lib/ion3/lc/ioncore_menudb.lc
lib/ion3/lc/ioncore_misc.lc
lib/ion3/lc/ioncore_quasiact.lc
lib/ion3/lc/ioncore_tabnum.lc
lib/ion3/lc/ioncore_wd.lc
lib/ion3/lc/ioncore_winprops.lc

View file

@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.3 2007/12/04 19:56:32 pmatias Exp $
$NetBSD: distinfo,v 1.4 2008/01/07 20:37:08 pmatias Exp $
SHA1 (ion-3rc-20071130.tar.gz) = c9da40de4f522350bb366a037e34f00585f5acbe
RMD160 (ion-3rc-20071130.tar.gz) = 236d0b28db141858363e5b3c241d7ecff8cd4860
Size (ion-3rc-20071130.tar.gz) = 649204 bytes
SHA1 (patch-aa) = 83b1c6dae87ac6b0874a7f865abd651e734fd543
SHA1 (patch-ab) = e6cb9a5c5b3566da1bd5f9eae57befc24eb6bc5a
SHA1 (patch-ac) = e9668f96a42d34f9b9f77e3ca61e435b9aafbc86
SHA1 (patch-ad) = 9bab1cd92bb9c51bb44d312aee385c4097840a9f
SHA1 (ion-3rc-20080103.tar.gz) = f2ce01631b67a4d317b608d2173b368bf716a2ce
RMD160 (ion-3rc-20080103.tar.gz) = 47c7c40bf18aff842851a25115ec77b0f541ee2f
Size (ion-3rc-20080103.tar.gz) = 652843 bytes
SHA1 (patch-aa) = 9226acb04636c36ef47d7cf52d18adf1c16fe49c
SHA1 (patch-ab) = 919c8e08589fff05980d12cb347d6a0adee94cc7
SHA1 (patch-ac) = 4d0879d630dcbe8aafaf0b08ff9aff5c95f58420
SHA1 (patch-ad) = 1d88fb36691b613b14cdbdd8a1e2409c72296319

View file

@ -1,17 +1,17 @@
$NetBSD: patch-aa,v 1.1.1.1 2007/11/03 01:50:07 pmatias Exp $
$NetBSD: patch-aa,v 1.2 2008/01/07 20:37:08 pmatias Exp $
--- system.mk.orig 2007-09-27 13:23:35.000000000 -0300
--- system.mk.orig 2008-01-03 16:24:31.000000000 -0200
+++ system.mk
@@ -7,7 +7,7 @@
## Installation paths
##
@@ -8,7 +8,7 @@
# Installation path prefix. Unless you know what you're doing, the default
# of /usr/local is likely the correct choice.
-PREFIX=/usr/local
+PREFIX=@PREFIX@
# Unless you are creating a package conforming to some OS's standards, you
# probably do not want to modify the following directories:
@@ -15,11 +15,12 @@ PREFIX=/usr/local
@@ -16,11 +16,12 @@ PREFIX=/usr/local
# Main binaries
BINDIR=$(PREFIX)/bin
# Configuration .lua files
@ -25,16 +25,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/11/03 01:50:07 pmatias Exp $
# Some documents
DOCDIR=$(PREFIX)/share/doc/ion3
# Nothing at the moment
@@ -47,7 +48,7 @@ LOCALEDIR=$(PREFIX)/share/locale
#PRELOAD_MODULES=1
@@ -50,7 +51,7 @@ LOCALEDIR=$(PREFIX)/share/locale
# Flags to link with libdl.
# Flags to link with libdl. Even if PRELOAD_MODULES=1, you may need this
# setting (for e.g. Lua, when not instructed by pkg-config).
-DL_LIBS=-ldl
+DL_LIBS=
##
@@ -56,8 +57,8 @@ DL_LIBS=-ldl
@@ -59,8 +60,8 @@ DL_LIBS=-ldl
# If you have installed Lua 5.1 from the official tarball without changing
# paths, this should do it.
@ -45,7 +45,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/11/03 01:50:07 pmatias Exp $
LUA_INCLUDES = -I$(LUA_DIR)/include
LUA=$(LUA_DIR)/bin/lua
LUAC=$(LUA_DIR)/bin/luac
@@ -78,7 +79,7 @@ X11_PREFIX=/usr/X11R6
@@ -82,7 +83,7 @@ X11_PREFIX=/usr/X11R6
# SunOS/Solaris
#X11_PREFIX=/usr/openwin
@ -54,12 +54,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/11/03 01:50:07 pmatias Exp $
X11_INCLUDES=-I$(X11_PREFIX)/include
# XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.
@@ -112,7 +113,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR
@@ -110,7 +111,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR
#DEFINES += -DCF_NO_LOCALE -DCF_NO_GETTEXT
# On some other systems you may something like this:
# On some other systems you may need to explicitly link against libintl.
-#EXTRA_LIBS += -lintl
+EXTRA_LIBS += -lintl
#EXTRA_INCLUDES +=
# clock_gettime for monotonic time
# You may also need to give the location of its headers. The following
# should work on Mac OS X (which needs the above option as well) with
# macports.

View file

@ -1,6 +1,6 @@
$NetBSD: patch-ab,v 1.1.1.1 2007/11/03 01:50:07 pmatias Exp $
$NetBSD: patch-ab,v 1.2 2008/01/07 20:37:08 pmatias Exp $
--- build/rules.mk.orig 2007-09-27 13:23:19.000000000 -0300
--- build/rules.mk.orig 2008-01-03 16:24:17.000000000 -0200
+++ build/rules.mk
@@ -167,9 +167,9 @@ lc_install:
done

View file

@ -1,6 +1,6 @@
$NetBSD: patch-ac,v 1.1.1.1 2007/11/03 01:50:07 pmatias Exp $
$NetBSD: patch-ac,v 1.2 2008/01/07 20:37:08 pmatias Exp $
--- etc/Makefile.orig 2007-09-27 13:23:19.000000000 -0300
--- etc/Makefile.orig 2008-01-03 16:24:17.000000000 -0200
+++ etc/Makefile
@@ -24,5 +24,4 @@ include $(TOPDIR)/build/rules.mk
######################################

View file

@ -1,9 +1,9 @@
$NetBSD: patch-ad,v 1.1.1.1 2007/11/03 01:50:07 pmatias Exp $
$NetBSD: patch-ad,v 1.2 2008/01/07 20:37:08 pmatias Exp $
--- pwm/Makefile.orig 2007-09-27 13:23:20.000000000 -0300
--- pwm/Makefile.orig 2008-01-03 16:24:17.000000000 -0200
+++ pwm/Makefile
@@ -69,5 +69,5 @@ _install:
$(INSTALL) -m $(BIN_MODE) pwm3 $(BINDIR)
@@ -73,5 +73,5 @@ _install:
$(INSTALLBIN) pwm3 $(BINDIR)
$(INSTALLDIR) $(PWM_ETCDIR)
for i in $(ETC); do \
- $(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \