summaryrefslogtreecommitdiff
path: root/wm/afterstep1/patches
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2005-01-14 13:36:35 +0000
committerjmmv <jmmv@pkgsrc.org>2005-01-14 13:36:35 +0000
commit107769221a3e3ded95edc4a55fa249b8f8f1ee2e (patch)
tree01b81aba3b9f338b472a838dbce3cf18535f6fa7 /wm/afterstep1/patches
parent9a7ea9fede31780be182dc62907a9b7ee44408a6 (diff)
downloadpkgsrc-107769221a3e3ded95edc4a55fa249b8f8f1ee2e.tar.gz
Move afterstep 1.x from pkgsrc/wm/afterstep to pkgsrc/wm/afterstep1.
This is version 1.8.11.
Diffstat (limited to 'wm/afterstep1/patches')
-rw-r--r--wm/afterstep1/patches/patch-aa27
-rw-r--r--wm/afterstep1/patches/patch-ab18
-rw-r--r--wm/afterstep1/patches/patch-ad18
-rw-r--r--wm/afterstep1/patches/patch-ae41
-rw-r--r--wm/afterstep1/patches/patch-af14
-rw-r--r--wm/afterstep1/patches/patch-ag55
-rw-r--r--wm/afterstep1/patches/patch-ah54
-rw-r--r--wm/afterstep1/patches/patch-ai18
-rw-r--r--wm/afterstep1/patches/patch-aj18
9 files changed, 263 insertions, 0 deletions
diff --git a/wm/afterstep1/patches/patch-aa b/wm/afterstep1/patches/patch-aa
new file mode 100644
index 00000000000..e8c9e5d7c54
--- /dev/null
+++ b/wm/afterstep1/patches/patch-aa
@@ -0,0 +1,27 @@
+$NetBSD: patch-aa,v 1.1.1.1 2005/01/14 13:36:35 jmmv Exp $
+
+--- doc/afterstepdoc.in.orig Mon Jan 10 19:37:03 2000
++++ doc/afterstepdoc.in Thu Jan 25 12:49:48 2001
+@@ -9,18 +9,15 @@
+ # 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 \
+- || $netscape @datadir@/afterstep/doc/afterstep.html &
++ $netscape @datadir@/afterstep/doc/afterstep.html &
+ exit
+ fi
+ done
+
+-for lynx in /usr/bin/lynx /bin/lynx /usr/local/bin/lynx ; do
++for lynx in @bindir@/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/afterstep1/patches/patch-ab b/wm/afterstep1/patches/patch-ab
new file mode 100644
index 00000000000..0a6b19fe20d
--- /dev/null
+++ b/wm/afterstep1/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1.1.1 2005/01/14 13:36:35 jmmv 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/afterstep1/patches/patch-ad b/wm/afterstep1/patches/patch-ad
new file mode 100644
index 00000000000..4985ec82d2a
--- /dev/null
+++ b/wm/afterstep1/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1.1.1 2005/01/14 13:36:35 jmmv 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/afterstep1/patches/patch-ae b/wm/afterstep1/patches/patch-ae
new file mode 100644
index 00000000000..0b4c7e007eb
--- /dev/null
+++ b/wm/afterstep1/patches/patch-ae
@@ -0,0 +1,41 @@
+$NetBSD: patch-ae,v 1.1.1.1 2005/01/14 13:36:36 jmmv Exp $
+
+--- autoconf/configure.in.orig Fri Mar 1 00:33:37 2002
++++ autoconf/configure.in
+@@ -84,6 +84,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
+@@ -263,20 +264,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)'
++LIBINSTALL="install.dyn"
+ 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)'
+- LIBINSTALL=""
++ LDSTATIC="-static"
+ else
+- AFTERSTEP_LIB="../../lib/libafterstep.so"
+- ASIMAGE_LIB="../../asimagelib/libasimage.so"
+- WIDGETS_LIB="../Script/Widgets/libWidgets.so"
+- CONFIG_LIB="../Config/libasConfig.so"
+- LIBPROG='$(DYNPROG)'
+- LIBINSTALL="install.dyn"
++ LDSTATIC=""
+ fi
+
+ ASIMAGE_LIB="$ASIMAGE_LIB $LIB_MATH"
diff --git a/wm/afterstep1/patches/patch-af b/wm/afterstep1/patches/patch-af
new file mode 100644
index 00000000000..e79b044ef7b
--- /dev/null
+++ b/wm/afterstep1/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1.1.1 2005/01/14 13:36:36 jmmv 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/afterstep1/patches/patch-ag b/wm/afterstep1/patches/patch-ag
new file mode 100644
index 00000000000..15c0cb44da7
--- /dev/null
+++ b/wm/afterstep1/patches/patch-ag
@@ -0,0 +1,55 @@
+$NetBSD: patch-ag,v 1.1.1.1 2005/01/14 13:36:36 jmmv Exp $
+
+--- autoconf/Makefile.common.in.orig Wed Oct 3 00:58:40 2001
++++ autoconf/Makefile.common.in
+@@ -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@
+
+@@ -92,10 +92,10 @@
+ fi
+
+ $(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
+@@ -106,23 +106,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/afterstep1/patches/patch-ah b/wm/afterstep1/patches/patch-ah
new file mode 100644
index 00000000000..b4a5c295e88
--- /dev/null
+++ b/wm/afterstep1/patches/patch-ah
@@ -0,0 +1,54 @@
+$NetBSD: patch-ah,v 1.1.1.1 2005/01/14 13:36:36 jmmv Exp $
+
+--- autoconf/Makefile.common.lib.in.orig Fri Oct 20 06:27:57 2000
++++ autoconf/Makefile.common.lib.in Sun Mar 11 15:16:36 2001
+@@ -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:
+
+@@ -80,12 +63,10 @@
+ fi
+
+ $(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
diff --git a/wm/afterstep1/patches/patch-ai b/wm/afterstep1/patches/patch-ai
new file mode 100644
index 00000000000..51db3fa40b8
--- /dev/null
+++ b/wm/afterstep1/patches/patch-ai
@@ -0,0 +1,18 @@
+$NetBSD: patch-ai,v 1.1.1.1 2005/01/14 13:36:36 jmmv 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/afterstep1/patches/patch-aj b/wm/afterstep1/patches/patch-aj
new file mode 100644
index 00000000000..417064c131e
--- /dev/null
+++ b/wm/afterstep1/patches/patch-aj
@@ -0,0 +1,18 @@
+$NetBSD: patch-aj,v 1.1.1.1 2005/01/14 13:36:36 jmmv 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@
+