summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1999-06-08 23:59:02 +0000
committerSteve Price <steve@FreeBSD.org>1999-06-08 23:59:02 +0000
commit9789b00d07d7978e869363ebe6bbdf5fda2ee3e7 (patch)
treef8a76a34aea739156d6e475487d0b869e93c1b78 /x11-wm
parentMake sure we pass CC and CXX in configure's environment so that (diff)
Update to version 0.9.41.
PR: 11861 Submitted by: Chris Piazza <cpiazza@home.net>
Notes
Notes: svn path=/head/; revision=19344
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/icewm/Makefile33
-rw-r--r--x11-wm/icewm/distinfo2
-rw-r--r--x11-wm/icewm/files/patch-ab29
-rw-r--r--x11-wm/icewm/files/patch-ai14
-rw-r--r--x11-wm/icewm/pkg-descr6
5 files changed, 35 insertions, 49 deletions
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 14fe9babed29..2461ae033cb5 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: icewm
-# Version required: 0.9.39
+# Version required: 0.9.41
# Date created: 10 August 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
-# $Id: Makefile,v 1.36 1999/05/16 23:20:18 mharo Exp $
+# $Id: Makefile,v 1.37 1999/06/07 01:57:36 steve Exp $
#
-DISTNAME= icewm-0.9.39
+DISTNAME= icewm-0.9.41
CATEGORIES= x11-wm
MASTER_SITES= http://www.kiss.uni-lj.si/~k4fr0235/icewm/devel/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/icewm/
@@ -19,39 +19,18 @@ LIB_DEPENDS= gnome.2:${PORTSDIR}/x11/gnomelibs
.endif
LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm
+GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-ICEOPTION= --with-shape
.if defined(USE_I18N)
-ICEOPTION+= --with-i18n
-.endif
-.if defined(XLOCALE)
-ICEOPTION+= --with-xlocale
-.endif
-.if defined(GNOME)
-ICEOPTION+= --with-imlib --with-gnome --with-sm
-.endif
-
-pre-patch:
-.if defined(TITLE_BOTTOM)
- @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-titlebottom
-.else
- @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-titletop
+CONFIGURE_ARGS+= --enable-i18n
.endif
.if defined(GNOME)
- @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-gnome
+ICEOPTION+= --with-imlib --with-gnome
.endif
-do-configure:
- ( cd ${WRKSRC}; env X11BASE="${X11BASE}" CXX="${CXX}" \
- CXXFLAGS="${CXXFLAGS}" \
- ${SH} config ${ICEOPTION} )
-
post-install:
${INSTALL_DATA} ${FILESDIR}/bsd-daemon.xpm ${PREFIX}/share/icewm/taskbar
- strip ${PREFIX}/bin/icewm
- strip ${PREFIX}/bin/icewmbg
- strip ${PREFIX}/bin/icewmhint
.include <bsd.port.mk>
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 45c233239c02..676a1c53cccc 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1 +1 @@
-MD5 (icewm-0.9.39.src.tar.gz) = 1a4d7bc60d6f6235d04a1c43bd739043
+MD5 (icewm-0.9.41.src.tar.gz) = 05eccadc612fe3bb8d2d769c89da8771
diff --git a/x11-wm/icewm/files/patch-ab b/x11-wm/icewm/files/patch-ab
index 04e01d2b3503..329d3a5d2403 100644
--- a/x11-wm/icewm/files/patch-ab
+++ b/x11-wm/icewm/files/patch-ab
@@ -1,17 +1,16 @@
---- install.inc.orig Sat Feb 20 08:33:06 1999
-+++ install.inc Mon May 3 15:44:56 1999
-@@ -1,10 +1,9 @@
--PREFIX = /usr/local
- BINDIR = $(PREFIX)/bin
--LIBDIR = $(PREFIX)/lib/X11/icewm
--ETCDIR = /etc/X11/icewm
-+LIBDIR = $(PREFIX)/share/icewm
-+ETCDIR = $(LIBDIR)
+--- install.in.orig Mon Jun 7 20:07:12 1999
++++ install.in Mon Jun 7 20:08:10 1999
+@@ -3,11 +3,11 @@
- INSTALL = install -c
--INSTALLDIR = $(INSTALL) -m 755 -d
--INSTALLBIN = $(INSTALL) -m 555
+ PREFIX = @prefix@
+ BINDIR = @bindir@
+-LIBDIR = @libdir@/X11/icewm
++LIBDIR = @prefix@/share/icewm
+ ETCDIR = @sysconfdir@
+
+ INSTALL = @INSTALL@
+-INSTALLDIR = @INSTALL@ -m 755 -d
+INSTALLDIR = mkdir -p
-+INSTALLBIN = $(INSTALL) $(STRIP) -m 555
- INSTALLLIB = $(INSTALL) -m 444
- #INSTALLETC = $(INSTALL) -m 644
+ INSTALLBIN = @INSTALL_PROGRAM@
+ INSTALLLIB = @INSTALL_DATA@
+ #INSTALLETC = @INSTALL_DATA@
diff --git a/x11-wm/icewm/files/patch-ai b/x11-wm/icewm/files/patch-ai
new file mode 100644
index 000000000000..aace03d5b209
--- /dev/null
+++ b/x11-wm/icewm/files/patch-ai
@@ -0,0 +1,14 @@
+--- src/wmtaskbar.cc.orig Sun May 23 00:57:11 1999
++++ src/wmtaskbar.cc Sun May 23 00:57:25 1999
+@@ -331,9 +331,9 @@
+
+ /** Use Linux 2.0 Penguin as start button */
+ #ifndef START_PIXMAP
+-#define START_PIXMAP "linux.xpm"
++//#define START_PIXMAP "linux.xpm"
+ //#define START_PIXMAP "debian.xpm"
+-//#define START_PIXMAP "bsd-daemon.xpm"
++#define START_PIXMAP "bsd-daemon.xpm"
+ //#define START_PIXMAP "start.xpm"
+ //#define START_PIXMAP "xfree86os2.xpm"
+ #endif
diff --git a/x11-wm/icewm/pkg-descr b/x11-wm/icewm/pkg-descr
index 02e867d8a6d5..eaeb0af44a0e 100644
--- a/x11-wm/icewm/pkg-descr
+++ b/x11-wm/icewm/pkg-descr
@@ -1,17 +1,11 @@
Window Manager designed for speed, usability and consistency.
-When you want titlebars to be bottom ( default is top ),
- % make -DTITLE_BOTTOM install
-
When you want gnome option,
% make -DGNOME install
When you want i18n option,
% make -DUSE_I18N install
-When you want to compile with xlocale option,
- % make -DXLOCALE install
-
'bsd-daemon.xpm' is from Steve Farrell.
WWW: http://www.kiss.uni-lj.si/~k4fr0235/icewm/