diff options
author | Justin M. Seger <jseger@FreeBSD.org> | 1998-10-13 23:31:49 +0000 |
---|---|---|
committer | Justin M. Seger <jseger@FreeBSD.org> | 1998-10-13 23:31:49 +0000 |
commit | e96ccce158cf8eaf57dd551ae52aaeb3ffbc2e55 (patch) | |
tree | a04f33a458e3d8f6ea3408e1ebf10dda3005ab27 | |
parent | Unbreak. (diff) |
Unbreak.
Submitted by: steve
Diffstat (limited to '')
-rw-r--r-- | deskutils/xopps/Makefile | 4 | ||||
-rw-r--r-- | deskutils/xopps/files/patch-aa | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/deskutils/xopps/Makefile b/deskutils/xopps/Makefile index 64f453726aaa..143e37e19007 100644 --- a/deskutils/xopps/Makefile +++ b/deskutils/xopps/Makefile @@ -3,7 +3,7 @@ # Date created: 1 Ag 1997 # Whom: Pedro Giffuni (orig) # -# $Id: Makefile,v 1.5 1998/08/07 22:17:54 asami Exp $ +# $Id: Makefile,v 1.6 1998/10/12 12:47:37 jseger Exp $ # DISTNAME= xopps.1.13 @@ -13,8 +13,6 @@ MASTER_SITES= ftp://devvax.jpl.nasa.gov/pub/xopps/ MAINTAINER= ports@FreeBSD.org -BROKEN_ELF= yes - ALL_TARGET= USE_X_PREFIX= yes REQUIRES_MOTIF= yes diff --git a/deskutils/xopps/files/patch-aa b/deskutils/xopps/files/patch-aa index a03de7205fe5..ce2cdd1b2c2d 100644 --- a/deskutils/xopps/files/patch-aa +++ b/deskutils/xopps/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Jan 18 05:22:35 1997 -+++ Makefile Tue Aug 5 11:03:09 1997 +--- Makefile.orig Fri Jan 17 22:22:35 1997 ++++ Makefile Tue Oct 13 18:06:14 1998 @@ -142,13 +142,13 @@ # Installation locations (edit to suit your system) # @@ -19,12 +19,15 @@ # # You generally should not edit below this line -@@ -182,7 +182,7 @@ +@@ -182,7 +182,10 @@ LDFLAGS = $(OPTIMIZEFLAG) $(MACHDEFS) LOCAL_LIB = $(LIBROOT)/lib_incl_local/$(MACH) -LIBS = -lXm -lXt -lX11 +LIBS = -lXm -lXext -lXt -lX11 ++.if $(PORTOBJFORMAT) == "elf" ++LIBS+= -Wl,-rpath,$(X11BASE)/lib ++.endif SFOCLIBPATH = -L$(SFOCDIR)/lib -L/sfoc/lib -L$(TPSDIR)/lib -L/tps/lib FULLLIBPATH = $(LIBPATH) $(SFOCLIBPATH) $(MACHLIBPATH) |