cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to ion-3ds-20050406, input from mjc@ and sturm@, okay sturm@

Browse Source
This commit is contained in:
pedro 2005-04-23 16:22:26 +00:00
parent 2029e02f9b
commit e469d8cb56
10 changed files with 160 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
x11/ion/Makefile
View File

@ -1,33 +1,30 @@
# $OpenBSD: Makefile,v 1.18 2005/04/02 18:17:22 db Exp $
# $OpenBSD: Makefile,v 1.19 2005/04/23 16:22:26 pedro Exp $
COMMENT= "light, keyboard friendly window manager"
DISTNAME= ion-2-20040729
PKGNAME= ion-2.20040729p1
HOMEPAGE= http://modeemi.cs.tut.fi/~tuomov/ion/
DISTNAME= ion-3ds-20050406
CATEGORIES= x11
MASTER_SITES= ${HOMEPAGE}dl/ \
ftp://rt.fm/pub/ion/
HOMEPAGE= http://modeemi.cs.tut.fi/~tuomov/ion/
MASTER_SITES= ${HOMEPAGE}dl/
MAINTAINER= Pedro Martelletto <pedro@openbsd.org>
# LGPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xinerama c m
WANTLIB= ICE X11 m c Xinerama SM Xext
USE_GMAKE= Yes
USE_X11= Yes
NO_REGRESS= Yes
LIB_DEPENDS= ltdl.4::devel/libtool \
lua.5,lualib.5::lang/lua
LIB_DEPENDS= lua.5,lualib.5::lang/lua
.include <bsd.port.mk>
.if ${NO_SHARED_LIBS:L} == "yes"
MAKE_ENV= PRELOAD_MODULES=1
.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes"
MAKE_ENV= PRELOAD_MODULES=1
.endif

8
x11/ion/distinfo
View File

@ -1,4 +1,4 @@
MD5 (ion-2-20040729.tar.gz) = d7d98baa41635c1989e423adf76eb2ac
RMD160 (ion-2-20040729.tar.gz) = a32053c744cc130d9feb07f64bf3fef6cb4fa0c7
SHA1 (ion-2-20040729.tar.gz) = 92329a392de13dfb79ecd236eeb121a7045327e5
SIZE (ion-2-20040729.tar.gz) = 399367
MD5 (ion-3ds-20050406.tar.gz) = a7e040a34ea4edf462fd410c47a4def6
RMD160 (ion-3ds-20050406.tar.gz) = 2a62829074dbfd5c4551e84e11c20b0b23d2fe36
SHA1 (ion-3ds-20050406.tar.gz) = e7c80061af2006be51159bfab06ab82849a6732c
SIZE (ion-3ds-20050406.tar.gz) = 603133

20
x11/ion/patches/patch-etc_Makefile
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-etc_Makefile,v 1.1 2005/04/02 18:17:22 db Exp $
--- etc/Makefile.orig Thu Jul 29 05:10:32 2004
+++ etc/Makefile Sat Apr 2 18:21:00 2005
@@ -14,6 +14,8 @@ ETC = ion.lua ion-bindings.lua ion-menus
look-greyviolet.lua look-ios.lua look-cleanviolet.lua \
look-simpleblue.lua look-wheat2.lua look-cleanios.lua
+DRAW = draw.lua
+
######################################
include $(TOPDIR)/rules.mk
@@ -25,5 +27,5 @@ _install:
for i in $(ETC); do \
$(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR); \
done
- rm -f $(ETCDIR)/draw.lua
- ln -s look-cleanviolet.lua $(ETCDIR)/draw.lua
+ rm -f $(ETCDIR)/$(DRAW)
+ $(INSTALL) -m $(DATA_MODE) look-cleanviolet.lua $(ETCDIR)/$(DRAW)

12
x11/ion/patches/patch-ion_Makefile
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ion_Makefile,v 1.1 2004/07/09 21:16:26 naddy Exp $
--- ion/Makefile.orig Tue Jun 1 16:35:23 2004
+++ ion/Makefile Thu Jul 8 10:41:10 2004
@@ -45,7 +45,7 @@ include $(TOPDIR)/rules.mk
######################################
ion: $(OBJS) $(EXT_OBJS)
- $(LIBTOOL) --mode=link $(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@
+ $(LIBTOOL) --mode=link --tag=CXX $(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@
_install:
$(INSTALLDIR) $(BINDIR)

12
x11/ion/patches/patch-pwm_Makefile
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-pwm_Makefile,v 1.1 2004/07/09 21:16:26 naddy Exp $
--- pwm/Makefile.orig Tue Jun 1 16:35:23 2004
+++ pwm/Makefile Thu Jul 8 10:41:10 2004
@@ -51,7 +51,7 @@ include $(TOPDIR)/rules.mk
######################################
pwm: $(OBJS) $(EXT_OBJS)
- $(LIBTOOL) --mode=link $(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@
+ $(LIBTOOL) --mode=link --tag=CXX $(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@
_install:
$(INSTALLDIR) $(BINDIR)

16
x11/ion/patches/patch-rules_mk
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-rules_mk,v 1.1 2004/07/09 21:16:26 naddy Exp $
--- rules.mk.orig Fri Jul 2 14:53:11 2004
+++ rules.mk Fri Jul 2 14:53:46 2004
@@ -82,10 +82,10 @@ LINKOPT=-static -module -avoid-version
endif
%.lo: %.c
- $(LIBTOOL) --mode=compile $(CC) $(PICOPT) $(CFLAGS) -c $< -o $@
+ $(LIBTOOL) --mode=compile --tag=CXX $(CC) $(PICOPT) $(CFLAGS) -c $< -o $@
$(MODULE).la: $(OBJS) $(EXT_OBJS)
- $(LIBTOOL) --mode=link $(CC) $(LINKOPT) $(LDFLAGS) \
+ $(LIBTOOL) --mode=link --tag=CXX $(CC) $(LINKOPT) $(LDFLAGS) \
-rpath $(MODULEDIR) $(OBJS) $(EXT_OBJS) -o $@
module_install:

72
x11/ion/patches/patch-system_mk
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-system_mk,v 1.4 2004/07/09 21:16:26 naddy Exp $
--- system.mk.orig Tue Jun 1 16:35:23 2004
+++ system.mk Fri Jul 9 23:07:44 2004
$OpenBSD: patch-system_mk,v 1.5 2005/04/23 16:22:26 pedro Exp $
--- system.mk.orig Wed Apr 6 07:39:56 2005
+++ system.mk Sat Apr 23 11:11:54 2005
@@ -7,7 +7,7 @@
## Installation paths
##
@ -14,38 +14,32 @@ $OpenBSD: patch-system_mk,v 1.4 2004/07/09 21:16:26 naddy Exp $
# Main binaries
BINDIR=$(PREFIX)/bin
# Configuration .lua files
-ETCDIR=$(PREFIX)/etc/ion
+ETCDIR=$(PREFIX)/share/examples/ion
-ETCDIR=$(PREFIX)/etc/ion3
+ETCDIR=$(PREFIX)/share/examples/ion3
# Some .lua files and ion-* shell scripts
SHAREDIR=$(PREFIX)/share/ion
SHAREDIR=$(PREFIX)/share/ion3
# Manual pages
-MANDIR=$(PREFIX)/share/man
+MANDIR=$(PREFIX)/man
# Some documents
DOCDIR=$(PREFIX)/share/doc/ion
+EXAMPLEDIR=$(PREFIX)/share/examples/ion
DOCDIR=$(PREFIX)/share/doc/ion3
+EXAMPLEDIR=$(PREFIX)/share/examples/ion3
# Nothing at the moment
-INCDIR=$(PREFIX)/include/ion
-INCDIR=$(PREFIX)/include/ion3
+INCDIR=$(PREFIX)/include
# Nothing at the moment
LIBDIR=$(PREFIX)/lib
# Modules
@@ -56,10 +57,10 @@ LTDL_LIBS=-lltdl
# autoconf-expecting wrapper. If you also set PRELOAD_MODULES=1 and disable
# Xinerama support below, Ion should compile on Cygwin.
#
-#LIBTOOLDIR=/usr/local/stow/libtool-1.5
-#LIBTOOL=$(LIBTOOLDIR)/bin/libtool
-#LTDL_INCLUDES=-I$(LIBTOOLDIR)/include
-#LTDL_LIBS=-L$(LIBTOOLDIR)/lib -lltdl
+LIBTOOLDIR=/usr/local
+LIBTOOL=$(LIBTOOLDIR)/bin/libtool
+LTDL_INCLUDES=-I$(LIBTOOLDIR)/share/libtool/libltdl
+LTDL_LIBS=-L$(LIBTOOLDIR)/lib -lltdl
@@ -47,7 +48,7 @@ LOCALEDIR=$(PREFIX)/share/locale
#PRELOAD_MODULES=1
# Set PRELOAD_MODULES=1 if your system does not support dynamically loaded
# modules.
@@ -90,7 +91,7 @@ LUAC=$(LUA_DIR)/bin/luac
# Flags to link with libdl.
-DL_LIBS=-ldl
+#DL_LIBS=-ldl
##
@@ -74,7 +75,7 @@ LUAC=$(LUA_DIR)/bin/luac
## X libraries, includes and options
##
@ -54,7 +48,16 @@ $OpenBSD: patch-system_mk,v 1.4 2004/07/09 21:16:26 naddy Exp $
# SunOS/Solaris
#X11_PREFIX=/usr/openwin
@@ -119,29 +120,29 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR
@@ -88,7 +89,7 @@ XINERAMA_LIBS=-lXinerama
# XFree86 libraries up to 4.3.0 have a bug that will cause Ion to segfault
# if Opera is used when i18n support is enabled. The following setting
# should work around that situation.
-DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
+#DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
# Use the Xutf8 routines (XFree86 extension) instead of Xmb routines in
# an UTF8 locale given the -i18n command line option?
@@ -107,13 +108,13 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR
# asprintf and vasprintf in the c library. (gnu libc has.)
# If HAS_SYSTEM_ASPRINTF is not defined, an implementation
# in sprintf_2.2/ is used.
@ -63,13 +66,14 @@ $OpenBSD: patch-system_mk,v 1.4 2004/07/09 21:16:26 naddy Exp $
# If you're on an archaic system (such as relatively recent *BSD releases)
# without even dummy multibyte/widechar support, you may have to uncomment
# the following line:
-#DEFINES += -DCF_NO_MB_SUPPORT
+DEFINES += -DCF_NO_MB_SUPPORT
# without even dummy multibyte/widechar and localisation support, you may
# have to uncomment the following line:
-#DEFINES += -DCF_NO_LOCALE
+DEFINES += -DCF_NO_LOCALE
##
# On some other systems you may something like this:
#EXTRA_LIBS += -lintl
@@ -124,16 +125,16 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR
## C compiler
##
@ -87,8 +91,8 @@ $OpenBSD: patch-system_mk,v 1.4 2004/07/09 21:16:26 naddy Exp $
-CFLAGS=-g -Os $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
-LDFLAGS=-g -Os $(EXTRA_LIBS) $(LIBS)
+CFLAGS+=$(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
+LDFLAGS+=$(EXTRA_LIBS) $(LIBS)
+CFLAGS+= $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
+LDFLAGS+= $(EXTRA_LIBS) $(LIBS)
EXPORT_DYNAMIC=-Xlinker --export-dynamic
# The following options are mainly for development use and can be used
# to check that the code seems to conform to some standards. Depending

2
x11/ion/pkg/DESCR
View File

@ -6,3 +6,5 @@ displays have so much space that this is convenient and smaller displays
couldn't show more than one window at a time anyway. The frames can be split and
growing the size of one will shrink others. As in PWM, clients can be moved
between frames and multiple clients can be attached to one frame.
This is the development version of the Ion window manager.

19
x11/ion/pkg/PFRAG.shared
View File

@ -1,7 +1,12 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2004/07/09 21:16:27 naddy Exp $
lib/ion/de.so
lib/ion/dock.so
lib/ion/floatws.so
lib/ion/ionws.so
lib/ion/menu.so
lib/ion/query.so
@comment $OpenBSD: PFRAG.shared,v 1.2 2005/04/23 16:22:26 pedro Exp $
lib/ion3/mod/de.so
lib/ion3/mod/mod_dock.so
lib/ion3/mod/mod_floatws.so
lib/ion3/mod/mod_ionws.so
lib/ion3/mod/mod_menu.so
lib/ion3/mod/mod_mgmtmode.so
lib/ion3/mod/mod_panews.so
lib/ion3/mod/mod_query.so
lib/ion3/mod/mod_sm.so
lib/ion3/mod/mod_sp.so
lib/ion3/mod/mod_statusbar.so

186
x11/ion/pkg/PLIST
View File

@ -1,93 +1,95 @@
@comment $OpenBSD: PLIST,v 1.7 2004/12/29 15:20:52 espie Exp $
@conflict pwm-*
bin/ion
bin/pwm
lib/ion/
lib/ion/de.a
lib/ion/de.la
lib/ion/dock.a
lib/ion/dock.la
lib/ion/floatws.a
lib/ion/floatws.la
lib/ion/ion-completefile
lib/ion/ionws.a
lib/ion/ionws.la
lib/ion/lc/
lib/ion/lc/ioncore-efbb.lc
lib/ion/lc/ioncorelib-mplexfns.lc
lib/ion/lc/ioncorelib.lc
lib/ion/lc/menulib.lc
lib/ion/lc/querylib.lc
lib/ion/menu.a
lib/ion/menu.la
lib/ion/query.a
lib/ion/query.la
@man man/man1/ion.1
@man man/man1/pwm.1
share/doc/ion/
share/doc/ion/ChangeLog
share/doc/ion/LICENSE
share/doc/ion/README
share/examples/ion/
@sample ${SYSCONFDIR}/ion/
share/examples/ion/dock-draw.lua
@sample ${SYSCONFDIR}/ion/dock-draw.lua
share/examples/ion/dock.lua
@sample ${SYSCONFDIR}/ion/dock.lua
share/examples/ion/draw.lua
@sample ${SYSCONFDIR}/ion/draw.lua
share/examples/ion/floatws.lua
@sample ${SYSCONFDIR}/ion/floatws.lua
share/examples/ion/ion-bindings.lua
@sample ${SYSCONFDIR}/ion/ion-bindings.lua
share/examples/ion/ion-menus.lua
@sample ${SYSCONFDIR}/ion/ion-menus.lua
share/examples/ion/ion.lua
@sample ${SYSCONFDIR}/ion/ion.lua
share/examples/ion/ionws.lua
@sample ${SYSCONFDIR}/ion/ionws.lua
share/examples/ion/kludges.lua
@sample ${SYSCONFDIR}/ion/kludges.lua
share/examples/ion/look-brownsteel.lua
@sample ${SYSCONFDIR}/ion/look-brownsteel.lua
share/examples/ion/look-clean.lua
@sample ${SYSCONFDIR}/ion/look-clean.lua
share/examples/ion/look-cleanios.lua
@sample ${SYSCONFDIR}/ion/look-cleanios.lua
share/examples/ion/look-cleanviolet.lua
@sample ${SYSCONFDIR}/ion/look-cleanviolet.lua
share/examples/ion/look-dusky.lua
@sample ${SYSCONFDIR}/ion/look-dusky.lua
share/examples/ion/look-greyviolet.lua
@sample ${SYSCONFDIR}/ion/look-greyviolet.lua
share/examples/ion/look-ios.lua
@sample ${SYSCONFDIR}/ion/look-ios.lua
share/examples/ion/look-simpleblue.lua
@sample ${SYSCONFDIR}/ion/look-simpleblue.lua
share/examples/ion/look-wheat2.lua
@sample ${SYSCONFDIR}/ion/look-wheat2.lua
share/examples/ion/menu.lua
@sample ${SYSCONFDIR}/ion/menu.lua
share/examples/ion/pwm-bindings.lua
@sample ${SYSCONFDIR}/ion/pwm-bindings.lua
share/examples/ion/pwm-menus.lua
@sample ${SYSCONFDIR}/ion/pwm-menus.lua
share/examples/ion/pwm.lua
@sample ${SYSCONFDIR}/ion/pwm.lua
share/examples/ion/query.lua
@sample ${SYSCONFDIR}/ion/query.lua
share/ion/
share/ion/delib.lua
share/ion/ion-edit
share/ion/ion-man
share/ion/ion-runinxterm
share/ion/ion-ssh
share/ion/ion-view
share/ion/ioncore-efbb.lua
share/ion/ioncorelib-mplexfns.lua
share/ion/ioncorelib.lua
share/ion/menulib.lua
share/ion/querylib.lua
share/ion/welcome_message.txt
@comment $OpenBSD: PLIST,v 1.8 2005/04/23 16:22:26 pedro Exp $
%%SHARED%%
@extraunexec rm -rf ${SYSCONFDIR}/ion
bin/ion3
bin/pwm3
lib/ion3/
lib/ion3/bin/
lib/ion3/bin/ion-completefile
lib/ion3/bin/ion-statusd
lib/ion3/lc/
lib/ion3/lc/de.lc
lib/ion3/lc/ext_statusbar.lc
lib/ion3/lc/ioncore_bindings.lc
lib/ion3/lc/ioncore_efbb.lc
lib/ion3/lc/ioncore_ext.lc
lib/ion3/lc/ioncore_luaext.lc
lib/ion3/lc/ioncore_misc.lc
lib/ion3/lc/ioncore_wd.lc
lib/ion3/lc/ioncore_winprops.lc
lib/ion3/lc/mod_dock.lc
lib/ion3/lc/mod_floatws.lc
lib/ion3/lc/mod_ionws.lc
lib/ion3/lc/mod_menu.lc
lib/ion3/lc/mod_mgmtmode.lc
lib/ion3/lc/mod_panews.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
lib/ion3/lc/statusd_load.lc
lib/ion3/lc/statusd_mail.lc
lib/ion3/mod/
man/cs/
man/cs/man1/
@man man/cs/man1/ion3.1
@man man/cs/man1/pwm3.1
man/de/
man/de/man1/
@man man/de/man1/ion3.1
@man man/de/man1/pwm3.1
man/fi/
man/fi/man1/
@man man/fi/man1/ion3.1
@man man/fi/man1/pwm3.1
@man man/man1/ion3.1
@man man/man1/pwm3.1
share/doc/ion3/
share/doc/ion3/ChangeLog
share/doc/ion3/LICENSE
share/doc/ion3/README
share/doc/ion3/RELNOTES
share/examples/ion3/
share/examples/ion3/cfg_bindings.lua
share/examples/ion3/cfg_dock.lua
share/examples/ion3/cfg_floatws.lua
share/examples/ion3/cfg_ion.lua
share/examples/ion3/cfg_ionws.lua
share/examples/ion3/cfg_kludges.lua
share/examples/ion3/cfg_menu.lua
share/examples/ion3/cfg_menus.lua
share/examples/ion3/cfg_panews.lua
share/examples/ion3/cfg_pwm.lua
share/examples/ion3/cfg_pwm_bindings.lua
share/examples/ion3/cfg_pwm_menus.lua
share/examples/ion3/cfg_query.lua
share/examples/ion3/cfg_sp.lua
share/examples/ion3/cfg_statusbar.lua
share/examples/ion3/dock-draw.lua
share/examples/ion3/look.lua
share/examples/ion3/look_brownsteel.lua
share/examples/ion3/look_clean.lua
share/examples/ion3/look_cleanios.lua
share/examples/ion3/look_cleanviolet.lua
share/examples/ion3/look_dusky.lua
share/examples/ion3/look_greyviolet.lua
share/examples/ion3/look_ios.lua
share/examples/ion3/look_simpleblue.lua
share/examples/ion3/look_wheat2.lua
share/ion3/
share/ion3/ion-completeman
share/ion3/ion-runinxterm
share/ion3/welcome.cs.txt
share/ion3/welcome.de.txt
share/ion3/welcome.fi.txt
share/ion3/welcome.txt
share/locale/
share/locale/cs/
share/locale/cs/LC_MESSAGES/
share/locale/cs/LC_MESSAGES/ion3.mo
share/locale/de/
share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/ion3.mo
share/locale/fi/
share/locale/fi/LC_MESSAGES/
share/locale/fi/LC_MESSAGES/ion3.mo