5 files changed, 84 insertions, 15 deletions

diff --git a/x11-wm/scwm/Makefile b/x11-wm/scwm/Makefile
index 161b02db86b4..17b16a7033be 100644
--- a/x11-wm/scwm/Makefile
+++ b/x11-wm/scwm/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   scwm
-# Version required:    0.8a
+# Version required:    0.9
 # Date created:        26 December 1997
 # Whom:                Yukihiro Nakai <nacai@iname.com>
 #
-# $Id: Makefile,v 1.1.1.1 1999/04/03 01:12:14 steve Exp $
+# $Id: Makefile,v 1.2 1999/04/03 02:47:24 taoka Exp $
 #
 
-DISTNAME=	scwm-0.8a
+DISTNAME=	scwm-0.9
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://huis-clos.mit.edu/pub/scwm/
 
@@ -18,18 +18,15 @@ RUN_DEPENDS=	${X11BASE}/include/X11/pixmaps/Animator.xpm:${PORTSDIR}/graphics/sc
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-guile-prefix=${LOCALBASE}
-#CONFIGURE_ARGS+=	--enable-multibyte=yes
+.if defined(MULTIBYTE)
+CONFIGURE_ARGS+=	--enable-multibyte=yes
+CONFIGURE_ENV+= LIBS="-lxpg4"
+.endif
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
 MAN1=		scwm.1 scwmexec.1 scwmrepl.1
 
-pre-patch:
-.if defined(I18N)
-	${CP} ${FILESDIR}/patch-ab ${PATCHDIR}
-	${CP} ${FILESDIR}/patch-ac ${PATCHDIR}
-.endif
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/sample.scwmrc/*.scwmrc \
 			${PREFIX}/lib/X11/scwm
diff --git a/x11-wm/scwm/distinfo b/x11-wm/scwm/distinfo
index 112a67cc6fac..c375cc572ea5 100644
--- a/x11-wm/scwm/distinfo
+++ b/x11-wm/scwm/distinfo
@@ -1 +1 @@
-MD5 (scwm-0.8a.tar.gz) = 229f594f4d6c552579ca4cef2a5b398a
+MD5 (scwm-0.9.tar.gz) = 1551c6665e5ec3ce4cbceab650939ab6
diff --git a/x11-wm/scwm/files/patch-af b/x11-wm/scwm/files/patch-af
new file mode 100644
index 000000000000..a1a35b36e4e3
--- /dev/null
+++ b/x11-wm/scwm/files/patch-af
@@ -0,0 +1,11 @@
+--- utilities/Makefile.in.orig	Wed Apr  7 07:54:19 1999
++++ utilities/Makefile.in	Wed Apr  7 07:54:27 1999
+@@ -105,7 +105,7 @@
+ x_ldflags = @x_ldflags@
+ x_libs = @x_libs@
+ 
+-SUBDIRS = dev emacs libscwmexec scwmexec scwmrepl 
++SUBDIRS = dev libscwmexec scwmexec scwmrepl 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../include/config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/x11-wm/scwm/pkg-descr b/x11-wm/scwm/pkg-descr
index a3551adca515..66df1ba2b164 100644
--- a/x11-wm/scwm/pkg-descr
+++ b/x11-wm/scwm/pkg-descr
@@ -1,4 +1,14 @@
 scheme configurable window manager
 
-For I18N users,
-do make install -DI18N instead of only make install.
+- For MULTI-BYTE users,
+  do make install -DMULTIBYTE instead of only make install.
+  It also enable I18N option in scwm.
+
+- If you want edit scwmrc file efficiently, you may use
+  emacs lisp mode. There is scwm.el in scwm, but please
+  copy it into your favorite emacs lisp directory manually.
+  Refer:
+  patches/patch-af
+  ${WORKDIR}/utilities/emacs
+  ${WORKDIR}/configure --help
+  
diff --git a/x11-wm/scwm/pkg-plist b/x11-wm/scwm/pkg-plist
index 3a672138fb07..5d1cfcfd3970 100644
--- a/x11-wm/scwm/pkg-plist
+++ b/x11-wm/scwm/pkg-plist
@@ -9,40 +9,91 @@ info/scwm.info
 lib/X11/scwm/decor.scwmrc
 lib/X11/scwm/gjb.scwmrc
 lib/X11/scwm/juhp.scwmrc
-lib/X11/scwm/robbe.scwmrc
 lib/X11/scwm/sds.scwmrc
 lib/X11/scwm/system.scwmrc
 lib/libscwmexec.a
 lib/libscwmexec.la
 lib/libscwmexec.so
 lib/libscwmexec.so.0
+lib/scwm-modules/app/scwm/libbackground.a
+lib/scwm-modules/app/scwm/libbackground.la
+lib/scwm-modules/app/scwm/libbackground.so
+lib/scwm-modules/app/scwm/libbackground.so.0
+lib/scwm-modules/app/scwm/libc-animation.a
+lib/scwm-modules/app/scwm/libc-animation.la
+lib/scwm-modules/app/scwm/libc-animation.so
+lib/scwm-modules/app/scwm/libc-animation.so.0
+lib/scwm-modules/app/scwm/liboverlay-plane.a
+lib/scwm-modules/app/scwm/liboverlay-plane.la
+lib/scwm-modules/app/scwm/liboverlay-plane.so
+lib/scwm-modules/app/scwm/liboverlay-plane.so.0
+lib/scwm-modules/app/scwm/libpie-menus.a
+lib/scwm-modules/app/scwm/libpie-menus.la
+lib/scwm-modules/app/scwm/libpie-menus.so
+lib/scwm-modules/app/scwm/libpie-menus.so.0
+lib/scwm-modules/app/scwm/libxpm-menus.a
+lib/scwm-modules/app/scwm/libxpm-menus.la
+lib/scwm-modules/app/scwm/libxpm-menus.so
+lib/scwm-modules/app/scwm/libxpm-menus.so.0
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+man/man1/scwm.1.gz
+man/man1/scwmexec.1.gz
+man/man1/scwmrepl.1.gz
+share/scwm-modules/app/scwm/advice.scm
+share/scwm-modules/app/scwm/animation.scm
 share/scwm-modules/app/scwm/auto-raise.scm
 share/scwm-modules/app/scwm/base.scm
 share/scwm-modules/app/scwm/bincomm.scm
+share/scwm-modules/app/scwm/cached-program-exists.scm
+share/scwm-modules/app/scwm/cascade.scm
 share/scwm-modules/app/scwm/decor.scm
+share/scwm-modules/app/scwm/desk-background.scm
 share/scwm-modules/app/scwm/doc.scm
 share/scwm-modules/app/scwm/face.scm
+share/scwm-modules/app/scwm/file.scm
 share/scwm-modules/app/scwm/flux.scm
 share/scwm-modules/app/scwm/fvwm-compat.scm
 share/scwm-modules/app/scwm/fvwm-eval.scm
 share/scwm-modules/app/scwm/fvwm-module.scm
 share/scwm-modules/app/scwm/image-loaders.scm
+share/scwm-modules/app/scwm/listops.scm
+share/scwm-modules/app/scwm/message-window.scm
+share/scwm-modules/app/scwm/minimal.scm
 share/scwm-modules/app/scwm/module-types.scm
 share/scwm-modules/app/scwm/optargs.scm
+share/scwm-modules/app/scwm/placement.scm
 share/scwm-modules/app/scwm/prefs-menu.scm
+share/scwm-modules/app/scwm/report-usage.scm
+share/scwm-modules/app/scwm/shutdown-opts.scm
+share/scwm-modules/app/scwm/sort.scm
+share/scwm-modules/app/scwm/stacking.scm
 share/scwm-modules/app/scwm/std-menus.scm
 share/scwm-modules/app/scwm/style-options.scm
 share/scwm-modules/app/scwm/style.scm
+share/scwm-modules/app/scwm/theme-impl.scm
+share/scwm-modules/app/scwm/themes.scm
+share/scwm-modules/app/scwm/tile.scm
+share/scwm-modules/app/scwm/user-options.scm
+share/scwm-modules/app/scwm/virtual.scm
 share/scwm-modules/app/scwm/wininfo.scm
 share/scwm-modules/app/scwm/winlist.scm
 share/scwm-modules/app/scwm/winops.scm
 share/scwm-modules/app/scwm/wmconfig-menu.scm
+share/scwm-themes/fvwm2.tar.gz
+share/scwm-themes/mwm.tar.gz
+share/scwm-themes/win95.tar.gz
+share/scwm/scwm-concepts.txt
+share/scwm/scwm-hooks.txt
 share/scwm/scwm-procedures.txt
+share/scwm/scwm-variables.txt
 share/scwm/scwm.sgml
 @dirrm lib/X11/scwm
+@dirrm lib/scwm-modules/app/scwm
+@dirrm lib/scwm-modules/app
+@dirrm lib/scwm-modules
+@dirrm share/scwm
 @dirrm share/scwm-modules/app/scwm
 @dirrm share/scwm-modules/app
 @dirrm share/scwm-modules
-@dirrm share/scwm
+@dirrm share/scwm-themes