1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00

Decouple tiff and tiff34. tiff34 now installs its headers into

${PREFIX}/include/tiff34, it no longer renames them.
This commit is contained in:
Thomas Gellekum 1997-12-01 07:49:16 +00:00
parent 1946179601
commit 56706af05f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=8924
4 changed files with 53 additions and 98 deletions

View File

@ -1,19 +1,13 @@
# New ports collection makefile for: tiff34
# Version required: 3.4beta35
# New ports collection makefile for: tiff
# Version required: 3.4
# 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.3 1997/05/26 02:16:32 asami Exp $
# $Id: Makefile,v 1.4 1997/11/05 09:34:56 tg Exp $
#
# 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
@ -25,10 +19,10 @@ MAINTAINER= itojun@itojun.org
LIB_DEPENDS= jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg
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 \
--with-DIR_LIB=${PREFIX}/lib \
--with-DIR_INC=${PREFIX}/include/tiff34 \
--with-CC="${CC}" --with-GCOPTS="${CFLAGS}" \
--with-DIRS_LIBINC=${PREFIX}/include \
--with-DIR_GZLIB=/usr/lib \
@ -66,7 +60,7 @@ 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
DOCDIR= ${PREFIX}/share/doc/tiff
post-install:
.if !defined(NOPORTDOCS)
@ -74,7 +68,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/html/*.html ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/html/images/* ${DOCDIR}/images
.endif
perl -pi -e 's/\"tiff.h\"/\"tiff34\.h\"/g;' ${PREFIX}/include/tiffio34.h
${LDCONFIG} -m ${PREFIX}/lib
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
--- libtiff/Makefile.in.orig Tue Apr 30 07:16:21 1996
+++ libtiff/Makefile.in Fri Aug 22 00:49:37 1997
--- libtiff/Makefile.in.orig Tue Apr 30 00:16:21 1996
+++ libtiff/Makefile.in Thu Nov 6 15:07:08 1997
@@ -62,7 +62,7 @@
#
CONF_LIBRARY=@CONF_JPEG@ @CONF_ZIP@
@ -103,8 +103,7 @@
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/'`; \
f=`basename $$i`; \
${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_INC@ \
-src $$i -O $$f; \
done
@ -134,40 +133,3 @@
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 = ${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
+ DSOSUF_VERSION=${DSOSUF}.1.0
+ LIBCOPTS='-fpic -DPIC'
+ DSOOPTS='-Bshareable'
+ DSO=FREEBSD
+ ;;
*) DSO=no;;
esac
test -z "$DSOSUF_VERSION" && DSOSUF_VERSION=${DSOSUF}

View File

@ -19,6 +19,6 @@ 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/include/tiff34/tiff.h
/usr/local/include/tiff34/tiffio.h
/usr/local/lib/libtiff34.a

View File

@ -1,6 +1,5 @@
lib/libtiff34.a
lib/libtiff34.so.1.0
lib/libtiff34.so
@exec /sbin/ldconfig -m %D/lib
bin/fax2tiff
bin/fax2ps
@ -19,8 +18,8 @@ bin/tiffdump
bin/tiffinfo
bin/tiffmedian
bin/tiffsplit
include/tiff34.h
include/tiffio34.h
include/tiff34/tiff.h
include/tiff34/tiffio.h
man/man1/fax2ps.1.gz
man/man1/fax2tiff.1.gz
man/man1/gif2tiff.1.gz
@ -126,42 +125,43 @@ man/man3/TIFFstrip.3t.gz
man/man3/TIFFswab.3t.gz
man/man3/TIFFtile.3t.gz
man/man3/libtiff.3t.gz
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
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/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/dave.gif
share/doc/tiff/images/info.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
@dirrm share/doc/tiff/images
@dirrm share/doc/tiff
@dirrm include/tiff34