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 /graphics/jbigkit | |
| 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 'graphics/jbigkit')
| -rw-r--r-- | graphics/jbigkit/Makefile | 2 | ||||
| -rw-r--r-- | graphics/jbigkit/files/patch-aa | 7 | ||||
| -rw-r--r-- | graphics/jbigkit/files/patch-ab | 12 |
3 files changed, 4 insertions, 17 deletions
diff --git a/graphics/jbigkit/Makefile b/graphics/jbigkit/Makefile index c349ff29bed3..62585ac54bf5 100644 --- a/graphics/jbigkit/Makefile +++ b/graphics/jbigkit/Makefile @@ -15,7 +15,7 @@ COMMENT= Lossless compression for bi-level images such as scanned pages, faxes WRKSRC= ${WRKDIR}/${PORTNAME} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= jbgtopbm.1 pbmtojbg.1 diff --git a/graphics/jbigkit/files/patch-aa b/graphics/jbigkit/files/patch-aa index 0377d047e905..bea5e3195a1d 100644 --- a/graphics/jbigkit/files/patch-aa +++ b/graphics/jbigkit/files/patch-aa @@ -36,7 +36,7 @@ clean: rm -f *~ core -@@ -36,3 +36,27 @@ +@@ -36,3 +36,22 @@ gzip -9f jbigkit-$(VERSION).tar ) mv ../jbigkit-$(VERSION).tar.gz $(HOME)/public_html/download/ cp CHANGES $(HOME)/public_html/jbigkit/ @@ -57,10 +57,5 @@ + ${BSD_INSTALL_DATA} libjbig/jbig.h ${PREFIX}/include + mkdir -p ${PREFIX}/lib + ${BSD_INSTALL_DATA} libjbig/libjbig.a ${PREFIX}/lib -+.if ${PORTOBJFORMAT} == elf + ${BSD_INSTALL_DATA} libjbig/libjbig.so.1 ${PREFIX}/lib + ln -sf libjbig.so.1 ${PREFIX}/lib/libjbig.so -+.else -+ ${BSD_INSTALL_DATA} libjbig/libjbig.so.1.1 ${PREFIX}/lib -+ ln -sf libjbig.so.1.1 ${PREFIX}/lib/libjbig.so -+.endif 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 |