diff options
author | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 06:57:56 +0000 |
---|---|---|
committer | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 06:57:56 +0000 |
commit | bebd89314e57ff34ea47724c5605a0f32c425dcf (patch) | |
tree | d991da3f3e4ccc0cc8f9eab35d1891ca59b0fd9a /x11-wm/scwm | |
parent | Implment WANT_GTK. (diff) |
Implement WANT_IMLIB and USE_IMLIB.
Notes
Notes:
svn path=/head/; revision=33427
Diffstat (limited to 'x11-wm/scwm')
-rw-r--r-- | x11-wm/scwm/Makefile | 23 | ||||
-rw-r--r-- | x11-wm/scwm/files/patch-ag | 12 | ||||
-rw-r--r-- | x11-wm/scwm/files/patch-ah | 20 | ||||
-rw-r--r-- | x11-wm/scwm/files/patch-ai | 11 | ||||
-rw-r--r-- | x11-wm/scwm/files/patch-aj | 20 | ||||
-rw-r--r-- | x11-wm/scwm/pkg-plist | 10 |
6 files changed, 72 insertions, 24 deletions
diff --git a/x11-wm/scwm/Makefile b/x11-wm/scwm/Makefile index ad1801db8e44..104ae9e1df02 100644 --- a/x11-wm/scwm/Makefile +++ b/x11-wm/scwm/Makefile @@ -12,33 +12,28 @@ MASTER_SITES= ftp://scwm.mit.edu/pub/scwm/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile \ - Imlib.5:${PORTSDIR}/graphics/imlib \ - esd.2:${PORTSDIR}/audio/esound +LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile 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 +USE_X_PREFIX= yes +USE_GMAKE= yes +USE_XPM= yes +USE_ESOUND= yes +USE_IMLIB= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= 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) +.if defined(WITH_I18N) CONFIGURE_ARGS+= --enable-multibyte=yes CONFIGURE_ENV+= LIBS="-L${X11BASE}/lib -lxpg4" .endif -USE_GMAKE= yes -USE_X_PREFIX= yes -USE_XPM= yes MAN1= scwm.1 scwmexec.1 scwmrepl.1 post-install: - ${RM} -rf ${PREFIX}/share/scwm/ViaVoice + ${RM} -rf ${PREFIX}/share/scwm/ViaVoice .include <bsd.port.mk> diff --git a/x11-wm/scwm/files/patch-ag b/x11-wm/scwm/files/patch-ag new file mode 100644 index 000000000000..f9d4c2e5f06d --- /dev/null +++ b/x11-wm/scwm/files/patch-ag @@ -0,0 +1,12 @@ +--- src/guile-compat.h.orig Tue Sep 12 20:55:56 2000 ++++ src/guile-compat.h Tue Sep 12 20:56:42 2000 +@@ -76,8 +76,7 @@ + + #ifdef HAVE_SCM_THE_LAST_STACK_FLUID + /* from libguile/fluids.h --07/01/98 gjb */ +-SCM scm_fluid_ref SCM_P ((SCM fluid)); +-SCM scm_fluid_set_x SCM_P ((SCM fluid, SCM value)); ++#include <libguile/fluids.h> + #define DEREF_LAST_STACK scm_fluid_ref(gh_cdr(scm_the_last_stack_fluid)) + #define SET_LAST_STACK(X) scm_fluid_set_x (gh_cdr (scm_the_last_stack_fluid), (X)) + diff --git a/x11-wm/scwm/files/patch-ah b/x11-wm/scwm/files/patch-ah new file mode 100644 index 000000000000..e1b590b9eb21 --- /dev/null +++ b/x11-wm/scwm/files/patch-ah @@ -0,0 +1,20 @@ +--- src/scwm.c.orig Wed Sep 13 00:27:42 2000 ++++ src/scwm.c Wed Sep 13 00:55:21 2000 +@@ -1838,7 +1838,7 @@ + { + static SCM sym_arglist = SCM_UNDEFINED; + if (SCM_UNDEFINED == sym_arglist) +- sym_arglist = scm_permanent_object(((scm_cell *)scm_intern0("arglist"))->car); ++ sym_arglist = scm_permanent_object(SCM_CAR(scm_intern0("arglist"))); + { /* scope */ + SCM p = scm_make_gsubr(name,req,opt,var,fcn); + if (fDocumentPrimitiveFormals) { +@@ -1859,7 +1859,7 @@ + since events.c has the SCWM_GLOBAL_SYMBOL definition of it */ + if (SCM_BOOL_F == sym_interactive) + sym_interactive = +- scm_permanent_object(((scm_cell *)scm_intern0("interactive"))->car); ++ scm_permanent_object(SCM_CAR(scm_intern0("interactive"))); + { /* scope */ + SCM p = scwm_make_gsubr(name,req,opt,var,fcn,szArgList); + scm_set_procedure_property_x(p,sym_interactive, diff --git a/x11-wm/scwm/files/patch-ai b/x11-wm/scwm/files/patch-ai new file mode 100644 index 000000000000..ca808d36a20e --- /dev/null +++ b/x11-wm/scwm/files/patch-ai @@ -0,0 +1,11 @@ +--- src/callbacks.h.orig Wed Sep 13 01:06:11 2000 ++++ src/callbacks.h Wed Sep 13 01:03:16 2000 +@@ -32,7 +32,7 @@ + #endif + + #ifdef HAVE_SCM_MAKE_HOOK +-#define SCWM_MAKE_HOOK(name,args) scm_permanent_object(scm_make_named_hook((name),(args))) ++#define SCWM_MAKE_HOOK(name,args) scm_permanent_object(scm_create_hook((name),(args))) + #else + #define SCWM_MAKE_HOOK(name,args) SCM_EOL + #endif diff --git a/x11-wm/scwm/files/patch-aj b/x11-wm/scwm/files/patch-aj new file mode 100644 index 000000000000..8961d82566ab --- /dev/null +++ b/x11-wm/scwm/files/patch-aj @@ -0,0 +1,20 @@ +--- src/scwm-snarf.h.orig Wed Sep 13 01:01:45 2000 ++++ src/scwm-snarf.h Wed Sep 13 01:02:12 2000 +@@ -61,7 +61,7 @@ + + #ifdef HAVE_SCM_MAKE_HOOK + #define SCWM_HOOK(var, name, args, docstring) \ +-%%% do { var = scm_make_named_hook(name,args); } while (0) ++%%% do { var = scm_create_hook(name,args); } while (0) + #else + #define SCWM_HOOK(var, name, args, docstring) \ + %%% do { var = scm_sysintern(name, SCM_EOL); } while (0) +@@ -76,7 +76,7 @@ + + #if HAVE_SCM_MAKE_HOOK + #define SCWM_GLOBAL_HOOK(var, name, args, docstring) \ +-%%% do { var = scm_make_named_hook(name,args); } while (0) ++%%% do { var = scm_create_hook(name,args); } while (0) + #else + #define SCWM_GLOBAL_HOOK(var, name, args, docstring) \ + %%% do { var = scm_sysintern(name, SCM_EOL); } while (0) diff --git a/x11-wm/scwm/pkg-plist b/x11-wm/scwm/pkg-plist index 42cae8a4be52..f021e21137e4 100644 --- a/x11-wm/scwm/pkg-plist +++ b/x11-wm/scwm/pkg-plist @@ -8,43 +8,33 @@ bin/startscwm include/scwmexec.h info/scwm.info 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/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 share/doc/scwm/examples/Xmodmap-win95keyboard |