diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2007-01-30 10:25:34 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-01-30 10:25:34 +0000 |
| commit | 2df76eb0a73bb59d817aa60758a5f10e3e544c3b (patch) | |
| tree | 07e10c49034b87755dafb03956ad93c5363e0bb7 /x11 | |
| parent | 1c97f613254a72e0ae97ea8d817ebe38096d6949 (diff) | |
| download | ports-2df76eb0a73bb59d817aa60758a5f10e3e544c3b.tar.gz ports-2df76eb0a73bb59d817aa60758a5f10e3e544c3b.zip | |
- Remove support for a.out format and PORTOBJFORMAT variable from individual
ports
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=183698
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/9term/files/patch-ad | 4 | ||||
| -rw-r--r-- | x11/XFree86/Makefile | 16 | ||||
| -rw-r--r-- | x11/libdnd/files/patch-ab | 8 | ||||
| -rw-r--r-- | x11/libsx/files/patch-aa | 5 |
4 files changed, 3 insertions, 30 deletions
diff --git a/x11/9term/files/patch-ad b/x11/9term/files/patch-ad index 78905da2cbad..4a9f0f3cc3f4 100644 --- a/x11/9term/files/patch-ad +++ b/x11/9term/files/patch-ad @@ -1,6 +1,6 @@ --- 9term/Makefile.orig Mon Mar 14 13:50:54 1994 +++ 9term/Makefile Fri Feb 11 10:18:21 2000 -@@ -11,27 +11,31 @@ +@@ -11,27 +11,29 @@ # Define RISCOS for Mips RISC/os # Define BSDPTYS for BSD-style pty support # Define POSIXPTYS for POSIX ptys @@ -32,9 +32,7 @@ - +LIBS=../libtext/libtext.a $(SAMPATH)/libframe/libframe.a $(SAMPATH)/libXg/libXg.a +XLIBS= -lXt -lX11 -L${X11BASE}/lib -+.if $(PORTOBJFORMAT) == "elf" +XLIBS+=-Wl,-rpath,$(X11BASE)/lib -+.endif OBJECTS=9term.o command.o display.o pty.o $(TARGET): $(OBJECTS) diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile index 0929225a7f08..e9290056c615 100644 --- a/x11/XFree86/Makefile +++ b/x11/XFree86/Makefile @@ -111,20 +111,4 @@ pre-configure: pre-install: ${MKDIR} ${X11BASE} -post-install: -.if ${PORTOBJFORMAT} == "aout" -.for lib in PEX5 SM XIE Xi Xmu Xt oldX XThrStub - ${LN} -sf lib${lib}.so.6.0 ${PREFIX}/lib/lib${lib}.so -.endfor -.for lib in X11 Xaw Xtst - ${LN} -sf lib${lib}.so.6.1 ${PREFIX}/lib/lib${lib}.so -.endfor -.for lib in Xp - ${LN} -sf lib${lib}.so.6.2 ${PREFIX}/lib/lib${lib}.so -.endfor -.for lib in ICE Xext - ${LN} -sf lib${lib}.so.6.3 ${PREFIX}/lib/lib${lib}.so -.endfor -.endif - .include <bsd.port.post.mk> diff --git a/x11/libdnd/files/patch-ab b/x11/libdnd/files/patch-ab index c09a022ded94..08ad036d4c93 100644 --- a/x11/libdnd/files/patch-ab +++ b/x11/libdnd/files/patch-ab @@ -1,19 +1,13 @@ --- Makefile.in.orig Thu May 22 21:18:22 1997 +++ Makefile.in Sat Sep 26 21:59:37 1998 -@@ -13,6 +13,16 @@ +@@ -13,6 +13,10 @@ RANLIB = @RANLIB@ LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lXmu -lXaw -lXt -lX11 @X_EXTRA_LIBS@ -+.if $(PORTOBJFORMAT) == "elf" +LIBS+= -Wl,-rpath,$(X11BASE)/lib +SHLDFLAGS= -shared -x -soname $@ +DNDLIB= libDnd.so.1 +DNDPLUSLIB= libDnd++.so.1 -+.else -+SHLDFLAGS= -Bshareable -x -+DNDLIB= libDnd.so.1.0 -+DNDPLUSLIB= libDnd++.so.1.0 -+.endif prefix = @prefix@ exec_prefix = @exec_prefix@ diff --git a/x11/libsx/files/patch-aa b/x11/libsx/files/patch-aa index 551b99b67aeb..0183076a064c 100644 --- a/x11/libsx/files/patch-aa +++ b/x11/libsx/files/patch-aa @@ -28,14 +28,11 @@ # # libraries we need to link with... -@@ -83,5 +83,7 @@ +@@ -83,5 +83,5 @@ # LIBSX = ../src/libsx.a #LIBS = $(LIBSX) -lXaw -lXmu -lXt -lX11 -LIBS = $(LIBSX) -lXaw -lXmu -lXt -lX11 - +LIBS = $(LIBSX) -lXaw3d -lXmu -lXt -lX11 -lm -lXext -L$(X11BASE)/lib -+.if ${PORTOBJFORMAT} == "elf" +LIBS+= -Wl,-rpath,${X11BASE}/lib -+.endif -\ No newline at end of file |