diff options
| author | Steve Price <steve@FreeBSD.org> | 1999-05-04 23:02:53 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1999-05-04 23:02:53 +0000 |
| commit | 32145ece60d0100ec7d2f0a3f6169b7cf6ab6eb9 (patch) | |
| tree | 96d6e2199186899b4d8e80ba9efbed13aeb5dd9d /x11-toolkits/slingshot | |
| parent | Combine xview-config and xview-lib into one port, xview. (diff) | |
Fix for ELF, cleanup PLIST, and find new xview port.
PR: 11206
Submitted by: Pedro F. Giffuni <pfgiffun@bachue.usc.unal.edu.co>
Notes
Notes:
svn path=/head/; revision=18482
Diffstat (limited to 'x11-toolkits/slingshot')
| -rw-r--r-- | x11-toolkits/slingshot/Makefile | 8 | ||||
| -rw-r--r-- | x11-toolkits/slingshot/files/patch-ab | 28 | ||||
| -rw-r--r-- | x11-toolkits/slingshot/pkg-plist | 21 |
3 files changed, 31 insertions, 26 deletions
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile index dba13402f477..5dd964b52ba3 100644 --- a/x11-toolkits/slingshot/Makefile +++ b/x11-toolkits/slingshot/Makefile @@ -3,7 +3,7 @@ # Date created: 5 March 1997 # Whom: Pedro Giffuni # -# $Id: Makefile,v 1.6 1998/09/21 22:15:59 steve Exp $ +# $Id: Makefile,v 1.7 1998/10/15 20:44:20 jseger Exp $ # DISTNAME= SlingShot2.1 @@ -12,11 +12,9 @@ CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.cdrom.com/pub/X11/R5contrib/ EXTRACT_SUFX= .tar.Z -MAINTAINER= giffunip@asme.org +MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview-lib - -BROKEN_ELF= yes +LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview WRKSRC= $(WRKDIR)/sspkg2.1 USE_X_PREFIX= yes diff --git a/x11-toolkits/slingshot/files/patch-ab b/x11-toolkits/slingshot/files/patch-ab index 3717c79dd00b..a9a029eb08d1 100644 --- a/x11-toolkits/slingshot/files/patch-ab +++ b/x11-toolkits/slingshot/files/patch-ab @@ -1,21 +1,27 @@ -*** config.sunos4x Fri Oct 22 12:35:02 1993 ---- config.fbsd Thu Apr 24 20:32:41 1997 +*** config.fbsd.orig Sun May 2 16:19:57 1999 +--- config.fbsd Sun May 2 16:30:41 1999 *************** -*** 1,8 **** +*** 1,11 **** - # @(#) config.sunos4x 1.6 92/10/27 +! # @(#) config.sunos4x 1.6 92/10/27 ! CONFIGPIC = -pic ! CONFIGSHAREDLIBLD = ld -o $@ -assert pure-text $? - SHAREDLIB = $(LIBDIR)/libsspkg.so.1.0 - SHAREDLIBDATA = $(LIBDIR)/libsspkg.sa.1.0 ---- 1,8 ---- +! SHAREDLIB = $(LIBDIR)/libsspkg.so.1.0 +! SHAREDLIBDATA = $(LIBDIR)/libsspkg.sa.1.0 - # @(#) config.sunos4x 1.6 92/10/27 + CONFIGTARGETS = $(SHAREDLIB) $(SHAREDLIBDATA) + +--- 1,11 ---- + +! # @(#) config.FreeBSD-ELF 1.6 99/10/27 ! CONFIGPIC = -fpic -! CONFIGSHAREDLIBLD = ld -o $@ -Bshareable $? +! CONFIGSHAREDLIBLD = ld -G -o $@ -h libsspkg.so.1 $? -lm -lc + +! SHAREDLIB = $(LIBDIR)/libsspkg.so.1 +! SHAREDLIBDATA = $(LIBDIR)/libsspkg.sa.1 + + CONFIGTARGETS = $(SHAREDLIB) $(SHAREDLIBDATA) - SHAREDLIB = $(LIBDIR)/libsspkg.so.1.0 - SHAREDLIBDATA = $(LIBDIR)/libsspkg.sa.1.0 diff --git a/x11-toolkits/slingshot/pkg-plist b/x11-toolkits/slingshot/pkg-plist index 0cd2e744d46c..0b73d8aa5e40 100644 --- a/x11-toolkits/slingshot/pkg-plist +++ b/x11-toolkits/slingshot/pkg-plist @@ -1,17 +1,17 @@ +include/sspkg/array.h include/sspkg/box.h -include/sspkg/tree.h -include/sspkg/rectobj.h -include/sspkg/list.h +include/sspkg/canshell.h include/sspkg/disp_list.h -include/sspkg/grip.h include/sspkg/drawobj.h -include/sspkg/canshell.h -include/sspkg/array.h +include/sspkg/grip.h +include/sspkg/list.h include/sspkg/patchlevel.h -lib/libsspkg.so.1.0 -lib/libsspkg.so -lib/libsspkg.sa.1.0 +include/sspkg/rectobj.h +include/sspkg/tree.h lib/libsspkg.a +lib/libsspkg.sa.1 +lib/libsspkg.so +lib/libsspkg.so.1 share/doc/SlingShot/README share/doc/SlingShot/appA.ps share/doc/SlingShot/appB.ps @@ -21,4 +21,5 @@ share/doc/SlingShot/appE.ps share/doc/SlingShot/ch1.ps share/doc/SlingShot/ch2.ps share/doc/SlingShot/ch3.ps - +@dirrm include/sspkg +@dirrm share/doc/SlingShot |