diff options
Diffstat (limited to 'graphics/tiff')
| -rw-r--r-- | graphics/tiff/Makefile | 29 | ||||
| -rw-r--r-- | graphics/tiff/distinfo | 2 | ||||
| -rw-r--r-- | graphics/tiff/files/patch-aa | 177 | ||||
| -rw-r--r-- | graphics/tiff/files/patch-ab | 42 | ||||
| -rw-r--r-- | graphics/tiff/files/patch-ac | 24 | ||||
| -rw-r--r-- | graphics/tiff/pkg-descr | 7 | ||||
| -rw-r--r-- | graphics/tiff/pkg-plist | 84 |
7 files changed, 239 insertions, 126 deletions
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index ad9c4eb0c61e..50d38e3c694e 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,22 +1,31 @@ # New ports collection makefile for: tiff34 -# Version required: 3.4beta035 +# Version required: 3.4beta35 # Date created: 8 October 1996 # Whom: Richard Hwang <rhwang@bigpanda.com> # Mikhail Teterin <mi@aldan.ziplink.net> +# Jun-ichiro itojun Itoh <itojun@itojun.org> # -# $Id: Makefile,v 1.1.1.1 1997/01/09 10:48:52 max Exp $ +# $Id: Makefile,v 1.2 1997/01/09 12:52:52 max Exp $ # -DISTNAME= tiff-v3.4beta035 -PKGNAME= tiff-3.4b035 +# NOTE: +# To get rid of rumored incompatibility between libtiff3.3 and 3.4 +# (can somebody confirm it?) installation will be done as libtiff34.a, +# not libtiff.a. The port is made so that there's no overwrite +# for headers, libraries, and documents. (there may be overwrite of manuals) + +DISTNAME= tiff-v3.4 +PKGNAME= tiff-3.4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.sgi.com/graphics/tiff/ \ ftp://ftp.isri.unlv.edu/pub/mirror/tiff/ EXTRACT_SUFX= -tar.gz +MAINTENER= itojun@itojun.org + LIB_DEPENDS= jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg -BROKEN= "Libtiff might be incompatible with older library" +WRKSRC= ${WRKDIR}/tiff-v3.4 HAS_CONFIGURE= yes CONFIGURE_ARGS= --with-ZIP --with-JPEG --with-DIR_BIN=${PREFIX}/bin \ --with-DIR_LIB=${PREFIX}/lib --with-DIR_INC=${PREFIX}/include \ @@ -57,12 +66,14 @@ MAN3= TIFFCheckTile.3t TIFFClose.3t TIFFComputeStrip.3t TIFFComputeTile.3t \ TIFFmemset.3t TIFFquery.3t TIFFrealloc.3t TIFFsize.3t TIFFstrip.3t \ TIFFswab.3t TIFFtile.3t libtiff.3t +DOCDIR= ${PREFIX}/share/doc/tiff34 + post-install: .if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/tiff/images - ${INSTALL_DATA} ${WRKSRC}/html/*.html ${PREFIX}/share/doc/tiff - ${INSTALL_DATA} ${WRKSRC}/html/images/* ${PREFIX}/share/doc/tiff/images + @${MKDIR} ${DOCDIR}/images + ${INSTALL_DATA} ${WRKSRC}/html/*.html ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/html/images/* ${DOCDIR}/images .endif - /sbin/ldconfig -m ${PREFIX}/lib + ${LDCONFIG} -m ${PREFIX}/lib .include <bsd.port.mk> diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo index 7655525528a0..165482aec88c 100644 --- a/graphics/tiff/distinfo +++ b/graphics/tiff/distinfo @@ -1 +1 @@ -MD5 (tiff-v3.4beta035-tar.gz) = 42885f24e039e9ae72b092f787fa8b05 +MD5 (tiff-v3.4-tar.gz) = 2a7fbbccdb805e39489176f8eb9a703b diff --git a/graphics/tiff/files/patch-aa b/graphics/tiff/files/patch-aa index d7dc94943ef4..63004e013673 100644 --- a/graphics/tiff/files/patch-aa +++ b/graphics/tiff/files/patch-aa @@ -1,15 +1,172 @@ ---- configure.orig Tue Jun 11 07:24:56 1996 -+++ configure Sun Dec 29 05:15:45 1996 -@@ -1135,8 +1135,10 @@ - TIFFLIBREF='-L${DEPTH}/libtiff -ltiff' +--- ./libtiff/Makefile.in.orig Tue Apr 30 07:16:21 1996 ++++ ./libtiff/Makefile.in Sun May 25 22:38:37 1997 +@@ -62,7 +62,7 @@ + # + CONF_LIBRARY=@CONF_JPEG@ @CONF_ZIP@ + COPTS = @GCOPTS@ +-OPTIMIZER=-O ++#OPTIMIZER=-O + CFLAGS = @ENVOPTS@ @LIBCOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} ${CONF_LIBRARY} + # + SRCS = \ +@@ -133,7 +133,7 @@ + tif_write.o \ + tif_zip.o \ + ${NULL} +-TARGETS = libtiff.a ++TARGETS = libtiff34.a + + all: ${TARGETS} + if [ @DSO@dso != nodso ]; then \ +@@ -142,9 +142,9 @@ + true; \ + fi + +-libtiff.a: ${OBJS} +- ${AR} ${AROPTS} libtiff.a $? +- ${RANLIB} libtiff.a ++libtiff34.a: ${OBJS} ++ ${AR} ${AROPTS} libtiff34.a $? ++ ${RANLIB} libtiff34.a + + # + # NB: The configure script verifies that the configured +@@ -159,47 +159,49 @@ + + # default IRIX DSO building rule + IRIXdso: ${OBJS} +- ${CC} -o libtiff.@DSOSUF@ -shared -rdata_shared \ ++ ${CC} -o libtiff34.@DSOSUF@ -shared -rdata_shared \ + -check_registry ${SRCDIR}/../port/irix/so_locations \ + -quickstart_info \ + ${OBJS} @LIBJPEG@ @LIBGZ@ + touch $@ + # special rule for IRIX 5.2 + IRIX52dso: ${OBJS} +- ${LD} -elf -o libtiff.@DSOSUF@ -shared -no_unresolved -all ${OBJS} \ ++ ${LD} -elf -o libtiff34.@DSOSUF@ -shared -no_unresolved -all ${OBJS} \ + @LIBJPEG@ @LIBGZ@ -lc -lm + touch $@ + # Solaris 2.4 + SOLARISdso: ${OBJS} +- ${LD} -L@DIR_LIB@ -G -o libtiff.@DSOSUF@ ${OBJS} ++ ${LD} -L@DIR_LIB@ -G -o libtiff34.@DSOSUF@ ${OBJS} + touch $@ + # HP-UX A.09.03 + HPUXdso: ${OBJS} +- ${LD} +b@DIR_LIB@ -b -o libtiff.@DSOSUF@ ${OBJS} ++ ${LD} +b@DIR_LIB@ -b -o libtiff34.@DSOSUF@ ${OBJS} + touch $@ + # AIX 2.3.5 and 4.1.1 + AIXdso: ${OBJS} +- rm -f libtiff.syms shr.o +- echo "#!" > libtiff.syms +- /bin/dump -g libtiff.a | sed -n -e \ ++ rm -f libtiff34.syms shr.o ++ echo "#!" > libtiff34.syms ++ /bin/dump -g libtiff34.a | sed -n -e \ + 's/^[ ]*[0-9][0-9]*[ ]*\([^ .][^ ]*\)$$/\1/p' \ +- >> libtiff.syms +- ${LD} -o shr.o libtiff.a -H512 -T512 -bM\:SRE \ +- -bE\:libtiff.syms @LIBJPEG@ @LIBGZ@ -lc -lm -L@DIR_LIB@ +- rm -f libtiff.syms libtiff.@DSOSUF@ +- ${AR} ${AROPTS} libtiff.@DSOSUF@ shr.o ++ >> libtiff34.syms ++ ${LD} -o shr.o libtiff34.a -H512 -T512 -bM\:SRE \ ++ -bE\:libtiff34.syms @LIBJPEG@ @LIBGZ@ -lc -lm -L@DIR_LIB@ ++ rm -f libtiff34.syms libtiff34.@DSOSUF@ ++ ${AR} ${AROPTS} libtiff34.@DSOSUF@ shr.o + rm -f shr.o + touch $@ + # linux ELF shared lib rule + LINUXdso: ${OBJS} +- ${CC} -shared -Wl,-soname,libtiff.@DSOSUF@ \ +- -o libtiff.@DSOSUF_VERSION@ ${OBJS} @LIBJPEG@ @LIBGZ@ +- @LN@ @LN_S@ libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@ ++ ${CC} -shared -Wl,-soname,libtiff34.@DSOSUF@ \ ++ -o libtiff34.@DSOSUF_VERSION@ ${OBJS} @LIBJPEG@ @LIBGZ@ ++ @LN@ @LN_S@ libtiff34.@DSOSUF_VERSION@ libtiff34.@DSOSUF@ + touch $@ + # OSF/1 3.2 shared lib rule + OSFdso: ${OBJS} +- ${LD} -o libtiff.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm +- ++ ${LD} -o libtiff34.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm ++FREEBSDdso: ${OBJS} ++ ${LD} -Bshareable -o libtiff34.@DSOSUF_VERSION@ ${OBJS} ++ touch $@ + + ${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h + ${OBJS}: ${SRCDIR}/tiffcomp.h ${SRCDIR}/tiffiop.h ${SRCDIR}/tiffconf.h +@@ -300,23 +302,23 @@ + installHdrs: ${INCS} + ${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_INC@ + for i in ${INCS}; do \ +- f=`basename $$i`; \ ++ f=`basename $$i | sed -e 's/\.h/34.h/'`; \ + ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_INC@ \ + -src $$i -O $$f; \ + done + installDSO: @DSO@dso + if [ @DSOSUF_VERSION@ != @DSOSUF@ ]; then \ + ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@ \ +- -O libtiff.@DSOSUF_VERSION@; \ ++ -O libtiff34.@DSOSUF_VERSION@; \ + ${INSTALL} -idb tiff.sw.tools -F @DIR_LIB@ \ +- -ln libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@; \ ++ -lns libtiff34.@DSOSUF_VERSION@ -O libtiff34.@DSOSUF@; \ + else \ + ${INSTALL} -idb tiff.sw.tools -m 444 -F @DIR_LIB@ \ +- -O libtiff.@DSOSUF@; \ ++ -O libtiff34.@DSOSUF@; \ + fi + install: all installHdrs + ${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_LIB@ +- ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_LIB@ -O libtiff.a ++ ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_LIB@ -O libtiff34.a + if [ @DSO@dso != nodso ]; then \ + ${MAKE} installDSO; \ + else \ +@@ -327,4 +329,4 @@ + rm -f ${TARGETS} ${OBJS} core a.out \ + mkg3states tif_fax3sm.c \ + mkversion version.h \ +- libtiff.a libtiff.@DSOSUF@ libtiff.@DSOSUF_VERSION@ *dso ++ libtiff34.a libtiff34.@DSOSUF@ libtiff34.@DSOSUF_VERSION@ *dso +--- ./tools/Makefile.in.orig Tue Apr 30 07:16:37 1996 ++++ ./tools/Makefile.in Sun May 25 22:37:20 1997 +@@ -43,14 +43,14 @@ + INSTALL = @INSTALL@ + # + COPTS = @GCOPTS@ +-OPTIMIZER=-O ++#OPTIMIZER=-O + IPATH = -I. -I${SRCDIR} -I${LIBDIR} +-CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} ++CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} -L../libtiff + # +-LIBTIFF = ${DEPTH}/libtiff/libtiff.@DSOSUF@ ++LIBTIFF = ${DEPTH}/libtiff/libtiff34.@DSOSUF_VERSION@ + LIBJPEG = @LIBJPEG@ + LIBGZ = @LIBGZ@ +-LIBS = ${LIBTIFF} ${LIBJPEG} ${LIBGZ} @LIBPORT@ @MACHDEPLIBS@ ++LIBS = ${LIBTIFF} ${LIBJPEG} ${LIBGZ} @LIBPORT@ @MACHDEPLIBS@ -ltiff34 + # + OBJS= \ + fax2tiff.o \ +--- ./configure.orig Tue Apr 30 07:16:17 1996 ++++ ./configure Sun May 25 22:37:20 1997 +@@ -1140,6 +1140,13 @@ + DSOOPTS='-shared' + DSO=OSF ;; - *-freebsd*) -- DSOSUF=so.${DIST_MAJOR}.0 -- LIBCOPTS='-fpic -fPIC' ++ *-freebsd*) + DSOSUF=so + DSOSUF_VERSION=${DSOSUF}.4.0 + LIBCOPTS='-fpic -DPIC' + DSOOPTS='-Bshareable' - DSO=FREEBSD - TIFFLIBREF='-L${DEPTH}/libtiff -ltiff' - ;; ++ DSO=FREEBSD ++ ;; + *) DSO=no;; + esac + test -z "$DSOSUF_VERSION" && DSOSUF_VERSION=${DSOSUF} diff --git a/graphics/tiff/files/patch-ab b/graphics/tiff/files/patch-ab deleted file mode 100644 index ef15901b3476..000000000000 --- a/graphics/tiff/files/patch-ab +++ /dev/null @@ -1,42 +0,0 @@ ---- libtiff/Makefile.in.orig Tue Jun 11 00:25:00 1996 -+++ libtiff/Makefile.in Tue Dec 31 13:30:39 1996 -@@ -62,7 +62,7 @@ - # - CONF_LIBRARY=@CONF_JPEG@ @CONF_ZIP@ - COPTS = @GCOPTS@ --OPTIMIZER=-O -+#OPTIMIZER=-O - CFLAGS = @ENVOPTS@ @LIBCOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} ${CONF_LIBRARY} - # - SRCS = \ -@@ -190,8 +190,8 @@ - ${AR} ${AROPTS} libtiff.@DSOSUF@ shr.o - rm -f shr.o - touch $@ --# NetBSD 1.1 or FreeBSD --NETBSDdso FREEBSDdso: ${OBJS} -+# NetBSD 1.1 -+NETBSDdso: ${OBJS} - @rm -f libtiff_pic.a - @${AR} cq libtiff_pic.a `lorder ${OBJS} | tsort -q` - ${RANLIB} libtiff_pic.a -@@ -204,6 +204,10 @@ - -o libtiff.@DSOSUF_VERSION@ ${OBJS} @LIBJPEG@ @LIBGZ@ - @LN@ @LN_S@ libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@ - touch $@ -+# FreeBSD shared lib rule -+FREEBSDdso: ${OBJS} -+ ${LD} -Bshareable -o libtiff.@DSOSUF_VERSION@ ${OBJS} -+ touch $@ - # OSF/1 3.2 shared lib rule - OSFdso: ${OBJS} - ${LD} -o libtiff.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm -@@ -317,7 +321,7 @@ - ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@ \ - -O libtiff.@DSOSUF_VERSION@; \ - ${INSTALL} -idb tiff.sw.tools -F @DIR_LIB@ \ -- -ln libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@; \ -+ -lns libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@; \ - else \ - ${INSTALL} -idb tiff.sw.tools -m 444 -F @DIR_LIB@ \ - -O libtiff.@DSOSUF@; \ diff --git a/graphics/tiff/files/patch-ac b/graphics/tiff/files/patch-ac deleted file mode 100644 index b59336bffca4..000000000000 --- a/graphics/tiff/files/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ ---- tools/Makefile.in.orig Tue Jun 11 00:25:22 1996 -+++ tools/Makefile.in Tue Dec 31 13:40:41 1996 -@@ -43,17 +43,17 @@ - INSTALL = @INSTALL@ - # - COPTS = @GCOPTS@ --OPTIMIZER=-O -+#OPTIMIZER=-O - IPATH = -I. -I${SRCDIR} -I${LIBDIR} --CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} -+CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} -L../libtiff - # --TIFFLIB = ${DEPTH}/libtiff/libtiff.@DSOSUF@ -+TIFFLIB = ${DEPTH}/libtiff/libtiff.@DSOSUF_VERSION@ - LIBJPEG = @LIBJPEG@ - LIBGZ = @LIBGZ@ - LIBTIFF = @TIFFLIBREF@ - LIBPORT = @LIBPORT@ - MACHLIBS= @MACHDEPLIBS@ --LIBS = ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS} -+LIBS = ${LIBJPEG} ${LIBGZ} @LIBPORT@ @MACHDEPLIBS@ -ltiff - # - OBJS= \ - fax2tiff.o \ diff --git a/graphics/tiff/pkg-descr b/graphics/tiff/pkg-descr index 4f923f7f805f..68d62094f671 100644 --- a/graphics/tiff/pkg-descr +++ b/graphics/tiff/pkg-descr @@ -15,3 +15,10 @@ SGI has also added html-documentation in addition to man-pages. TIFF web site: http://www-mipl.jpl.nasa.gov/~ndr/tiff Master FTP site: ftp://ftp.sgi.com/graphics/tiff + + +NOTE: Since it is suspected that there's incompatibility between +libtiff 3.4 and previous releases, we install this kit as follows. + /usr/local/include/tiff34.h + /usr/local/include/tiffio34.h + /usr/local/lib/libtiff34.a diff --git a/graphics/tiff/pkg-plist b/graphics/tiff/pkg-plist index 46c86658485b..da86f0193935 100644 --- a/graphics/tiff/pkg-plist +++ b/graphics/tiff/pkg-plist @@ -1,5 +1,6 @@ -lib/libtiff.a -lib/libtiff.so.4.0 +lib/libtiff34.a +lib/libtiff34.so.4.0 +lib/libtiff34.so @exec /sbin/ldconfig -m %D/lib bin/fax2tiff bin/fax2ps @@ -18,8 +19,8 @@ bin/tiffdump bin/tiffinfo bin/tiffmedian bin/tiffsplit -include/tiff.h -include/tiffio.h +include/tiff34.h +include/tiffio34.h man/man1/fax2ps.1.gz man/man1/fax2tiff.1.gz man/man1/gif2tiff.1.gz @@ -125,39 +126,42 @@ man/man3/TIFFstrip.3t.gz man/man3/TIFFswab.3t.gz man/man3/TIFFtile.3t.gz man/man3/libtiff.3t.gz -share/doc/tiff/bugs.html -share/doc/tiff/build.html -share/doc/tiff/contrib.html -share/doc/tiff/document.html -share/doc/tiff/images.html -share/doc/tiff/index.html -share/doc/tiff/internals.html -share/doc/tiff/intro.html -share/doc/tiff/libtiff.html -share/doc/tiff/misc.html -share/doc/tiff/support.html -share/doc/tiff/tools.html -share/doc/tiff/v3.4beta007.html -share/doc/tiff/v3.4beta016.html -share/doc/tiff/v3.4beta018.html -share/doc/tiff/v3.4beta024.html -share/doc/tiff/v3.4beta028.html -share/doc/tiff/v3.4beta029.html -share/doc/tiff/v3.4beta031.html -share/doc/tiff/v3.4beta032.html -share/doc/tiff/v3.4beta033.html -share/doc/tiff/v3.4beta034.html -share/doc/tiff/images/back.gif -share/doc/tiff/images/bali.jpg -share/doc/tiff/images/cat.gif -share/doc/tiff/images/cover.jpg -share/doc/tiff/images/cramps.gif -share/doc/tiff/images/jello.jpg -share/doc/tiff/images/jim.gif -share/doc/tiff/images/note.gif -share/doc/tiff/images/oxford.gif -share/doc/tiff/images/quad.jpg -share/doc/tiff/images/ring.gif -share/doc/tiff/images/smallliz.jpg -share/doc/tiff/images/strike.gif -share/doc/tiff/images/warning.gif +share/doc/tiff34/bugs.html +share/doc/tiff34/build.html +share/doc/tiff34/contrib.html +share/doc/tiff34/document.html +share/doc/tiff34/images.html +share/doc/tiff34/index.html +share/doc/tiff34/internals.html +share/doc/tiff34/intro.html +share/doc/tiff34/libtiff.html +share/doc/tiff34/misc.html +share/doc/tiff34/support.html +share/doc/tiff34/tools.html +share/doc/tiff34/v3.4beta007.html +share/doc/tiff34/v3.4beta016.html +share/doc/tiff34/v3.4beta018.html +share/doc/tiff34/v3.4beta024.html +share/doc/tiff34/v3.4beta028.html +share/doc/tiff34/v3.4beta029.html +share/doc/tiff34/v3.4beta031.html +share/doc/tiff34/v3.4beta032.html +share/doc/tiff34/v3.4beta033.html +share/doc/tiff34/images/back.gif +share/doc/tiff34/images/bali.jpg +share/doc/tiff34/images/cat.gif +share/doc/tiff34/images/cover.jpg +share/doc/tiff34/images/cramps.gif +share/doc/tiff34/images/dave.gif +share/doc/tiff34/images/info.gif +share/doc/tiff34/images/jello.jpg +share/doc/tiff34/images/jim.gif +share/doc/tiff34/images/note.gif +share/doc/tiff34/images/oxford.gif +share/doc/tiff34/images/quad.jpg +share/doc/tiff34/images/ring.gif +share/doc/tiff34/images/smallliz.jpg +share/doc/tiff34/images/strike.gif +share/doc/tiff34/images/warning.gif +@dirrm share/doc/tiff34/images +@dirrm share/doc/tiff34 |