From 3a0fbcb4fbe965357bb35f51992c8847cdd6f30f Mon Sep 17 00:00:00 2001 From: fredb Date: Tue, 24 Aug 1999 10:16:38 +0000 Subject: Libtoolize this, and install libs shared. Simplify patch to "afterstepdoc" script, so that if it can't find {netscape,mozilla} in the usual places, it only looks for lynx in /usr/{pkg,local}/bin. --- x11/afterstep-current/Makefile | 9 ++++- x11/afterstep-current/files/patch-sum | 14 +++++-- x11/afterstep-current/patches/patch-aa | 6 +-- x11/afterstep-current/patches/patch-ab | 34 +++++++---------- x11/afterstep-current/patches/patch-ad | 28 ++++++++------ x11/afterstep-current/patches/patch-ae | 47 +++++++++++++++++++++++ x11/afterstep-current/patches/patch-af | 14 +++++++ x11/afterstep-current/patches/patch-ag | 55 +++++++++++++++++++++++++++ x11/afterstep-current/patches/patch-ah | 68 ++++++++++++++++++++++++++++++++++ x11/afterstep-current/patches/patch-ai | 18 +++++++++ x11/afterstep-current/patches/patch-aj | 18 +++++++++ x11/afterstep-current/pkg/PLIST | 10 ++++- 12 files changed, 280 insertions(+), 41 deletions(-) create mode 100644 x11/afterstep-current/patches/patch-ae create mode 100644 x11/afterstep-current/patches/patch-af create mode 100644 x11/afterstep-current/patches/patch-ag create mode 100644 x11/afterstep-current/patches/patch-ah create mode 100644 x11/afterstep-current/patches/patch-ai create mode 100644 x11/afterstep-current/patches/patch-aj (limited to 'x11') diff --git a/x11/afterstep-current/Makefile b/x11/afterstep-current/Makefile index 816a84de2b3..62ff2478df7 100644 --- a/x11/afterstep-current/Makefile +++ b/x11/afterstep-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1999/08/21 15:16:55 fredb Exp $ +# $NetBSD: Makefile,v 1.6 1999/08/24 10:16:38 fredb Exp $ DISTNAME= AfterStep-1.7.126 PKGNAME= afterstep-1.7.137 @@ -46,9 +46,10 @@ CONFLICTS= ascp-1.0.2 DIST_SUBDIR= AfterStep GNU_CONFIGURE= yes USE_GMAKE= yes +USE_LIBTOOL= yes USE_X11BASE= yes -CONFIGURE_ARGS+= --with-helpcommand="xpman" \ +CONFIGURE_ARGS+= --disable-staticlibs --with-helpcommand="xpman" \ --with-png-includes=${LOCALBASE}/include \ --with-png-lib=${LOCALBASE}/lib \ --with-jpeg-includes=${LOCALBASE}/include \ @@ -60,6 +61,10 @@ MESSAGE_FILE= ${WRKDIR}/MESSAGE post-build: ${SED} 's#@PREFIX@#${PREFIX}#g' < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE +post-configure: + @(cd ${WRKSRC} ; ${GMAKE} config) + ${MAKE} do-configure + post-patch: cd ${WRKSRC} ; \ for i in `find . -name "*.man" -print` autoconf/Makefile.common.in ; do \ diff --git a/x11/afterstep-current/files/patch-sum b/x11/afterstep-current/files/patch-sum index 2ae7ffa42c6..e720ba33aba 100644 --- a/x11/afterstep-current/files/patch-sum +++ b/x11/afterstep-current/files/patch-sum @@ -1,6 +1,12 @@ -$NetBSD: patch-sum,v 1.1.1.1 1999/07/31 10:36:45 fredb Exp $ +$NetBSD: patch-sum,v 1.2 1999/08/24 10:16:39 fredb Exp $ -MD5 (patch-aa) = cdbcaf4695ef756e52872db98f1e8915 -MD5 (patch-ab) = a7a25072bc407d53a1f1b703fdf7e3e3 +MD5 (patch-aa) = 2bc06ffa76f29ad62d02cacce903d834 +MD5 (patch-ab) = ac5e74e6c2c58222e53031f1ca28e1ea MD5 (patch-ac) = 4c9f9d96549030aaac1a7f01e689a226 -MD5 (patch-ad) = f64c62819dae1b6f9c5d28e6190451b0 +MD5 (patch-ad) = f367e9473288792af59c6ffead689f4e +MD5 (patch-ae) = d4e6f55d6a6729fabd852ed914af0763 +MD5 (patch-af) = 48bfd694d02caa25ead84f93c7c57133 +MD5 (patch-ag) = 8dd31d1ced382ce69724776e4ea38f4d +MD5 (patch-ah) = e5e273f350a6d7a288c001cc0e371f42 +MD5 (patch-ai) = 730fdcf8154d1de21bd5b4ade47fa858 +MD5 (patch-aj) = 1830045ac8f926b344d6df86ed30c558 diff --git a/x11/afterstep-current/patches/patch-aa b/x11/afterstep-current/patches/patch-aa index 01f5b8ab76e..5d29cd66ed6 100644 --- a/x11/afterstep-current/patches/patch-aa +++ b/x11/afterstep-current/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/07/31 10:36:46 fredb Exp $ +$NetBSD: patch-aa,v 1.2 1999/08/24 10:16:39 fredb Exp $ --- doc/afterstepdoc.in.orig Tue Nov 10 10:51:01 1998 +++ doc/afterstepdoc.in Tue Dec 29 00:20:54 1998 @@ -9,7 +9,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/07/31 10:36:46 fredb Exp $ -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 @bindir@/navigator \ ++for netscape in @bindir@/netscape @bindir@/mozilla \ + /usr/local/bin/netscape /usr/local/netscape/bin/netscape ; do if [ -x $netscape ] ; then $netscape -remote \ @@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/07/31 10:36:46 fredb Exp $ done -for lynx in /usr/bin/lynx /bin/lynx /usr/local/bin/lynx ; do -+for lynx in @LOCALBASE@/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/x11/afterstep-current/patches/patch-ab b/x11/afterstep-current/patches/patch-ab index a94fb31ba8e..0b0d5d17a34 100644 --- a/x11/afterstep-current/patches/patch-ab +++ b/x11/afterstep-current/patches/patch-ab @@ -1,24 +1,18 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/07/31 10:36:46 fredb Exp $ +$NetBSD: patch-ab,v 1.2 1999/08/24 10:16:39 fredb Exp $ ---- autoconf/Makefile.common.in.orig Mon Mar 8 10:47:14 1999 -+++ autoconf/Makefile.common.in Thu May 27 05:28:28 1999 -@@ -13,8 +13,8 @@ +--- 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) - install.man: - @if test -f $(PROG).man; then \ -- echo $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1x; \ -- $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1x; \ -+ echo $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1; \ -+ $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1; \ - fi +-PROG = libasimage.a +-DYNPROG = libasimage.so +-LIBVER = 1.9 ++PROG = libasimage.la + LIBVERMAJOR = 1 +-#INSTALLONBUILD = install ++LIBVERMINOR = 9 - install.script: -@@ -27,7 +27,7 @@ - $(RMF) $(AFTER_BIN_DIR)/$(PROG) + @MAKEFILECOMMONLIB@ - uninstall.man: -- $(RMF) $(AFTER_MAN_DIR)/$(PROG).1x -+ $(RMF) $(AFTER_MAN_DIR)/$(PROG).1 - - uninstall.script: - @for i in $(SCRIPTS); do \ diff --git a/x11/afterstep-current/patches/patch-ad b/x11/afterstep-current/patches/patch-ad index 4e69ecbbef4..0fbb4e04b88 100644 --- a/x11/afterstep-current/patches/patch-ad +++ b/x11/afterstep-current/patches/patch-ad @@ -1,12 +1,18 @@ -$NetBSD: patch-ad,v 1.1.1.1 1999/07/31 10:36:46 fredb Exp $ +$NetBSD: patch-ad,v 1.2 1999/08/24 10:16:40 fredb Exp $ ---- configure.orig Thu Dec 10 05:52:19 1998 -+++ configure Tue Dec 29 00:26:35 1998 -@@ -4012,6 +4012,7 @@ - s%@DEFS@%$DEFS%g - s%@LDFLAGS@%$LDFLAGS%g - s%@LIBS@%$LIBS%g -+s%@LOCALBASE@%$LOCALBASE%g - s%@exec_prefix@%$exec_prefix%g - s%@prefix@%$prefix%g - s%@program_transform_name@%$program_transform_name%g +--- 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/x11/afterstep-current/patches/patch-ae b/x11/afterstep-current/patches/patch-ae new file mode 100644 index 00000000000..bb5f559b8dd --- /dev/null +++ b/x11/afterstep-current/patches/patch-ae @@ -0,0 +1,47 @@ +$NetBSD: patch-ae,v 1.1 1999/08/24 10:16:40 fredb Exp $ + +--- autoconf/configure.in.orig ++++ autoconf/configure.in +@@ -84,6 +84,7 @@ + AC_PATH_PROG(MV, mv, mv) + AC_PATH_PROG(CP, cp, cp) + AC_PATH_PROG(MKDIR, mkdir, mkdir) ++AC_PATH_PROG(LIBTOOL, libtool, libtool) + + dnl# let's check for endiannes of our box + AC_C_BIGENDIAN +@@ -223,19 +224,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 + +@@ -320,6 +318,7 @@ + AC_SUBST(enable_fixeditems) + AC_SUBST(enable_audit) + AC_SUBST(SCRIPT_DIR) ++AC_SUBST(LDSTATIC) + + dnl# Write results + diff --git a/x11/afterstep-current/patches/patch-af b/x11/afterstep-current/patches/patch-af new file mode 100644 index 00000000000..8391839d54b --- /dev/null +++ b/x11/afterstep-current/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1 1999/08/24 10:16:40 fredb 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/x11/afterstep-current/patches/patch-ag b/x11/afterstep-current/patches/patch-ag new file mode 100644 index 00000000000..92fd496f93c --- /dev/null +++ b/x11/afterstep-current/patches/patch-ag @@ -0,0 +1,55 @@ +$NetBSD: patch-ag,v 1.1 1999/08/24 10:16:40 fredb Exp $ + +--- autoconf/Makefile.common.in.orig ++++ 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@ + +@@ -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 +@@ -82,23 +82,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/x11/afterstep-current/patches/patch-ah b/x11/afterstep-current/patches/patch-ah new file mode 100644 index 00000000000..4086d708102 --- /dev/null +++ b/x11/afterstep-current/patches/patch-ah @@ -0,0 +1,68 @@ +$NetBSD: patch-ah,v 1.1 1999/08/24 10:16:40 fredb Exp $ + +--- autoconf/Makefile.common.lib.in.orig ++++ autoconf/Makefile.common.lib.in +@@ -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 +@@ -82,13 +63,3 @@ + 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/x11/afterstep-current/patches/patch-ai b/x11/afterstep-current/patches/patch-ai new file mode 100644 index 00000000000..e9e34e411e5 --- /dev/null +++ b/x11/afterstep-current/patches/patch-ai @@ -0,0 +1,18 @@ +$NetBSD: patch-ai,v 1.1 1999/08/24 10:16:40 fredb 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/x11/afterstep-current/patches/patch-aj b/x11/afterstep-current/patches/patch-aj new file mode 100644 index 00000000000..dfd7f1eb996 --- /dev/null +++ b/x11/afterstep-current/patches/patch-aj @@ -0,0 +1,18 @@ +$NetBSD: patch-aj,v 1.1 1999/08/24 10:16:40 fredb Exp $ + +--- lib/Makefile.in.orig ++++ lib/Makefile.in +@@ -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@ + diff --git a/x11/afterstep-current/pkg/PLIST b/x11/afterstep-current/pkg/PLIST index 8313459e782..4c02df31d39 100644 --- a/x11/afterstep-current/pkg/PLIST +++ b/x11/afterstep-current/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1999/07/31 10:36:46 fredb Exp $ +@comment $NetBSD: PLIST,v 1.2 1999/08/24 10:16:40 fredb Exp $ bin/ASSound bin/Animate bin/Audio @@ -21,6 +21,14 @@ bin/afterstep bin/afterstepdoc bin/ascommand.pl bin/asetroot +lib/libafterstep.a +lib/libafterstep.so.1.5 +lib/libasConfig.a +lib/libasConfig.so.1.0 +lib/libasimage.a +lib/libasimage.so.1.9 +lib/libWidgets.a +lib/libWidgets.so.1.5 man/man1/Animate.1 man/man1/Audio.1 man/man1/Auto.1 -- cgit v1.2.3