From owner-freebsd-ports Wed Apr 7 1:22: 3 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id BFBC3155FF for ; Wed, 7 Apr 1999 01:21:59 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id BAA81535; Wed, 7 Apr 1999 01:20:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id CF130155FF; Wed, 7 Apr 1999 01:20:44 -0700 (PDT) Message-Id: <19990407082044.CF130155FF@hub.freebsd.org> Date: Wed, 7 Apr 1999 01:20:44 -0700 (PDT) From: nakai@internetsolutions.co.jp To: freebsd-gnats-submit@freebsd.org X-Send-Pr-Version: www-1.0 Subject: ports/10998: Fixed port: scwm Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 10998 >Category: ports >Synopsis: Fixed port: scwm >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Apr 7 01:20:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Yukihiro Nakai >Release: 3.1R >Organization: InternetSolutions, Inc. >Environment: 3.1R with the middle of March /usr/ports >Description: I fixed the scwm port to follow its latest version, maintain for the multibyte options and fix for /scwm.el. Please delete /scwm.el when you use the current version of scwm port... Yukihiro Nakai -------------- diff -ruN scwm.orig/Makefile scwm/Makefile --- scwm.orig/Makefile Wed Apr 7 07:05:19 1999 +++ scwm/Makefile Wed Apr 7 07:48:02 1999 @@ -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 # # $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,17 +18,14 @@ 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 \ diff -ruN scwm.orig/files/md5 scwm/files/md5 --- scwm.orig/files/md5 Wed Apr 7 07:05:19 1999 +++ scwm/files/md5 Wed Apr 7 07:06:57 1999 @@ -1 +1 @@ -MD5 (scwm-0.8a.tar.gz) = 229f594f4d6c552579ca4cef2a5b398a +MD5 (scwm-0.9.tar.gz) = 1551c6665e5ec3ce4cbceab650939ab6 diff -ruN scwm.orig/files/patch-ab scwm/files/patch-ab --- scwm.orig/files/patch-ab Wed Apr 7 07:05:19 1999 +++ scwm/files/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- acconfig.h.orig Sat Aug 29 18:46:57 1998 -+++ acconfig.h Sat Aug 29 18:47:11 1998 -@@ -91,7 +91,7 @@ - #undef HAVE_SETVBUF - - /* Define this if you want multibyte support. */ --#undef I18N -+#define I18N - - /* Define this and use C++ compiler if you want to use constraint solver */ - #undef USE_CASSOWARY diff -ruN scwm.orig/files/patch-ac scwm/files/patch-ac --- scwm.orig/files/patch-ac Wed Apr 7 07:05:19 1999 +++ scwm/files/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- scwm/Makefile.in.orig Sat Aug 29 18:54:54 1998 -+++ scwm/Makefile.in Sat Aug 29 18:55:17 1998 -@@ -148,7 +148,7 @@ - menu.h shutdown.h string_token.h syscompat.h system.h \ - util.h virtual.h window.h xmisc.h - --scwm_LDADD = @x_ldflags@ @XEXT_LIB@ @XMU_LIB@ @XPM_LIB@ \ -+scwm_LDADD = -lxpg4 @x_ldflags@ @XEXT_LIB@ @XMU_LIB@ @XPM_LIB@ \ - @x_libs@ @GUILE_LIBS@ @CASSOWARY_LIBS@ - - INCLUDES = @x_cflags@ @GUILE_INCLUDES@ @CASSOWARY_INCLUDES@ diff -ruN scwm.orig/patches/patch-af scwm/patches/patch-af --- scwm.orig/patches/patch-af Thu Jan 1 09:00:00 1970 +++ scwm/patches/patch-af Wed Apr 7 07:54:44 1999 @@ -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 -ruN scwm.orig/pkg/DESCR scwm/pkg/DESCR --- scwm.orig/pkg/DESCR Wed Apr 7 07:05:19 1999 +++ scwm/pkg/DESCR Wed Apr 7 07:57:55 1999 @@ -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 -ruN scwm.orig/pkg/PLIST scwm/pkg/PLIST --- scwm.orig/pkg/PLIST Wed Apr 7 07:05:19 1999 +++ scwm/pkg/PLIST Wed Apr 7 08:15:04 1999 @@ -9,40 +9,91 @@ 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 >How-To-Repeat: >Fix: >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message