From 091fac4c33fb58e0ee001999de32d7090d28d4db Mon Sep 17 00:00:00 2001 From: marc Date: Sat, 22 Aug 1998 17:59:53 +0000 Subject: [PATCH] remove unneeded post-install rule; add patch to not build 2.0 -- the static lib was overwriting the 1.2 static lib --- x11/lesstif/Makefile | 18 ++---------------- x11/lesstif/patches/patch-ak | 15 +++++++++++++++ x11/lesstif/pkg/PLIST | 1 - 3 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 x11/lesstif/patches/patch-ak diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index a700b94cff7..504c160f3bb 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -3,7 +3,7 @@ # Date created: December 10, 1996 # Whom: form@vs.itam.nsc.ru # -# $OpenBSD: Makefile,v 1.12 1998/08/20 20:56:47 marc Exp $ +# $OpenBSD: Makefile,v 1.13 1998/08/22 17:59:53 marc Exp $ # FreeBSD: Makefile,v 1.17 1998/03/28 14:12:55 steve Exp # @@ -22,6 +22,7 @@ USE_X11= yes # GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-debug +CONFIGURE_ARGS+= --enable-build-12 .if (${MACHINE_ARCH} != "alpha") CONFIGURE_ARGS+= --enable-shared .endif @@ -49,20 +50,5 @@ pre-install: esac) .endif -post-install: - ${MKDIR} ${PREFIX}/lib/X11/mwm ${PREFIX}/lib/X11/app-defaults - ${INSTALL_DATA} ${WRKSRC}/clients/Motif-1.2/mwm/system.mwmrc \ - ${PREFIX}/lib/X11/mwm - ${INSTALL_DATA} ${WRKSRC}/clients/Motif-1.2/mwm/alt.map ${PREFIX}/lib/X11/mwm - ${INSTALL_DATA} ${WRKSRC}/clients/Motif-1.2/mwm/Mwm \ - ${PREFIX}/lib/X11/app-defaults/Mwm - [ ! -f ${PREFIX}/lib/libXm.so.1.2 ] || \ - /usr/bin/strip ${PREFIX}/lib/libXm.so.1.2 - [ ! -f ${PREFIX}/lib/libMrm.so.1.2 ] || \ - /usr/bin/strip ${PREFIX}/lib/libMrm.so.1.2 - [ ! -f ${PREFIX}/lib/libXm.so.2.0 ] || \ - /usr/bin/strip ${PREFIX}/lib/libXm.so.2.0 - ${LDCONFIG} -m ${PREFIX}/lib - .include diff --git a/x11/lesstif/patches/patch-ak b/x11/lesstif/patches/patch-ak new file mode 100644 index 00000000000..691f0a58416 --- /dev/null +++ b/x11/lesstif/patches/patch-ak @@ -0,0 +1,15 @@ +--- lib/Makefile.in.~1~ Tue Aug 11 18:37:09 1998 ++++ lib/Makefile.in Sat Aug 22 00:56:27 1998 +@@ -100,9 +100,9 @@ + MAINTAINERCLEANFILES=Makefile.in + SUBDIRS= config \ + Xm Mrm Uil \ +- Xm-2.0 Mrm-2.0 Uil-2.0 \ +- Xm-2.1 Mrm-2.1 \ +- Xm-CDE Mrm-CDE ++# Xm-2.0 Mrm-2.0 Uil-2.0 \ ++# Xm-2.1 Mrm-2.1 \ ++# Xm-CDE Mrm-CDE + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../include/LTconfig.h + CONFIG_CLEAN_FILES = diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST index b41749cd18e..fc7528bd8bf 100644 --- a/x11/lesstif/pkg/PLIST +++ b/x11/lesstif/pkg/PLIST @@ -140,7 +140,6 @@ lib/libXm.a @exec ranlib %D/%F lib/libXm.la lib/libXm.so.1.2 -lib/libXm.so.2.0 @exec /sbin/ldconfig -m %D/lib man/man1/mwm.1 man/man1/xmbind.1