From b48aa2febfd565b99592854d7cbeaa9c59ec76e9 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 12 Dec 2000 02:03:46 +0000 Subject: Add new category wm for window managers, and move lots of package from x11 here. Only changes are: `wm' in category added and some paths fixed. --- wm/afterstep/patches/patch-aa | 25 ++++++++++++++++ wm/afterstep/patches/patch-ab | 18 +++++++++++ wm/afterstep/patches/patch-ac | 24 +++++++++++++++ wm/afterstep/patches/patch-ad | 18 +++++++++++ wm/afterstep/patches/patch-ae | 47 +++++++++++++++++++++++++++++ wm/afterstep/patches/patch-af | 14 +++++++++ wm/afterstep/patches/patch-ag | 55 ++++++++++++++++++++++++++++++++++ wm/afterstep/patches/patch-ah | 69 +++++++++++++++++++++++++++++++++++++++++++ wm/afterstep/patches/patch-ai | 18 +++++++++++ wm/afterstep/patches/patch-aj | 18 +++++++++++ 10 files changed, 306 insertions(+) create mode 100644 wm/afterstep/patches/patch-aa create mode 100644 wm/afterstep/patches/patch-ab create mode 100644 wm/afterstep/patches/patch-ac create mode 100644 wm/afterstep/patches/patch-ad create mode 100644 wm/afterstep/patches/patch-ae create mode 100644 wm/afterstep/patches/patch-af create mode 100644 wm/afterstep/patches/patch-ag create mode 100644 wm/afterstep/patches/patch-ah create mode 100644 wm/afterstep/patches/patch-ai create mode 100644 wm/afterstep/patches/patch-aj (limited to 'wm/afterstep/patches') diff --git a/wm/afterstep/patches/patch-aa b/wm/afterstep/patches/patch-aa new file mode 100644 index 00000000000..287726ac5f9 --- /dev/null +++ b/wm/afterstep/patches/patch-aa @@ -0,0 +1,25 @@ +$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $ + +--- doc/afterstepdoc.in.orig Tue Nov 10 10:51:01 1998 ++++ doc/afterstepdoc.in Tue Dec 29 00:20:54 1998 +@@ -9,9 +9,8 @@ + # First try standard path, then local, then other possible paths + # + +-for netscape in /usr/X11R6/bin/netscape /usr/bin/netscape \ +- /usr/local/bin/netscape /usr/local/netscape/netscape \ +- /opt/netscape/netscape /opt/bin/netscape ; do ++for netscape in @bindir@/netscape @bindir@/mozilla \ ++ /usr/local/bin/netscape /usr/local/netscape/bin/netscape ; do + if [ -x $netscape ] ; then + $netscape -remote \ + openurl\(file:///@datadir@/afterstep/doc/afterstep.html\) 2>/dev/null \ +@@ -20,7 +19,7 @@ + fi + done + +-for lynx in /usr/bin/lynx /bin/lynx /usr/local/bin/lynx ; do ++for lynx in /usr/pkg/bin/lynx /usr/local/bin/lynx ; do + if [ -x $lynx ] ; then + exec xterm -bg black -fg white -sl 500 -vb -e $lynx @datadir@/afterstep/doc/afterstep.html & + fi diff --git a/wm/afterstep/patches/patch-ab b/wm/afterstep/patches/patch-ab new file mode 100644 index 00000000000..d984a8e7dd8 --- /dev/null +++ b/wm/afterstep/patches/patch-ab @@ -0,0 +1,18 @@ +$NetBSD: patch-ab,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $ + +--- asimagelib/Makefile.in.orig Tue Jul 27 10:38:01 1999 ++++ asimagelib/Makefile.in Sun Aug 22 11:43:11 1999 +@@ -7,11 +7,9 @@ + pixmap.o balloon.o background.o + OBJSDLL = $(OBJS) + +-PROG = libasimage.a +-DYNPROG = libasimage.so +-LIBVER = 1.9 ++PROG = libasimage.la + LIBVERMAJOR = 1 +-#INSTALLONBUILD = install ++LIBVERMINOR = 9 + + @MAKEFILECOMMONLIB@ + diff --git a/wm/afterstep/patches/patch-ac b/wm/afterstep/patches/patch-ac new file mode 100644 index 00000000000..9a3ea50879d --- /dev/null +++ b/wm/afterstep/patches/patch-ac @@ -0,0 +1,24 @@ +$NetBSD: patch-ac,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $ + +--- src/Audio/Makefile.in.orig Mon Aug 9 17:43:38 1999 ++++ src/Audio/Makefile.in Fri Aug 27 22:25:12 1999 +@@ -4,15 +4,15 @@ + # are correct for your rplay installation. + # + +-#EXTRA_DEFINES = -DHAVE_RPLAY +-#EXTRA_INCLUDES = -I/usr/local/include +-#EXTRA_LIBRARIES = -L/usr/local/lib -lrplay +- + OBJS = Audio.o + + PROG = Audio + + LIBS_ASDYN = $(LIB_AFTERSTEP) ++ ++EXTRA_DEFINES = -DHAVE_RPLAY ++EXTRA_INCLUDES = -I${LOCALBASE}/include ++EXTRA_LIBRARIES = -L${LOCALBASE}/lib -lrplay + LIBS_DEPEND = $(LIB_AFTERSTEP) + + @MAKEFILECOMMON@ diff --git a/wm/afterstep/patches/patch-ad b/wm/afterstep/patches/patch-ad new file mode 100644 index 00000000000..496b75afb5f --- /dev/null +++ b/wm/afterstep/patches/patch-ad @@ -0,0 +1,18 @@ +$NetBSD: patch-ad,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $ + +--- src/Config/Makefile.in.orig Sun Jul 11 12:33:27 1999 ++++ src/Config/Makefile.in Sun Aug 22 11:44:16 1999 +@@ -5,11 +5,9 @@ + OBJS = Pager.o Base.o MyStyle.o ASetRoot.o + OBJSDLL = $(OBJS) + +-PROG = libasConfig.a +-DYNPROG = libasConfig.so +-LIBVER = 1.0 ++PROG = libasConfig.la + LIBVERMAJOR = 1 +-#INSTALLONBUILD = install ++LIBVERMINOR = 0 + + @MAKEFILECOMMONLIB@ + diff --git a/wm/afterstep/patches/patch-ae b/wm/afterstep/patches/patch-ae new file mode 100644 index 00000000000..755f0b45092 --- /dev/null +++ b/wm/afterstep/patches/patch-ae @@ -0,0 +1,47 @@ +$NetBSD: patch-ae,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $ + +--- autoconf/configure.in.orig Tue Feb 8 11:11:35 2000 ++++ autoconf/configure.in Sun Feb 13 23:55:34 2000 +@@ -83,6 +83,7 @@ + AC_PATH_PROG(CP, cp, cp) + AC_PATH_PROG(MKDIR, mkdir, mkdir) + AC_PATH_PROG(PERL, perl, perl) ++AC_PATH_PROG(LIBTOOL, libtool, libtool) + + dnl# let's check for endiannes of our box + AC_C_BIGENDIAN +@@ -222,19 +223,16 @@ + dnl# AFTERSTEP_LIB="-lafterstep" + dnl# ASIMAGE_LIB="-lasimage" + dnl# WIDGETS_LIB="-lWidgets" ++AFTERSTEP_LIB="../../lib/libafterstep.la" ++ASIMAGE_LIB="../../asimagelib/libasimage.la" ++WIDGETS_LIB="../Script/Widgets/libWidgets.la" ++CONFIG_LIB="../Config/libasConfig.la" ++LIBPROG='$(PROG)' + if test "x$enable_staticlibs" = "xyes"; then +- AFTERSTEP_LIB="../../lib/libafterstep.a" +- ASIMAGE_LIB="../../asimagelib/libasimage.a" +- WIDGETS_LIB="../Script/Widgets/libWidgets.a" +- CONFIG_LIB="../Config/libasConfig.a" +- LIBPROG='$(PROG)' ++ LDSTATIC="-static" + LIBINSTALL="" + else +- AFTERSTEP_LIB="../../lib/libafterstep.so" +- ASIMAGE_LIB="../../asimagelib/libasimage.so" +- WIDGETS_LIB="../Script/Widgets/libWidgets.so" +- CONFIG_LIB="../Config/libasConfig.so" +- LIBPROG='$(DYNPROG)' ++ LDSTATIC="" + LIBINSTALL="install.dyn" + fi + +@@ -316,6 +314,7 @@ + AC_SUBST(enable_audit) + AC_SUBST(SCRIPT_DIR) + AC_SUBST(PERL) ++AC_SUBST(LDSTATIC) + + dnl# Write results + diff --git a/wm/afterstep/patches/patch-af b/wm/afterstep/patches/patch-af new file mode 100644 index 00000000000..becad18d7cf --- /dev/null +++ b/wm/afterstep/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $ + +--- autoconf/Makefile.defines.in.orig Thu Mar 25 20:07:08 1999 ++++ autoconf/Makefile.defines.in Sat Aug 21 11:25:30 1999 +@@ -7,6 +7,9 @@ + # -march=pentiumpro -mcpu=pentiumpro + EXTRA_DEFINES = @DEFINE_XLOCALE@ + ++LIBTOOL = @LIBTOOL@ ++LDSTATIC = @LDSTATIC@ ++ + RANLIB = @RANLIB@ + AR = ar clq + CP = @CP@ diff --git a/wm/afterstep/patches/patch-ag b/wm/afterstep/patches/patch-ag new file mode 100644 index 00000000000..45b49c5d173 --- /dev/null +++ b/wm/afterstep/patches/patch-ag @@ -0,0 +1,55 @@ +$NetBSD: patch-ag,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $ + +--- autoconf/Makefile.common.in.orig Wed Aug 25 17:44:20 1999 ++++ autoconf/Makefile.common.in Fri Aug 27 21:56:14 1999 +@@ -7,7 +7,7 @@ + all: $(PROG) + + install.bin: $(PROG) +- $(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR) ++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR)/$(PROG) + + install.lib: @LIBPROG@ @LIBINSTALL@ + +@@ -70,10 +70,10 @@ + done + + $(PROG): $(OBJS) $(LIBS_DEPEND) +- $(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@) ++ $(LIBTOOL) --mode=link $(CC) $(OBJS:.o=.lo) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@) + + .c.o: +- $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c ++ $(LIBTOOL) --mode=compile $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c + + # + # include dependency files if they exist +@@ -84,23 +84,17 @@ + include .depend + #endif + +-../../lib/libafterstep.a: ++../../lib/libafterstep.la: + cd ../../lib/; ${MAKE} + +-../../asimagelib/libasimage.a: ++../../asimagelib/libasimage.la: + cd ../../asimagelib/; ${MAKE} + +-../Config/libasConfig.a: ++../Config/libasConfig.la: + cd ../Config/; ${MAKE} + +-../../lib/libafterstep.so: +- cd ../../lib/; ${MAKE} +- +-../../asimagelib/libasimage.so: +- cd ../../asimagelib/; ${MAKE} +- +-../Config/libasConfig.so: +- cd ../Config/; ${MAKE} ++../Script/Widgets/Widgets.la: ++ cd ../Script/Widgets/; ${MAKE} + + # + # End of Make.common diff --git a/wm/afterstep/patches/patch-ah b/wm/afterstep/patches/patch-ah new file mode 100644 index 00000000000..530d4505666 --- /dev/null +++ b/wm/afterstep/patches/patch-ah @@ -0,0 +1,69 @@ +$NetBSD: patch-ah,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $ + +--- autoconf/Makefile.common.lib.in.orig Wed Aug 25 17:44:20 1999 ++++ autoconf/Makefile.common.lib.in Fri Aug 27 22:05:30 1999 +@@ -4,7 +4,7 @@ + + @MAKEFILEDEFINES@ + +-all: @LIBPROG@ $(INSTALLONBUILD) ++all: @LIBPROG@ + + install.bin: + +@@ -15,24 +15,7 @@ + install.script: + + install.dyn: +- $(INSTALL_LIB) $(DYNPROG).$(LIBVER) $(LIBDIR) +- -@/bin/rm -f $(LIBDIR)/$(DYNPROG).$(LIBVERMAJOR) $(LIBDIR)/$(DYNPROG) +- ln -sf $(DYNPROG).$(LIBVER) $(LIBDIR)/$(DYNPROG).$(LIBVERMAJOR) +- ln -sf $(DYNPROG).$(LIBVERMAJOR) $(LIBDIR)/$(DYNPROG) +- @( \ +- if test `uname` = "Linux"; then \ +- if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \ +- echo "" > /dev/null; \ +- elif grep -q $(LIBDIR) /etc/ld.so.conf > /dev/null 2>&1; then \ +- echo "" > /dev/null; \ +- else \ +- echo "Unable to find $(LIBDIR) in ld.so.conf. In order to use "; \ +- echo "$(DYNPROG), you may need to add it or set LD_LIBRARY_PATH."; \ +- fi; \ +- echo "ldconfig"; \ +- ldconfig; \ +- fi \ +- ) ++ $(LIBTOOL) --mode=install $(INSTALL_LIB) $(PROG) $(LIBDIR)/$(PROG:.la=.so).$(LIBVERMAJOR).$(LIBVERMINOR) + + uninstall.bin: + +@@ -69,12 +52,10 @@ + done + + $(PROG): $(OBJS) +- $(RMF) $(PROG) +- $(AR) $(PROG) $(OBJS) +- $(RANLIB) $(PROG) ++ $(LIBTOOL) --mode=link $(CC) $(LDSTATIC) $(OBJS:.o=.lo) -rpath $(LIBDIR) -version-info $(LIBVERMAJOR):$(LIBVERMINOR) -o $(@) + + .c.o: +- $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c ++ $(LIBTOOL) --mode=compile $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c + + # + # include dependency files if they exist +@@ -84,14 +65,4 @@ + #ifneq ($(wildcard .depend),) + include .depend + #endif +- +-$(DYNPROG): $(DYNPROG).$(LIBVERMAJOR) +- ln -sf $(DYNPROG).$(LIBVERMAJOR) $(DYNPROG) +- +-$(DYNPROG).$(LIBVERMAJOR): $(DYNPROG).$(LIBVER) +- ln -sf $(DYNPROG).$(LIBVER) $(DYNPROG).$(LIBVERMAJOR) +- +-$(DYNPROG).$(LIBVER): $(OBJSDLL) +- $(CC) -shared -Wl,-soname,$(DYNPROG).$(LIBVERMAJOR) -o $(DYNPROG).$(LIBVER) \ +- $(OBJSDLL) + diff --git a/wm/afterstep/patches/patch-ai b/wm/afterstep/patches/patch-ai new file mode 100644 index 00000000000..2215175d60d --- /dev/null +++ b/wm/afterstep/patches/patch-ai @@ -0,0 +1,18 @@ +$NetBSD: patch-ai,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $ + +--- src/Script/Widgets/Makefile.in.orig Mon Mar 8 10:47:14 1999 ++++ src/Script/Widgets/Makefile.in Sun Aug 22 11:45:33 1999 +@@ -3,11 +3,9 @@ + Swallow.o TextField.o Tools.o VDipstick.o VScrollBar.o Widget.o + OBJSDLL = $(OBJS) + +-PROG = libWidgets.a +-DYNPROG = libWidgets.so +-LIBVER = 1.5 ++PROG = libWidgets.la + LIBVERMAJOR = 1 +-#INSTALLONBUILD = install ++LIBVERMINOR = 5 + + @MAKEFILECOMMONLIB@ + diff --git a/wm/afterstep/patches/patch-aj b/wm/afterstep/patches/patch-aj new file mode 100644 index 00000000000..1635d8e9178 --- /dev/null +++ b/wm/afterstep/patches/patch-aj @@ -0,0 +1,18 @@ +$NetBSD: patch-aj,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $ + +--- lib/Makefile.in.orig Mon Aug 23 16:37:48 1999 ++++ lib/Makefile.in Fri Aug 27 22:25:21 1999 +@@ -11,11 +11,9 @@ + + OBJSDLL = $(OBJS) + +-PROG = libafterstep.a +-DYNPROG = libafterstep.so +-LIBVER = 1.5 ++PROG = libafterstep.la + LIBVERMAJOR = 1 +-#INSTALLONBUILD = install ++LIBVERMINOR = 5 + + @MAKEFILECOMMONLIB@ + -- cgit v1.2.3