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

Update to stable version 2-20040601.

Browse Source 
From: Tim Kornau <opti@openbsd.de> and Bernd Ahlers <ba@bsws.de>.
This commit is contained in:
naddy 2004-07-09 21:16:26 +00:00
parent c46f483dae
commit ff6aa26cf1
14 changed files with 188 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
x11/ion/Makefile
View File

@ -1,15 +1,17 @@
# $OpenBSD: Makefile,v 1.13 2003/10/08 17:13:16 sturm Exp $
# $OpenBSD: Makefile,v 1.14 2004/07/09 21:16:26 naddy Exp $
COMMENT= "light, keyboard friendly window manager"
DISTNAME= ion-20020207
DISTNAME= ion-2-20040601
PKGNAME= ion-2.20040601
HOMEPAGE= http://modeemi.cs.tut.fi/~tuomov/ion/
CATEGORIES= x11
MASTER_SITES= http://modeemi.cs.tut.fi/~tuomov/dl/ \
MASTER_SITES= ${HOMEPAGE}dl/ \
ftp://rt.fm/pub/ion/
# custom
# LGPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -17,8 +19,14 @@ PERMIT_DISTFILES_FTP= Yes
USE_GMAKE= Yes
USE_X11= Yes
MAKE_FLAGS= SYSCONFDIR=${SYSCONFDIR}
NO_REGRESS= Yes
LIB_DEPENDS= ltdl.4::devel/libtool \
lua.5,lualib.5::lang/lua
.include <bsd.port.mk>
.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes"
MAKE_ENV= PRELOAD_MODULES=1
.endif

6
x11/ion/distinfo
View File

@ -1,3 +1,3 @@
MD5 (ion-20020207.tar.gz) = 2e909abb45efefb08b1ceb886bf34cfe
RMD160 (ion-20020207.tar.gz) = 6ca504f9b05d9ac60f1458256a2749c787a9e0b5
SHA1 (ion-20020207.tar.gz) = 68c893de4843613138d09579da676c74526b7c4a
MD5 (ion-2-20040601.tar.gz) = 5b2489a48bba865818a3990d49381ce8
RMD160 (ion-2-20040601.tar.gz) = c906aed27c6c6bf259cca6c21da0ac448cb0b4e0
SHA1 (ion-2-20040601.tar.gz) = 9dce2113e367a518b919f2f324e17a9301b5d317

45
x11/ion/patches/patch-Makefile
View File

@ -1,45 +0,0 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2001/01/02 14:50:36 naddy Exp $
--- Makefile.orig Fri Dec 29 18:09:23 2000
+++ Makefile Sat Dec 30 22:29:23 2000
@@ -19,7 +19,7 @@ ETC= etc/bindings-default.conf etc/bindi
etc/look-brownsteel.conf etc/look-greyviolet.conf \
etc/look-simpleblue.conf etc/look-wheat.conf etc/sample.conf
-DOCS= README LICENSE ChangeLog doc/config.txt doc/functions.txt
+DOCS= doc/config.txt doc/functions.txt
######################################
@@ -28,7 +28,7 @@ include rules.mk
######################################
man/ion.1x: man/ion.1x.in
- sed 's#PREFIX#$(PREFIX)#g' man/ion.1x.in > man/ion.1x
+ sed -e 's#DOCDIR#$(DOCDIR)#g' -e 's#ETCDIR#$(ETCDIR)#g' man/ion.1x.in > man/ion.1x
_install:
$(INSTALLDIR) $(BINDIR)
@@ -44,21 +44,8 @@ _install:
$(INSTALL) -m $(DATA_MODE) $$i $(DOCDIR)/ion; \
done
- $(INSTALLDIR) $(ETCDIR)/ion
+ $(INSTALLDIR) $(EXAMPLEDIR)/ion
for i in $(ETC); do \
- $(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR)/ion; \
+ $(INSTALL) -m $(DATA_MODE) $$i $(EXAMPLEDIR)/ion; \
done
-
- @ if test -f $(ETCDIR)/ion/ion.conf ; then \
- echo "$(ETCDIR)/ion/ion.conf already exists. Not installing one."; \
- else \
- echo "Installing configuration file $(ETCDIR)/ion/ion.conf"; \
- if uname -s -p|grep "SunOS sparc" > /dev/null; then \
- sed s/bindings-default/bindings-sun/ \
- $(ETCDIR)/ion/sample.conf > $(ETCDIR)/ion/ion.conf; \
- chmod $(DATA_MODE) $(ETCDIR)/ion/ion.conf; \
- else \
- cp $(ETCDIR)/ion/sample.conf $(ETCDIR)/ion/ion.conf; \
- fi; \
- fi

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

@ -0,0 +1,12 @@
$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)

44
x11/ion/patches/patch-man_ion_1x_in
View File

@ -1,44 +0,0 @@
$OpenBSD: patch-man_ion_1x_in,v 1.1.1.1 2001/01/02 14:50:36 naddy Exp $
--- man/ion.1x.in.orig Thu Dec 21 21:21:23 2000
+++ man/ion.1x.in Sat Dec 30 17:40:43 2000
@@ -57,10 +57,10 @@ Call a function (query).
Start new SSH session (query, uses ion-ssh).
.TP
.B F5
-Open a file for editing (query). Uses ion-edit which by default uses run-mailcap.
+Open a file for editing (query). Uses ion-edit which by default uses vi(1).
.TP
.B F6
-Open a file for viewing (query). Uses ion-view which by default uses run-mailcap.
+Open a file for viewing (query). Uses ion-view which by default uses vi(1)/lynx(1).
.TP
.B F9
Goto existing workspace or create new (query).
@@ -246,13 +246,13 @@ Drag border: resize.
.SH FILES
.TP
-.B PREFIX/etc/ion/ion.conf
+.B ETCDIR/ion/ion.conf
System default configuration file
.TP
-.B PREFIX/etc/ion/look-*.conf
+.B ETCDIR/ion/look-*.conf
Color scheme configuration files
.TP
-.B PREFIX/etc/ion/bindings-*.conf
+.B ETCDIR/ion/bindings-*.conf
Keyboard and pointer binding configuration files
.TP
.B ~/.ion/ion.conf
@@ -261,8 +261,8 @@ User default configuration file (overrid
.SH SEE ALSO
The Ion home page, \fIhttp://www.students.tut.fi/~tuomov/ion/\fP
.PP
-.I PREFIX/doc/ion/
+.I DOCDIR/ion/
.PP
-.I X(1x)
+.I X(1)
.SH AUTHOR
Ion was written by Tuomo Valkonen <tuomov@cc.tut.fi>.

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

@ -0,0 +1,12 @@
$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 Normal file
View File

@ -0,0 +1,16 @@
$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:

7
x11/ion/patches/patch-scripts_ion-edit
View File

@ -1,7 +0,0 @@
$OpenBSD: patch-scripts_ion-edit,v 1.1.1.1 2001/01/02 14:50:35 naddy Exp $
--- scripts/ion-edit.orig Tue Aug 29 00:03:43 2000
+++ scripts/ion-edit Sat Dec 30 20:18:19 2000
@@ -1,2 +1,2 @@
#!/bin/sh
-exec run-mailcap --action=edit "$1" > /dev/null
+exec ion-runinxterm -T "$1" ${EDITOR-${VISUAL-vi}} "$1"

14
x11/ion/patches/patch-scripts_ion-view
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-scripts_ion-view,v 1.1.1.1 2001/01/02 14:50:35 naddy Exp $
--- scripts/ion-view.orig Tue Aug 29 00:03:43 2000
+++ scripts/ion-view Sat Dec 30 22:59:58 2000
@@ -1,7 +1,7 @@
#!/bin/sh
-if echo "$1"|grep -E '^([a-zA-Z]+://|www.)' > /dev/null; then
- exec netscape-remote "$1"
+if expr "$1" : '[a-zA-Z][a-zA-Z]*://' > /dev/null; then
+ exec ion-runinxterm -T "$1" lynx "$1"
else
- exec run-mailcap --action=view "$1" > /dev/null
+ exec ion-runinxterm -T "$1" ${PAGER-less} "$1"
fi

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

@ -1,48 +1,74 @@
--- system.mk.orig Thu Jan 24 22:40:35 2002
+++ system.mk Thu Jan 24 22:44:22 2002
@@ -7,13 +7,14 @@
$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
@@ -7,7 +7,7 @@
## Installation paths
##
-PREFIX=/usr/local
+#PREFIX=/usr/local
# No need to modify these usually
# Unless you are creating a package conforming to some OS's standards, you
# probably do not want to modify the following directories:
@@ -15,15 +15,16 @@ PREFIX=/usr/local
# Main binaries
BINDIR=$(PREFIX)/bin
-ETCDIR=$(PREFIX)/etc
+ETCDIR=$(SYSCONFDIR)
MANDIR=$(PREFIX)/man
-DOCDIR=$(PREFIX)/doc
+DOCDIR=$(PREFIX)/share/doc
+EXAMPLEDIR=$(PREFIX)/share/examples
# Not used
INCDIR=$(PREFIX)/include
# Configuration .lua files
-ETCDIR=$(PREFIX)/etc/ion
+ETCDIR=$(PREFIX)/share/examples/ion
# Some .lua files and ion-* shell scripts
SHAREDIR=$(PREFIX)/share/ion
# Manual pages
-MANDIR=$(PREFIX)/share/man
+MANDIR=$(PREFIX)/man
# Some documents
DOCDIR=$(PREFIX)/share/doc/ion
+EXAMPLEDIR=$(PREFIX)/share/examples/ion
# Nothing at the moment
-INCDIR=$(PREFIX)/include/ion
+INCDIR=$(PREFIX)/include
# Nothing at the moment
LIBDIR=$(PREFIX)/lib
@@ -24,14 +25,14 @@ 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
#MODULE_SUPPORT=-DCF_NO_MODULE_SUPPORT
-MODULE_SUPPORT_LDFLAGS=-export-dynamic -ldl
+MODULE_SUPPORT_LDFLAGS=
##
# Set PRELOAD_MODULES=1 if your system does not support dynamically loaded
# modules.
@@ -90,7 +91,7 @@ LUAC=$(LUA_DIR)/bin/luac
## X libraries, includes and options
##
-X11_PREFIX=/usr/X11R6
+X11_PREFIX=$(X11BASE)
# SunOS/Solaris
#X11_PREFIX=/usr/openwin
@@ -52,14 +53,14 @@ X11_DEFINES=
@@ -119,29 +120,29 @@ 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 libtu/sprintf_2.2/ is used.
# in sprintf_2.2/ is used.
-#HAS_SYSTEM_ASPRINTF=1
+HAS_SYSTEM_ASPRINTF=1
# 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
##
## C compiler
##
@ -50,33 +76,19 @@
-CC=gcc
+#CC=gcc
# The POSIX_SOURCE, XOPEN_SOURCE and WARN options should not be necessary,
# they're mainly for development use. So, if they cause trouble (not
@@ -68,7 +69,7 @@ CC=gcc
# libtu/ uses POSIX_SOURCE
-POSIX_SOURCE=-ansi -D_POSIX_SOURCE
+#POSIX_SOURCE=-ansi -D_POSIX_SOURCE
# and . (ion) XOPEN_SOURCE.
# There is variation among systems what should be used and how they interpret
@@ -81,13 +82,13 @@ POSIX_SOURCE=-ansi -D_POSIX_SOURCE
# Same as '-Wall -pedantic-errors' without '-Wunused' as callbacks often
# Same as '-Wall -pedantic' without '-Wunused' as callbacks often
# have unused variables.
-WARN= -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \
- -Wtrigraphs -Wformat -Wchar-subscripts \
- -Wparentheses -pedantic-errors -Wuninitialized
- -Wparentheses -pedantic -Wuninitialized
+#WARN= -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \
+# -Wtrigraphs -Wformat -Wchar-subscripts \
+# -Wparentheses -pedantic-errors -Wuninitialized
+# -Wparentheses -pedantic -Wuninitialized
-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=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
-LDFLAGS=-g $(LIBS) $(EXTRA_LIBS)
+CFLAGS+= $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
+LDFLAGS+= $(LIBS) $(EXTRA_LIBS)
##
# 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/DEINSTALL
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.2 2004/04/12 10:02:33 xsa Exp $
# $OpenBSD: DEINSTALL,v 1.3 2004/07/09 21:16:27 naddy Exp $
#
# De-installation setup of ion

18
x11/ion/pkg/INSTALL
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.2 2002/04/26 03:35:34 pvalchev Exp $
# $OpenBSD: INSTALL,v 1.3 2004/07/09 21:16:27 naddy Exp $
#
# Pre/post-installation setup of ion
@ -9,7 +9,6 @@ set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=${SYSCONFDIR}/ion
CONFIG_FILE=$CONFIG_DIR/ion.conf
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/ion
# Function: tell the user what they need to do to use the port just installed
@ -18,8 +17,8 @@ do_notice()
{
echo
echo "+---------------"
echo "| The existing $1 configuration file, ${CONFIG_FILE},"
echo "| has NOT been changed. You may want to compare it to the"
echo "| The existing $1 configuration files in ${CONFIG_DIR}"
echo "| have NOT been changed. You may want to compare it to the"
echo "| current sample files in ${SAMPLE_CONFIG_DIR}"
echo "| and update your configuration as needed."
echo "+---------------"
@ -30,13 +29,12 @@ do_notice()
#
do_install()
{
install -o root -g wheel -d ${CONFIG_DIR}
install -o root -g wheel ${SAMPLE_CONFIG_DIR}/sample.conf ${CONFIG_FILE}
perl -i -pe "s#(include\\s+\")([^\"]*\")#\$1$SAMPLE_CONFIG_DIR/\$2#" ${CONFIG_FILE}
install -o root -g wheel -m 0755 -d ${CONFIG_DIR}
install -o root -g wheel ${SAMPLE_CONFIG_DIR}/* ${CONFIG_DIR}
echo
echo "+---------------"
echo "| The $1 configuration file, ${CONFIG_FILE},"
echo "| has been installed. Please view this file and change"
echo "| The $1 configuration files have been installed in"
echo "| ${CONFIG_DIR}. Please view this files and change"
echo "| the configuration to meet your needs."
echo "+---------------"
echo
@ -56,7 +54,7 @@ case $2 in
: nothing to pre-install for this port
;;
POST-INSTALL)
if [ -f ${CONFIG_FILE} ]; then
if [ -d ${CONFIG_DIR} ]; then
do_notice "$1"
else
do_install "$1"

7
x11/ion/pkg/PFRAG.shared Normal file
View File

@ -0,0 +1,7 @@
@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

75
x11/ion/pkg/PLIST
View File

@ -1,21 +1,62 @@
@comment $OpenBSD: PLIST,v 1.3 2004/04/12 10:02:33 xsa Exp $
@comment $OpenBSD: PLIST,v 1.4 2004/07/09 21:16:27 naddy Exp $
bin/ion
bin/ion-edit
bin/ion-man
bin/ion-runinxterm
bin/ion-ssh
bin/ion-view
man/man1/ion.1x
share/doc/ion/config.txt
share/doc/ion/functions.txt
share/examples/ion/bindings-default.conf
share/examples/ion/bindings-sun.conf
share/examples/ion/kludges.conf
share/examples/ion/look-brownsteel.conf
share/examples/ion/look-greyviolet.conf
share/examples/ion/look-simpleblue.conf
share/examples/ion/look-wheat.conf
share/examples/ion/sample.conf
bin/pwm
lib/ion/de.la
lib/ion/dock.la
lib/ion/floatws.la
lib/ion/ion-completefile
lib/ion/ionws.la
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.la
lib/ion/query.la
man/man1/ion.1
man/man1/pwm.1
share/doc/ion/ChangeLog
share/doc/ion/LICENSE
share/doc/ion/README
share/examples/ion/dock-draw.lua
share/examples/ion/dock.lua
share/examples/ion/draw.lua
share/examples/ion/floatws.lua
share/examples/ion/ion-bindings.lua
share/examples/ion/ion-menus.lua
share/examples/ion/ion.lua
share/examples/ion/ionws.lua
share/examples/ion/kludges.lua
share/examples/ion/look-brownsteel.lua
share/examples/ion/look-clean.lua
share/examples/ion/look-cleanios.lua
share/examples/ion/look-cleanviolet.lua
share/examples/ion/look-dusky.lua
share/examples/ion/look-greyviolet.lua
share/examples/ion/look-ios.lua
share/examples/ion/look-simpleblue.lua
share/examples/ion/look-wheat2.lua
share/examples/ion/menu.lua
share/examples/ion/pwm-bindings.lua
share/examples/ion/pwm-menus.lua
share/examples/ion/pwm.lua
share/examples/ion/query.lua
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
%%SHARED%%
@dirrm share/ion
@dirrm share/examples/ion
@dirrm share/doc/ion
@dirrm lib/ion/lc
@dirrm lib/ion
@extraunexec rm -rf ${SYSCONFDIR}/ion