aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--x11/wdm/Makefile16
-rw-r--r--x11/wdm/distinfo2
-rw-r--r--x11/wdm/files/patch-ab30
-rw-r--r--x11/wdm/pkg-plist5
4 files changed, 29 insertions, 24 deletions
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index dcf209762fe4..56eb4dd2d391 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,11 +1,11 @@
# New ports collection makefile for: wdm
-# Version required: 0.11
+# Version required: 0.90
# Date created: August 31, 1998
# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.1.1.1 1998/09/04 07:17:26 tg Exp $
+# $Id: Makefile,v 1.2 1998/09/07 06:57:08 tg Exp $
-DISTNAME= wdm-0.11
+DISTNAME= wdm-0.90
CATEGORIES= x11
MASTER_SITES= ftp://ftp.windowmaker.org/pub/contrib/srcs/utils/ \
ftp://ftp.io.com/pub/mirror/windowmaker/contrib/srcs/utils/ \
@@ -15,6 +15,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DAEMONPIC}
MAINTAINER= ports@FreeBSD.ORG
LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+ gif\\.3\\.:${PORTSDIR}/graphics/giflib \
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
png\\.2\\.:${PORTSDIR}/graphics/png \
tiff34\\.1:${PORTSDIR}/graphics/tiff34 \
@@ -25,12 +26,13 @@ DIST_SUBDIR= wdm
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= X11BASE=${X11BASE} CPPFLAGS=-I${PREFIX}/include
-CONFIGURE_ARGS= --with-gfx-libs="-L${PREFIX}/lib -L${LOCALBASE}/lib" \
+CONFIGURE_ARGS= --with-gfx-libs="-L${PREFIX}/lib -L${LOCALBASE}/lib -lgif" \
--with-gfx-incs="-I${LOCALBASE}/include/tiff34 -I${LOCALBASE}/include" \
--with-logdir=/var/log --with-runlockdir=/var/run \
- --with-WDMDIR=${PREFIX}/lib/X11/wdm \
- --with-DEFUSERPATH=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin:${LOCALBASE}/bin \
- --with-DEFSYSTEMPATH=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin
+ --with-wdmdir=${PREFIX}/lib/X11/wdm --with-Logo=Earth200x130.xpm \
+ --with-defuserpath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin:${LOCALBASE}/bin \
+ --with-defsystempath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin \
+ --with-wmlist=wmaker:afterstep:ctwm:enlightenment:fvwm:fvwm2:fvwm95:olvwm:qvwm:tvtwm
MAN1= wdm.1 wdmLogin.1
diff --git a/x11/wdm/distinfo b/x11/wdm/distinfo
index 8735eecb487a..d9e50f2d4131 100644
--- a/x11/wdm/distinfo
+++ b/x11/wdm/distinfo
@@ -1,2 +1,2 @@
-MD5 (wdm/wdm-0.11.tar.gz) = 3975cbb775bac15612eb282c0ed123fe
+MD5 (wdm/wdm-0.90.tar.gz) = 0ca8e8e9305410cf68b2074aedeab7f9
MD5 (wdm/daemon1-HQ-1280x960.jpg) = b38f175cf6b7167484afac423837ed1a
diff --git a/x11/wdm/files/patch-ab b/x11/wdm/files/patch-ab
index 6fdf1fd9f62d..86ac2c0e5a70 100644
--- a/x11/wdm/files/patch-ab
+++ b/x11/wdm/files/patch-ab
@@ -1,18 +1,16 @@
---- src/config/wdm-config.in.orig Wed Aug 19 19:20:59 1998
-+++ src/config/wdm-config.in Thu Sep 3 18:54:01 1998
-@@ -21,12 +21,11 @@
- DisplayManager*session: #configdir#/Xsession
- DisplayManager*authComplain: false
- DisplayManager*wdmLogin: #bindir#/wdmLogin
+--- src/config/wdm-config.in.orig Sun Aug 30 17:15:53 1998
++++ src/config/wdm-config.in Fri Sep 11 09:22:53 1998
+@@ -25,11 +25,12 @@
+ ! display screen background--if not set or set to none, then the
+ ! background is not set by wdm.
+ ! DisplayManager*wdmBg: none
-DisplayManager*wdmBg: solid:RoyalBlue
-+DisplayManager*wdmBg: pixmap:#configdir#/pixmaps/daemon1-HQ-1280x960.jpg
++! DisplayManager*wdmBg: solid:RoyalBlue
! DisplayManager*wdmBg: dgradient:RoyalBlue,FireBrick,Black
--! DisplayManager*wdmLogo: #configdir#/pixmaps/Eagle.xpm
--DisplayManager*wdmWm: wmaker:afterstep
-+DisplayManager*wdmLogo: #configdir#/pixmaps/Earth200x130.xpm
-+DisplayManager*wdmWm: wmaker:afterstep:ctwm:enlightenment:fvwm:fvwm2:fvwm95:olvwm:qvwm:tvtwm
- DisplayManager*wdmReboot: #SHUTDOWN# -t3 -r now
- DisplayManager*wdmHalt: #SHUTDOWN# -t3 -h now
- DisplayManager*wdmVerify: true
- DisplayManager*wdmRoot: false
--
+ ! DisplayManager*wdmBg: hgradient:RoyalBlue,FireBrick,Black
+ ! DisplayManager*wdmBg: vgradient:RoyalBlue,FireBrick,Black
+ ! DisplayManager*wdmBg: pixmap:#configdir#/pixmaps/Stars.jpg
++DisplayManager*wdmBg: pixmap:#configdir#/pixmaps/daemon1-HQ-1280x960.jpg
+ !
+ ! optional pixmap for logo
+ #pixmapcomment#DisplayManager*wdmLogo: #configdir#/pixmaps/#pixmapfile#
diff --git a/x11/wdm/pkg-plist b/x11/wdm/pkg-plist
index fc824e7cdc44..967dfb3620f8 100644
--- a/x11/wdm/pkg-plist
+++ b/x11/wdm/pkg-plist
@@ -4,11 +4,14 @@ lib/X11/wdm/GiveConsole
lib/X11/wdm/TakeConsole
lib/X11/wdm/Xaccess
lib/X11/wdm/Xclients
+lib/X11/wdm/Xclients.in
lib/X11/wdm/Xresources
lib/X11/wdm/Xservers
lib/X11/wdm/Xservers.fs
lib/X11/wdm/Xservers.ws
lib/X11/wdm/Xsession
+lib/X11/wdm/Xsession.XFree86
+lib/X11/wdm/Xsession.in
lib/X11/wdm/Xsetup_0
lib/X11/wdm/pixmaps/Eagle.xpm
lib/X11/wdm/pixmaps/Earth.jpg
@@ -20,6 +23,8 @@ lib/X11/wdm/pixmaps/StarsLogo.jpg
lib/X11/wdm/pixmaps/daemon1-HQ-1280x960.jpg
lib/X11/wdm/pixmaps/gnuLogo.xpm
lib/X11/wdm/wdm-config
+lib/X11/wdm/wdm-config.in
+lib/X11/wdm/wdmReconfig
@dirrm lib/X11/wdm/pixmaps
@unexec rmdir %D/lib/X11/wdm/authdir/authfiles 2>/dev/null || true
@dirrm lib/X11/wdm/authdir