On ELF platforms, linking against the shared library doesn't work, but

linking against the static library does (see PR#8417), so for now, disable
the installation of the shared library on ELF platforms until a better fix
is found.  But at least, those of us needing xforms on i386-ELF can get
some work done!

4 files changed, 26 insertions, 19 deletions

diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index bbe9f4b7504..45bb58e321c 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1999/09/23 03:42:29 jlam Exp $
+# $NetBSD: Makefile,v 1.19 1999/09/23 05:29:24 jlam Exp $
 #
 
 DISTNAME=       bxform-088
@@ -25,11 +25,11 @@ ONLY_FOR_PLATFORM=	*-*-arm32 *-*-i386 *-*-m68k *-*-ns32k *-*-sparc
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" && ${OBJECT_FMT} == "ELF"
-.if ${MACHINE_ARCH} == "i386"
+.if ${OPSYS} == "NetBSD"
+.if ${MACHINE_ARCH} == "i386" && ${OBJECT_FMT} == "ELF"
 DISTNAME=	bxform-088-ELF
 .endif
-.if ${MACHINE_ARCH} == "sparc"
+.if ${MACHINE_ARCH} == "sparc" && ${OBJECT_FMT} == "ELF"
 # XXX no ELF objects for sparc on NetBSD
 IGNORE="is not available for ${MACHINE_PLATFORM} using the ELF object format."
 .endif
@@ -40,16 +40,22 @@ DIST_SUBDIR=	xforms-${MACHINE_ARCH}
 ## Define OBJMACHINE so WRKDIR is defined to be ${MACHINE_ARCH}-specific.
 OBJMACHINE=	yes
 
+USE_X11BASE=	yes
 NO_BUILD=	yes
 
-USE_X11BASE=	yes
+PLIST_SRC=	${PKGDIR}/PLIST.mi ${PKGSRC}/PLIST.shlib
 
 post-patch:
 	${MV} ${WRKSRC}/mkconfig.h ${WRKSRC}/mkconfig.h.orig
 	${CP} ${FILESDIR}/mkconfig.h ${WRKSRC}
 
+# XXX ELF linker tries to resolve libGL.so symbols when linking with
+# XXX shared libxforms, so for now, disable installation of shared lib.
+.if ${OBJECT_FMT} == "ELF"
+PLIST_SRC=	${PKGDIR}/PLIST.mi
+
 post-install:
-	${LN} -fs libforms.a ${PREFIX}/lib/libxforms.a
-	${LN} -fs libforms.so.0.88 ${PREFIX}/lib/libxforms.so.0.88
+	${RM} ${PREFIX}/lib/libforms.so.0.88 ${PREFIX}/lib/libxforms.so.0.88
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xforms/pkg/PLIST b/x11/xforms/pkg/PLIST
deleted file mode 100644
index 6b34d21906b..00000000000
--- a/x11/xforms/pkg/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 1998/07/15 11:06:46 agc Exp $
-bin/fd2ps
-bin/fdesign
-include/X11/forms.h
-lib/libforms.a
-lib/libxforms.a
-lib/libforms.so.0.88
-lib/libxforms.so.0.88
-man/man1/fd2ps.1.gz
-man/man1/fdesign.1.gz
-man/man5/forms.5.gz
-man/man5/xforms.5.gz
diff --git a/x11/xforms/pkg/PLIST.mi b/x11/xforms/pkg/PLIST.mi
new file mode 100644
index 00000000000..1f28f37ea56
--- /dev/null
+++ b/x11/xforms/pkg/PLIST.mi
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST.mi,v 1.1 1999/09/23 05:29:25 jlam Exp $
+bin/fd2ps
+bin/fdesign
+include/X11/forms.h
+lib/libforms.a
+lib/libxforms.a
+man/man1/fd2ps.1
+man/man1/fdesign.1
+man/man5/forms.5
+man/man5/xforms.5
diff --git a/x11/xforms/pkg/PLIST.shlib b/x11/xforms/pkg/PLIST.shlib
new file mode 100644
index 00000000000..58c0035fcb3
--- /dev/null
+++ b/x11/xforms/pkg/PLIST.shlib
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.shlib,v 1.1 1999/09/23 05:29:25 jlam Exp $
+lib/libforms.so.0.88
+lib/libxforms.so.0.88