From 2df76eb0a73bb59d817aa60758a5f10e3e544c3b Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Tue, 30 Jan 2007 10:25:34 +0000
Subject: - Remove support for a.out format and PORTOBJFORMAT variable from
 individual   ports

With hat:	portmgr
---
 graphics/jbigkit/files/patch-ab | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'graphics/jbigkit/files/patch-ab')

diff --git a/graphics/jbigkit/files/patch-ab b/graphics/jbigkit/files/patch-ab
index 4f5889f3085f..85547868035a 100644
--- a/graphics/jbigkit/files/patch-ab
+++ b/graphics/jbigkit/files/patch-ab
@@ -1,6 +1,6 @@
 --- libjbig/Makefile.orig	Fri Apr 10 20:33:27 1998
 +++ libjbig/Makefile	Wed Sep 16 11:57:16 1998
-@@ -5,9 +5,16 @@
+@@ -5,9 +5,12 @@
  CC = gcc
  
  # Options for the compiler: A high optimization level is suggested
@@ -9,28 +9,20 @@
  
 -all: libjbig.a tstcodec
 +JBIGLIB=libjbig.a
-+.if ${PORTOBJFORMAT} == elf
 +SOJBIGLIB=libjbig.so.1
-+.else
-+SOJBIGLIB=libjbig.so.1.1
-+.endif
 +
 +all: libjbig.a $(SOJBIGLIB)
  
  tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
  	$(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
-@@ -18,10 +25,25 @@
+@@ -18,10 +25,21 @@
  	ar rc libjbig.a jbig.o jbig_tab.o
  	ranlib libjbig.a
  
 +$(SOJBIGLIB): jbig.so jbig_tab.so
 +	rm -f ${.TARGET}
-+.if ${PORTOBJFORMAT} == elf
 +	$(CC) -o ${.TARGET} -shared -Wl,-soname,${.TARGET} ${.ALLSRC}         
 +	ln -sf ${.TARGET} `echo ${.TARGET} | sed 's/\.so.*$$/.so/'`
-+.else
-+	ld -Bshareable -o ${.TARGET} ${.ALLSRC}
-+.endif
 +	
  jbig.o: jbig.c jbig.h
  
-- 
cgit v1.2.3