summaryrefslogtreecommitdiff
path: root/x11-wm/windowmaker
diff options
context:
space:
mode:
authorThomas Gellekum <tg@FreeBSD.org>1998-11-24 16:04:42 +0000
committerThomas Gellekum <tg@FreeBSD.org>1998-11-24 16:04:42 +0000
commita0b5fc124edf27826b2725086a13ed7438b232fc (patch)
tree5ac4e3de12990b327e77323d82abd8f27d6b0b32 /x11-wm/windowmaker
parent Update of resource file. (diff)
Don't use the shared libPropList. This is supposed to fix the SIGBUS
on startup people are seeing. PR: 8783 Reviewed by: Brian Handy <handy@physics.montana.edu>
Notes
Notes: svn path=/head/; revision=14868
Diffstat (limited to 'x11-wm/windowmaker')
-rw-r--r--x11-wm/windowmaker/Makefile14
-rw-r--r--x11-wm/windowmaker/pkg-plist4
2 files changed, 3 insertions, 15 deletions
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index d1a9ee03f576..fa572f48fb24 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -3,7 +3,7 @@
# Date created: August 13, 1997
# Whom: handy@physics.montana.edu
#
-# $Id: Makefile,v 1.36 1998/10/30 08:24:36 tg Exp $
+# $Id: Makefile,v 1.37 1998/11/14 09:43:33 asami Exp $
DISTNAME= WindowMaker-0.20.2
PKGNAME= windowmaker-0.20.2
@@ -35,8 +35,6 @@ MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x \
DATAFILES= WindowMaker-data.tar.gz
-.include <bsd.port.pre.mk>
-
post-patch:
@perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
@@ -44,11 +42,5 @@ post-install:
${MKDIR} ${PREFIX}/share/WindowMaker/Pixmaps/
${INSTALL_DATA} ${WRKDIR}/WindowMaker-data/pixmaps/* \
${PREFIX}/share/WindowMaker/Pixmaps/
-.if ${PORTOBJFORMAT} == "elf"
- ${LN} -sf libPropList.so.0 ${PREFIX}/lib/libPropList.so
-.else
- ${LN} -sf libPropList.so.0.8 ${PREFIX}/lib/libPropList.so
-.endif
- ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
-.include <bsd.port.post.mk>
+
+.include <bsd.port.mk>
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index d770b56ec944..f083d97dbf3d 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -132,10 +132,6 @@ include/WUtil.h
include/proplist.h
include/wraster.h
lib/libPropList.a
-lib/libPropList.so
-lib/libPropList.so.0.8
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D
lib/libWINGs.a
lib/libWMaker.a
lib/libwraster.a