diff options
| author | Steve Price <steve@FreeBSD.org> | 1998-10-01 06:19:30 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1998-10-01 06:19:30 +0000 |
| commit | c64504dd955197b8e5ac0c5d59f329da7db21386 (patch) | |
| tree | b6a2802e62462fa7f82a39706a977ea95100b351 /cad | |
| parent | Now that Mesa-3.0 is in with a security fix, bring back the GL modes. (diff) | |
Discounting a minor glitch in -current's make(1) this will now build
in an ELF world.
Notes
Notes:
svn path=/head/; revision=13573
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/sis/Makefile | 4 | ||||
| -rw-r--r-- | cad/sis/files/patch-ab | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/cad/sis/Makefile b/cad/sis/Makefile index 9a5db2088bde..ddeb16b807c0 100644 --- a/cad/sis/Makefile +++ b/cad/sis/Makefile @@ -3,7 +3,7 @@ # Date created: 10 October 1997 # Whom: volf@oasis.IAEhv.nl # -# $Id: Makefile,v 1.1.1.1 1998/07/01 15:39:43 ghelmer Exp $ +# $Id: Makefile,v 1.2 1998/09/27 08:18:23 steve Exp $ # DISTNAME= sis-1.2 @@ -18,8 +18,6 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= volf@oasis.IAEhv.nl -BROKEN= build - MAKEFILE= Makefile.FreeBSD MAN1= espresso.1 jedi.1 nova.1 sis.1 sred.1 stamina.1 \ vst2blif.1 xsis.1 diff --git a/cad/sis/files/patch-ab b/cad/sis/files/patch-ab new file mode 100644 index 000000000000..8e3c6568e6bb --- /dev/null +++ b/cad/sis/files/patch-ab @@ -0,0 +1,12 @@ +--- xsis/Makefile.orig Thu Oct 1 01:05:09 1998 ++++ xsis/Makefile Thu Oct 1 01:05:48 1998 +@@ -40,6 +40,9 @@ + + LIBS = $(SIS)/lib/libsis.a + LIBS2 = -L$(X11)/lib -lXaw -lXmu -lXt -lXext -lX11 -lm ++.if $(PORTOBJFORMAT) == "elf" ++LIBS2 +=-Wl,-rpath,$(X11)/lib ++.endif + + # --------------------------------------------------------------------------- + |