aboutsummaryrefslogtreecommitdiff
path: root/graphics/jbigkit
diff options
context:
space:
mode:
authorScott Mace <smace@FreeBSD.org>1998-09-14 22:19:14 +0000
committerScott Mace <smace@FreeBSD.org>1998-09-14 22:19:14 +0000
commitf74a079f9c9fb5055313b9b80853a960ceb23b23 (patch)
treeb02d5df6143d656f990839ec1732b4647f7f6ff9 /graphics/jbigkit
parent196cf84ecb26ca0c7aeb4426bc42f9e3633941aa (diff)
downloadports-f74a079f9c9fb5055313b9b80853a960ceb23b23.tar.gz
ports-f74a079f9c9fb5055313b9b80853a960ceb23b23.zip
Notes
Diffstat (limited to 'graphics/jbigkit')
-rw-r--r--graphics/jbigkit/Makefile4
-rw-r--r--graphics/jbigkit/files/patch-aa14
-rw-r--r--graphics/jbigkit/files/patch-ab23
-rw-r--r--graphics/jbigkit/pkg-plist3
4 files changed, 26 insertions, 18 deletions
diff --git a/graphics/jbigkit/Makefile b/graphics/jbigkit/Makefile
index 21ababca6d23..7d45bbe3c819 100644
--- a/graphics/jbigkit/Makefile
+++ b/graphics/jbigkit/Makefile
@@ -3,7 +3,7 @@
# Date created: 19 November 1996
# Whom: mi
#
-# $Id: Makefile,v 1.3 1997/07/17 15:12:42 max Exp $
+# $Id: Makefile,v 1.4 1998/06/25 07:07:12 vanilla Exp $
#
DISTNAME= jbigkit-1.0
@@ -21,6 +21,6 @@ post-install:
${MKDIR} ${PREFIX}/share/doc/jbig
${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.doc ${PREFIX}/share/doc/jbig
.endif
- ${LDCONFIG} -m ${PREFIX}/lib
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.include <bsd.port.mk>
diff --git a/graphics/jbigkit/files/patch-aa b/graphics/jbigkit/files/patch-aa
index 3023c18325d1..5c1736d1bad3 100644
--- a/graphics/jbigkit/files/patch-aa
+++ b/graphics/jbigkit/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig Sat Apr 11 09:34:54 1998
-+++ Makefile Thu Jun 25 13:54:14 1998
-@@ -2,13 +2,13 @@
+--- Makefile.orig Fri Apr 10 20:34:54 1998
++++ Makefile Mon Sep 14 16:45:26 1998
+@@ -2,13 +2,14 @@
# $Id: Makefile,v 1.5 1998-04-11 02:34:53+01 mgk25 Rel $
# Select an ANSI/ISO C compiler here, GNU gcc is recommended
@@ -14,10 +14,11 @@
-CFLAGS = $(CCFLAGS) -I../libjbig
+CFLAGS += -I../libjbig
++
all: lib pbm
@echo "Enter 'make test' in order to start some automatic tests."
-@@ -19,9 +19,9 @@
+@@ -19,9 +20,9 @@
pbm: lib
(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
@@ -30,7 +31,7 @@
clean:
rm -f *~ core
-@@ -31,3 +31,19 @@
+@@ -31,3 +32,20 @@
distribution: clean
rm -f libjbig/libjbig.a
(cd ..; tar -c -v --exclude RCS -f jbigkit.tar jbigkit)
@@ -49,4 +50,5 @@
+ install -c -m 644 -o bin -g bin libjbig/jbig.h ${PREFIX}/include
+ mkdir -p ${PREFIX}/lib
+ install -c -m 644 -o bin -g bin libjbig/libjbig.a ${PREFIX}/lib
-+ install -c -m 644 -o bin -g bin libjbig/libjbig.so.1.0 ${PREFIX}/lib
++ install -c -m 644 -o bin -g bin libjbig/libjbig.so.1 ${PREFIX}/lib
++ (cd ${PREFIX}/lib; ln -sf libjbig.so.1 libjbig.so)
diff --git a/graphics/jbigkit/files/patch-ab b/graphics/jbigkit/files/patch-ab
index 93b32951c83c..39af872b5874 100644
--- a/graphics/jbigkit/files/patch-ab
+++ b/graphics/jbigkit/files/patch-ab
@@ -1,5 +1,5 @@
---- libjbig/Makefile.orig Thu Jun 25 13:26:01 1998
-+++ libjbig/Makefile Thu Jun 25 13:29:44 1998
+--- libjbig/Makefile.orig Fri Apr 10 20:33:27 1998
++++ libjbig/Makefile Mon Sep 14 16:45:39 1998
@@ -5,9 +5,9 @@
CC = gcc
@@ -8,25 +8,30 @@
+CFLAGS += -Wall -ansi -pedantic
-all: libjbig.a tstcodec
-+all: libjbig.a libjbig.so.1.0
++all: libjbig.a libjbig.so.1
tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
$(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
-@@ -18,7 +18,17 @@
+@@ -18,10 +18,21 @@
ar rc libjbig.a jbig.o jbig_tab.o
ranlib libjbig.a
-+libjbig.so.1.0: jbig.so jbig_tab.so
-+ rm -f libjbig.so.1.0
-+ ld -Bshareable -o ${.TARGET} ${.ALLSRC}
++libjbig.so.1: jbig.so jbig_tab.so
++ rm -f libjbig.so.1
++ $(CC) -o ${.TARGET} -shared -Wl,-rpath,${PREFIX}/lib -Wl,-soname,${.TARGET} ${.ALLSRC}
++ ln -sf libjbig.so.1 libjbig.so
+
jbig.o: jbig.c jbig.h
-+
+
+.SUFFIXES: .c .so
+.c.so:
+ ${CC} -c -fpic -DPIC ${CFLAGS} ${.IMPSRC} -o ${.TARGET}
+jbig.so: jbig.c jbig.h
+jbig_tab.so: jbig_tab.c
-
++
test: tstcodec
./tstcodec
+
+ clean:
+- rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec
++ rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec *.so libjbig.so.1 libjbig.a
diff --git a/graphics/jbigkit/pkg-plist b/graphics/jbigkit/pkg-plist
index dfbb87683bf1..0d6a567a5141 100644
--- a/graphics/jbigkit/pkg-plist
+++ b/graphics/jbigkit/pkg-plist
@@ -2,7 +2,8 @@ include/jbig.h
bin/pbmtojbg
bin/jbgtopbm
lib/libjbig.a
-lib/libjbig.so.1.0
+lib/libjbig.so.1
+lib/libjbig.so
@exec /sbin/ldconfig -m %B
@unexec /sbin/ldconfig -R
share/doc/jbig/jbig.doc