aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Walter <stefan@FreeBSD.org>2006-11-12 17:32:12 +0000
committerStefan Walter <stefan@FreeBSD.org>2006-11-12 17:32:12 +0000
commit7041a06d9f2dc98cbb1f7236e1e649dd30b69c48 (patch)
treeae82dd0fcd117263a94488ac11ea0a47ce41608e
parent1efa3fa64ae9929c79992f73ec6cef3e3890f752 (diff)
downloadports-7041a06d9f2dc98cbb1f7236e1e649dd30b69c48.tar.gz
ports-7041a06d9f2dc98cbb1f7236e1e649dd30b69c48.zip
Notes
Diffstat
-rw-r--r--x11-wm/ion-3/Makefile5
-rw-r--r--x11-wm/ion-3/distinfo6
-rw-r--r--x11-wm/ion-3/files/patch-system.mk29
-rw-r--r--x11-wm/ion-3/pkg-plist12
-rw-r--r--x11-wm/ion-3ds/Makefile5
-rw-r--r--x11-wm/ion-3ds/distinfo6
-rw-r--r--x11-wm/ion-3ds/files/patch-system.mk29
-rw-r--r--x11-wm/ion-3ds/pkg-plist12
8 files changed, 68 insertions, 36 deletions
diff --git a/x11-wm/ion-3/Makefile b/x11-wm/ion-3/Makefile
index c9c3ffef7b4b..d41d290864d6 100644
--- a/x11-wm/ion-3/Makefile
+++ b/x11-wm/ion-3/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= ion-3ds
-PORTVERSION= 20060524
+PORTVERSION= 20061029
CATEGORIES= x11-wm
MASTER_SITES= http://modeemi.fi/~tuomov/dl/
@@ -23,6 +23,9 @@ MAKE_ENV= DEFINES="${IONDEFINES}"
.if !defined(WITH_XINERAMA)
IONDEFINES+= -DCF_NO_XINERAMA
+.else
+IONDEFINES+= -DCF_XINERAMA
+MAKE_ENV+= XINERAMA_LIBS=-lXinerama
.endif
.if defined(WITHOUT_NLS)
diff --git a/x11-wm/ion-3/distinfo b/x11-wm/ion-3/distinfo
index b45cb765c5f1..d9804d760c64 100644
--- a/x11-wm/ion-3/distinfo
+++ b/x11-wm/ion-3/distinfo
@@ -1,3 +1,3 @@
-MD5 (ion-3ds-20060524.tar.gz) = f9dbab5a5150c9944d7c6ed9e24daef6
-SHA256 (ion-3ds-20060524.tar.gz) = 421c4c9297cef7b5d01aabc9713d5ac2931d0b3834a2578690e01f8dec3e8a9a
-SIZE (ion-3ds-20060524.tar.gz) = 620416
+MD5 (ion-3ds-20061029.tar.gz) = 245d045a3524adf9586625e0a50717dc
+SHA256 (ion-3ds-20061029.tar.gz) = a4414c7db188c1fa6f0a50ed2079b1045ae19d9674842b52b2e231b2b7d46c0e
+SIZE (ion-3ds-20061029.tar.gz) = 646591
diff --git a/x11-wm/ion-3/files/patch-system.mk b/x11-wm/ion-3/files/patch-system.mk
index 24bf426e3ea4..4a615f011041 100644
--- a/x11-wm/ion-3/files/patch-system.mk
+++ b/x11-wm/ion-3/files/patch-system.mk
@@ -1,5 +1,5 @@
---- ./system.mk.orig Wed May 24 13:23:51 2006
-+++ ./system.mk Mon Jul 17 18:15:24 2006
+--- system.mk.orig Thu Nov 2 20:15:51 2006
++++ system.mk Thu Nov 2 20:40:45 2006
@@ -7,7 +7,7 @@
## Installation paths
##
@@ -53,7 +53,26 @@
# SunOS/Solaris
#X11_PREFIX=/usr/openwin
-@@ -107,7 +107,7 @@
+@@ -82,8 +82,8 @@
+ X11_INCLUDES=-I$(X11_PREFIX)/include
+
+ # Change commenting to disable Xinerama support
+-XINERAMA_LIBS=-lXinerama
+-DEFINES += -DCF_XINERAMA
++#XINERAMA_LIBS=-lXinerama
++#DEFINES += -DCF_XINERAMA
+ # For Solaris
+ #XINERAMA_LIBS=
+ #DEFINES += -DCF_SUN_XINERAMA
+@@ -101,7 +101,6 @@
+ # on SunOS.
+ #DEFINES += -DCF_SUN_F1X_REMAP
+
+-
+ ##
+ ## libc
+ ##
+@@ -110,7 +109,7 @@
# 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.
@@ -62,7 +81,7 @@
# If you're on an archaic system (such as relatively recent *BSD releases)
-@@ -116,24 +116,24 @@
+@@ -119,24 +118,24 @@
#DEFINES += -DCF_NO_LOCALE
# On some other systems you may something like this:
@@ -93,7 +112,7 @@
EXPORT_DYNAMIC=-Xlinker --export-dynamic
# The following options are mainly for development use and can be used
-@@ -147,7 +147,7 @@
+@@ -150,7 +149,7 @@
#POSIX_SOURCE=-D_POSIX_SOURCE
# Most systems
diff --git a/x11-wm/ion-3/pkg-plist b/x11-wm/ion-3/pkg-plist
index 48eb5d6cbbe9..443dd5e8101d 100644
--- a/x11-wm/ion-3/pkg-plist
+++ b/x11-wm/ion-3/pkg-plist
@@ -1,18 +1,16 @@
bin/ion3
bin/pwm3
etc/ion3/cfg_dock.lua
-etc/ion3/cfg_floatws.lua
etc/ion3/cfg_ion.lua
etc/ion3/cfg_ioncore.lua
-etc/ion3/cfg_ionws.lua
etc/ion3/cfg_kludges.lua
etc/ion3/cfg_menu.lua
etc/ion3/cfg_modules.lua
-etc/ion3/cfg_panews.lua
etc/ion3/cfg_pwm.lua
etc/ion3/cfg_query.lua
etc/ion3/cfg_sp.lua
etc/ion3/cfg_statusbar.lua
+etc/ion3/cfg_tiling.lua
etc/ion3/look.lua
etc/ion3/look_brownsteel.lua
etc/ion3/look_clean.lua
@@ -37,30 +35,26 @@ 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/mod_tiling.lc
lib/ion3/lc/statusd_date.lc
lib/ion3/lc/statusd_load.lc
lib/ion3/lc/statusd_mail.lc
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
+lib/ion3/mod/mod_tiling.so
%%DOCSDIR%%/ChangeLog
%%DOCSDIR%%/LICENSE
%%DOCSDIR%%/README
diff --git a/x11-wm/ion-3ds/Makefile b/x11-wm/ion-3ds/Makefile
index c9c3ffef7b4b..d41d290864d6 100644
--- a/x11-wm/ion-3ds/Makefile
+++ b/x11-wm/ion-3ds/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= ion-3ds
-PORTVERSION= 20060524
+PORTVERSION= 20061029
CATEGORIES= x11-wm
MASTER_SITES= http://modeemi.fi/~tuomov/dl/
@@ -23,6 +23,9 @@ MAKE_ENV= DEFINES="${IONDEFINES}"
.if !defined(WITH_XINERAMA)
IONDEFINES+= -DCF_NO_XINERAMA
+.else
+IONDEFINES+= -DCF_XINERAMA
+MAKE_ENV+= XINERAMA_LIBS=-lXinerama
.endif
.if defined(WITHOUT_NLS)
diff --git a/x11-wm/ion-3ds/distinfo b/x11-wm/ion-3ds/distinfo
index b45cb765c5f1..d9804d760c64 100644
--- a/x11-wm/ion-3ds/distinfo
+++ b/x11-wm/ion-3ds/distinfo
@@ -1,3 +1,3 @@
-MD5 (ion-3ds-20060524.tar.gz) = f9dbab5a5150c9944d7c6ed9e24daef6
-SHA256 (ion-3ds-20060524.tar.gz) = 421c4c9297cef7b5d01aabc9713d5ac2931d0b3834a2578690e01f8dec3e8a9a
-SIZE (ion-3ds-20060524.tar.gz) = 620416
+MD5 (ion-3ds-20061029.tar.gz) = 245d045a3524adf9586625e0a50717dc
+SHA256 (ion-3ds-20061029.tar.gz) = a4414c7db188c1fa6f0a50ed2079b1045ae19d9674842b52b2e231b2b7d46c0e
+SIZE (ion-3ds-20061029.tar.gz) = 646591
diff --git a/x11-wm/ion-3ds/files/patch-system.mk b/x11-wm/ion-3ds/files/patch-system.mk
index 24bf426e3ea4..4a615f011041 100644
--- a/x11-wm/ion-3ds/files/patch-system.mk
+++ b/x11-wm/ion-3ds/files/patch-system.mk
@@ -1,5 +1,5 @@
---- ./system.mk.orig Wed May 24 13:23:51 2006
-+++ ./system.mk Mon Jul 17 18:15:24 2006
+--- system.mk.orig Thu Nov 2 20:15:51 2006
++++ system.mk Thu Nov 2 20:40:45 2006
@@ -7,7 +7,7 @@
## Installation paths
##
@@ -53,7 +53,26 @@
# SunOS/Solaris
#X11_PREFIX=/usr/openwin
-@@ -107,7 +107,7 @@
+@@ -82,8 +82,8 @@
+ X11_INCLUDES=-I$(X11_PREFIX)/include
+
+ # Change commenting to disable Xinerama support
+-XINERAMA_LIBS=-lXinerama
+-DEFINES += -DCF_XINERAMA
++#XINERAMA_LIBS=-lXinerama
++#DEFINES += -DCF_XINERAMA
+ # For Solaris
+ #XINERAMA_LIBS=
+ #DEFINES += -DCF_SUN_XINERAMA
+@@ -101,7 +101,6 @@
+ # on SunOS.
+ #DEFINES += -DCF_SUN_F1X_REMAP
+
+-
+ ##
+ ## libc
+ ##
+@@ -110,7 +109,7 @@
# 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.
@@ -62,7 +81,7 @@
# If you're on an archaic system (such as relatively recent *BSD releases)
-@@ -116,24 +116,24 @@
+@@ -119,24 +118,24 @@
#DEFINES += -DCF_NO_LOCALE
# On some other systems you may something like this:
@@ -93,7 +112,7 @@
EXPORT_DYNAMIC=-Xlinker --export-dynamic
# The following options are mainly for development use and can be used
-@@ -147,7 +147,7 @@
+@@ -150,7 +149,7 @@
#POSIX_SOURCE=-D_POSIX_SOURCE
# Most systems
diff --git a/x11-wm/ion-3ds/pkg-plist b/x11-wm/ion-3ds/pkg-plist
index 48eb5d6cbbe9..443dd5e8101d 100644
--- a/x11-wm/ion-3ds/pkg-plist
+++ b/x11-wm/ion-3ds/pkg-plist
@@ -1,18 +1,16 @@
bin/ion3
bin/pwm3
etc/ion3/cfg_dock.lua
-etc/ion3/cfg_floatws.lua
etc/ion3/cfg_ion.lua
etc/ion3/cfg_ioncore.lua
-etc/ion3/cfg_ionws.lua
etc/ion3/cfg_kludges.lua
etc/ion3/cfg_menu.lua
etc/ion3/cfg_modules.lua
-etc/ion3/cfg_panews.lua
etc/ion3/cfg_pwm.lua
etc/ion3/cfg_query.lua
etc/ion3/cfg_sp.lua
etc/ion3/cfg_statusbar.lua
+etc/ion3/cfg_tiling.lua
etc/ion3/look.lua
etc/ion3/look_brownsteel.lua
etc/ion3/look_clean.lua
@@ -37,30 +35,26 @@ 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/mod_tiling.lc
lib/ion3/lc/statusd_date.lc
lib/ion3/lc/statusd_load.lc
lib/ion3/lc/statusd_mail.lc
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
+lib/ion3/mod/mod_tiling.so
%%DOCSDIR%%/ChangeLog
%%DOCSDIR%%/LICENSE
%%DOCSDIR%%/README
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 07:27:46 +0000