From 0912ba6e802089cf8edbc68a20dfd8715e4c016a Mon Sep 17 00:00:00 2001 From: Yukihiro Nakai Date: Wed, 6 Oct 1999 04:56:11 +0000 Subject: Update to 0.99.3 --- x11-wm/scwm/Makefile | 26 ++-- x11-wm/scwm/distinfo | 2 +- x11-wm/scwm/files/patch-aa | 19 +-- x11-wm/scwm/files/patch-af | 23 ++-- x11-wm/scwm/pkg-descr | 2 + x11-wm/scwm/pkg-plist | 300 +++++++++++++++++++++++++++++++++------------ 6 files changed, 260 insertions(+), 112 deletions(-) (limited to 'x11-wm') diff --git a/x11-wm/scwm/Makefile b/x11-wm/scwm/Makefile index 01d0e726cf1e..f5156bd438d1 100644 --- a/x11-wm/scwm/Makefile +++ b/x11-wm/scwm/Makefile @@ -1,34 +1,38 @@ # New ports collection makefile for: scwm -# Version required: 0.9 +# Version required: 0.99.3 # Date created: 26 December 1997 # Whom: Yukihiro Nakai # # $FreeBSD$ # -DISTNAME= scwm-0.9 +DISTNAME= scwm-0.99.3 CATEGORIES= x11-wm -MASTER_SITES= ftp://huis-clos.mit.edu/pub/scwm/ +MASTER_SITES= ftp://scwm.mit.edu/pub/scwm/ -MAINTAINER= nacai@iname.com +MAINTAINER= nakai@FreeBSD.org LIB_DEPENDS= guile.4:${PORTSDIR}/lang/guile \ - Xpm.4:${PORTSDIR}/graphics/xpm -RUN_DEPENDS= ${X11BASE}/include/X11/pixmaps/Animator.xpm:${PORTSDIR}/graphics/scwm-icons + Imlib.4:${PORTSDIR}/graphics/imlib +RUN_DEPENDS= ${X11BASE}/share/scwm/pixmaps/Animator.xpm:${PORTSDIR}/graphics/scwm-icons + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-guile-prefix=${LOCALBASE} +CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" \ + GLIB_CONFIG="${GLIB_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" + .if defined(MULTIBYTE) CONFIGURE_ARGS+= --enable-multibyte=yes -CONFIGURE_ENV+= LIBS="-lxpg4" +CONFIGURE_ENV+= LIBS="-L${X11BASE}/lib -lxpg4" .endif USE_GMAKE= yes USE_X_PREFIX= yes MAN1= scwm.1 scwmexec.1 scwmrepl.1 -post-install: - ${INSTALL_DATA} ${WRKSRC}/sample.scwmrc/*.scwmrc \ - ${PREFIX}/lib/X11/scwm - .include diff --git a/x11-wm/scwm/distinfo b/x11-wm/scwm/distinfo index c375cc572ea5..8c3ff5b4b29e 100644 --- a/x11-wm/scwm/distinfo +++ b/x11-wm/scwm/distinfo @@ -1 +1 @@ -MD5 (scwm-0.9.tar.gz) = 1551c6665e5ec3ce4cbceab650939ab6 +MD5 (scwm-0.99.3.tar.gz) = 2664725dcdc9ba1136ed53aa7fa21956 diff --git a/x11-wm/scwm/files/patch-aa b/x11-wm/scwm/files/patch-aa index 6c4894e17f28..65c633158305 100644 --- a/x11-wm/scwm/files/patch-aa +++ b/x11-wm/scwm/files/patch-aa @@ -1,24 +1,15 @@ ---- configure.orig Fri Aug 14 18:42:57 1998 -+++ configure Fri Apr 2 16:08:39 1999 -@@ -80,6 +80,8 @@ - # Initialize some other variables. - subdirs= - MFLAGS= MAKEFLAGS= -+CFLAGS=-I/usr/local/include -+LDFLAGS=-L/usr/local/lib - # Maximum number of lines to put in a shell here document. - ac_max_here_lines=12 - -@@ -3257,7 +3259,7 @@ +--- configure.orig Wed Sep 15 06:33:59 1999 ++++ configure Mon Sep 27 10:43:27 1999 +@@ -5045,7 +5045,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lguile $GUILE_LIBS_PRE $GUILE_LIBS $LIBS" +LIBS="-lguile -lreadline $GUILE_LIBS_PRE $GUILE_LIBS $LIBS" cat > conftest.$ac_ext <&6 diff --git a/x11-wm/scwm/files/patch-af b/x11-wm/scwm/files/patch-af index a1a35b36e4e3..94d26c0b6c87 100644 --- a/x11-wm/scwm/files/patch-af +++ b/x11-wm/scwm/files/patch-af @@ -1,11 +1,20 @@ ---- 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@ +--- utilities/Makefile.in.orig Wed Sep 15 08:50:28 1999 ++++ utilities/Makefile.in Mon Sep 27 10:46:22 1999 +@@ -129,7 +129,7 @@ + @DL_SUPPORT_TRUE@PIDPROPERTY_SUBDIR = pidproperty + @DL_SUPPORT_FALSE@PIDPROPERTY_SUBDIR = --SUBDIRS = dev emacs libscwmexec scwmexec scwmrepl -+SUBDIRS = dev libscwmexec scwmexec scwmrepl +-SUBDIRS = dev emacs libscwmexec scwmexec scwmrepl run-renamed misc $(PIDPROPERTY_SUBDIR) ++SUBDIRS = dev libscwmexec scwmexec scwmrepl run-renamed misc $(PIDPROPERTY_SUBDIR) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../include/config.h CONFIG_CLEAN_FILES = +@@ -140,7 +140,7 @@ + + TAR = gtar + GZIP_ENV = --best +-DIST_SUBDIRS = dev emacs libscwmexec scwmexec scwmrepl run-renamed misc \ ++DIST_SUBDIRS = dev libscwmexec scwmexec scwmrepl run-renamed misc \ + pidproperty + all: all-redirect + .SUFFIXES: diff --git a/x11-wm/scwm/pkg-descr b/x11-wm/scwm/pkg-descr index a2b2ffaf1757..5935a210c310 100644 --- a/x11-wm/scwm/pkg-descr +++ b/x11-wm/scwm/pkg-descr @@ -11,3 +11,5 @@ scheme configurable window manager patches/patch-af ${WORKDIR}/utilities/emacs ${WORKDIR}/configure --help + +SCWM Home Page: http://scwm.mit.edu/ diff --git a/x11-wm/scwm/pkg-plist b/x11-wm/scwm/pkg-plist index bca9285243e3..bff2569ef6f9 100644 --- a/x11-wm/scwm/pkg-plist +++ b/x11-wm/scwm/pkg-plist @@ -1,95 +1,237 @@ +bin/cpp-sed-nl +bin/run-renamed bin/scwm +bin/scwm-conf bin/scwmexec bin/scwmrepl +bin/startscwm include/scwmexec.h -@unexec install-info --delete %D/info/scwm.info %D/info/dir info/scwm.info -@exec install-info %D/info/scwm.info %D/info/dir -lib/X11/scwm/decor.scwmrc -lib/X11/scwm/gjb.scwmrc -lib/X11/scwm/juhp.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 +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/libesdsound.a +lib/scwm/modules/app/scwm/libesdsound.la +lib/scwm/modules/app/scwm/libesdsound.so +lib/scwm/modules/app/scwm/libesdsound.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/libscwmgtkhelper.a +lib/scwm/modules/app/scwm/libscwmgtkhelper.la +lib/scwm/modules/app/scwm/libscwmgtkhelper.so +lib/scwm/modules/app/scwm/libscwmgtkhelper.so.0 +lib/scwm/modules/app/scwm/libscwmxtest.a +lib/scwm/modules/app/scwm/libscwmxtest.la +lib/scwm/modules/app/scwm/libscwmxtest.so +lib/scwm/modules/app/scwm/libscwmxtest.so.0 +lib/scwm/modules/app/scwm/libxlib-drawing.a +lib/scwm/modules/app/scwm/libxlib-drawing.la +lib/scwm/modules/app/scwm/libxlib-drawing.so +lib/scwm/modules/app/scwm/libxlib-drawing.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 -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 +man/man1/scwm.1.gz +man/man1/scwmexec.1.gz +man/man1/scwmrepl.1.gz +share/scwm/Xmodmap-win95keyboard +share/scwm/Xresources-cpp +share/scwm/Xsession +share/scwm/Xsession.patch +share/scwm/gnome-session-Scwm +share/scwm/modules/app/scwm/ScwmBiff.scm +share/scwm/modules/app/scwm/ScwmButtons.scm +share/scwm/modules/app/scwm/ScwmClock.scm +share/scwm/modules/app/scwm/ScwmDeskButtons.scm +share/scwm/modules/app/scwm/advice.scm +share/scwm/modules/app/scwm/animated-edge-moves.scm +share/scwm/modules/app/scwm/animated-iconify.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/cascade.scm +share/scwm/modules/app/scwm/constraints.scm +share/scwm/modules/app/scwm/decor.scm +share/scwm/modules/app/scwm/defoption.scm +share/scwm/modules/app/scwm/desk-background.scm +share/scwm/modules/app/scwm/dir-focus.scm +share/scwm/modules/app/scwm/doc.scm +share/scwm/modules/app/scwm/edge-ops.scm +share/scwm/modules/app/scwm/face.scm +share/scwm/modules/app/scwm/file.scm +share/scwm/modules/app/scwm/flash-window.scm +share/scwm/modules/app/scwm/flux-gtk.scm +share/scwm/modules/app/scwm/flux.scm +share/scwm/modules/app/scwm/focus-titlebar.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/gnome-hints.scm +share/scwm/modules/app/scwm/group.scm +share/scwm/modules/app/scwm/gtk-menu.scm +share/scwm/modules/app/scwm/gtk.scm +share/scwm/modules/app/scwm/highlight-current-window.scm +share/scwm/modules/app/scwm/hooks.scm +share/scwm/modules/app/scwm/hover-focus.scm +share/scwm/modules/app/scwm/image-loaders.scm +share/scwm/modules/app/scwm/image-path-suggestor.scm +share/scwm/modules/app/scwm/kde-hints.scm +share/scwm/modules/app/scwm/key-mover-xtest.scm +share/scwm/modules/app/scwm/key-mover.scm +share/scwm/modules/app/scwm/listops.scm +share/scwm/modules/app/scwm/menus-extras.scm +share/scwm/modules/app/scwm/message-window.scm +share/scwm/modules/app/scwm/minimal.scm +share/scwm/modules/app/scwm/modifier-key-bindings.scm +share/scwm/modules/app/scwm/module-types.scm +share/scwm/modules/app/scwm/netscape.scm +share/scwm/modules/app/scwm/nonants.scm +share/scwm/modules/app/scwm/number-convert.scm +share/scwm/modules/app/scwm/optargs.scm +share/scwm/modules/app/scwm/path-cache.scm +share/scwm/modules/app/scwm/placement.scm +share/scwm/modules/app/scwm/preferences.scm +share/scwm/modules/app/scwm/prefs-menu.scm +share/scwm/modules/app/scwm/primopts.scm +share/scwm/modules/app/scwm/prompt-binding.scm +share/scwm/modules/app/scwm/prompt-bool.scm +share/scwm/modules/app/scwm/prompt-color.scm +share/scwm/modules/app/scwm/prompt-enum.scm +share/scwm/modules/app/scwm/prompt-file.scm +share/scwm/modules/app/scwm/prompt-font.scm +share/scwm/modules/app/scwm/prompt-proc.scm +share/scwm/modules/app/scwm/prompt-range.scm +share/scwm/modules/app/scwm/prompt-string.scm +share/scwm/modules/app/scwm/prompting-shell.scm +share/scwm/modules/app/scwm/property-respond.scm +share/scwm/modules/app/scwm/quote.scm +share/scwm/modules/app/scwm/reflection.scm +share/scwm/modules/app/scwm/register.scm +share/scwm/modules/app/scwm/report-usage.scm +share/scwm/modules/app/scwm/rgb-database.scm +share/scwm/modules/app/scwm/send-string.scm +share/scwm/modules/app/scwm/shutdown-opts.scm +share/scwm/modules/app/scwm/simple-constraints.scm +share/scwm/modules/app/scwm/simplebiff.scm +share/scwm/modules/app/scwm/snap.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/stringops.scm +share/scwm/modules/app/scwm/style-options.scm +share/scwm/modules/app/scwm/style.scm +share/scwm/modules/app/scwm/stylist.scm +share/scwm/modules/app/scwm/test-case.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/time-convert.scm +share/scwm/modules/app/scwm/ui-constraints-buttons.scm +share/scwm/modules/app/scwm/ui-constraints-classes.scm +share/scwm/modules/app/scwm/ui-constraints-composition.scm +share/scwm/modules/app/scwm/ui-constraints-gdk-drawing.scm +share/scwm/modules/app/scwm/ui-constraints-gtk-toggle-menu.scm +share/scwm/modules/app/scwm/ui-constraints-toggle-menu.scm +share/scwm/modules/app/scwm/ui-constraints.scm +share/scwm/modules/app/scwm/undo.scm +share/scwm/modules/app/scwm/viavoice.scm +share/scwm/modules/app/scwm/virtual.scm +share/scwm/modules/app/scwm/wavplay.scm +share/scwm/modules/app/scwm/window-configuration.scm +share/scwm/modules/app/scwm/window-locations.scm +share/scwm/modules/app/scwm/window-selection.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/modules/app/scwm/xprop-extras.scm +share/scwm/pixmaps/anchor-cursor.xpm +share/scwm/pixmaps/anchor.xpm +share/scwm/pixmaps/cn-keep-above.xpm +share/scwm/pixmaps/cn-keep-bottoms-even.xpm +share/scwm/pixmaps/cn-keep-lefts-even.xpm +share/scwm/pixmaps/cn-keep-rights-even.xpm +share/scwm/pixmaps/cn-keep-to-left-of.xpm +share/scwm/pixmaps/cn-keep-top-bottom-even.xpm +share/scwm/pixmaps/cn-keep-tops-even.xpm +share/scwm/pixmaps/cn-max-hsize.xpm +share/scwm/pixmaps/cn-max-vsize.xpm +share/scwm/pixmaps/cn-min-hsize.xpm +share/scwm/pixmaps/cn-min-vsize.xpm +share/scwm/pixmaps/cn-relative-hsize.xpm +share/scwm/pixmaps/cn-relative-vsize.xpm +share/scwm/pixmaps/cn-right-left-even.xpm +share/scwm/pixmaps/cn-strict-relative-pos.xpm +share/scwm/pixmaps/cn-window-height-sum.xpm +share/scwm/pixmaps/cn-window-width-sum.xpm +share/scwm/pixmaps/cursor.xpm +share/scwm/pixmaps/iconify.xpm +share/scwm/pixmaps/kill.xpm +share/scwm/pixmaps/lambda-rwb.xpm +share/scwm/pixmaps/lambda.xpm +share/scwm/pixmaps/move.xpm +share/scwm/pixmaps/resize_br.xpm +share/scwm/pixmaps/resize_h.xpm +share/scwm/pixmaps/resize_tr.xpm +share/scwm/pixmaps/resize_v.xpm +share/scwm/pixmaps/scwm-logo-orange-bg.xpm +share/scwm/pixmaps/scwm-logo.xpm +share/scwm/pixmaps/scwm-name.xpm +share/scwm/pixmaps/small-anchor.xpm +share/scwm/pixmaps/win-pos-center.xpm +share/scwm/pixmaps/win-pos-e.xpm +share/scwm/pixmaps/win-pos-n.xpm +share/scwm/pixmaps/win-pos-ne.xpm +share/scwm/pixmaps/win-pos-nw.xpm +share/scwm/pixmaps/win-pos-s.xpm +share/scwm/pixmaps/win-pos-se.xpm +share/scwm/pixmaps/win-pos-sw.xpm +share/scwm/pixmaps/win-pos-w.xpm 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-themes +share/scwm/scwmrc/decor.scwmrc +share/scwm/scwmrc/juhp.scwmrc +share/scwm/scwmrc/mstachow.scwmrc +share/scwm/scwmrc/robbe.scwmrc +share/scwm/scwmrc/sds.scwmrc +share/scwm/scwmrc/simple.scwmrc +share/scwm/scwmrc/system.scwmrc +share/scwm/themes/afterstep.tar.gz +share/scwm/themes/fvwm2.tar.gz +share/scwm/themes/gjb.tar.gz +share/scwm/themes/mwm.tar.gz +share/scwm/themes/twm.tar.gz +share/scwm/themes/win95.tar.gz +share/scwm/themes/woven.tar.gz +@dirrm lib/scwm/modules/app/scwm +@dirrm lib/scwm/modules/app +@dirrm lib/scwm/modules +@dirrm lib/scwm +@dirrm share/scwm/ViaVoice +@dirrm share/scwm/modules/app/scwm +@dirrm share/scwm/modules/app +@dirrm share/scwm/modules +@dirrm share/scwm/scwmrc +@dirrm share/scwm/themes -- cgit v1.2.3