diff options
author | Justin M. Seger <jseger@FreeBSD.org> | 1998-11-25 05:06:28 +0000 |
---|---|---|
committer | Justin M. Seger <jseger@FreeBSD.org> | 1998-11-25 05:06:28 +0000 |
commit | d57d33c65548773bf1859e72b5505ce398a739ca (patch) | |
tree | a656e451c71e7e7c0b7004a09a731c2b990891a0 /x11-toolkits | |
parent | Upgrade to v2.3.3. (diff) |
libtiff34->libtiff and include/tiff34/*.h -> include/*.h
Approved by: asami
Notes
Notes:
svn path=/head/; revision=14889
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/tkstep80/Makefile | 6 | ||||
-rw-r--r-- | x11-toolkits/tkstep80/files/patch-aa | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile index d969a5f1bd55..1f1ffe674f5d 100644 --- a/x11-toolkits/tkstep80/Makefile +++ b/x11-toolkits/tkstep80/Makefile @@ -3,7 +3,7 @@ # Date created: 06 November 1997 # Whom: Thomas Gellekum <tg@FreeBSD.ORG> # -# $Id: Makefile,v 1.15 1998/09/17 00:32:55 asami Exp $ +# $Id: Makefile,v 1.16 1998/09/19 05:46:07 steve Exp $ # DISTNAME= tk8.0p2 @@ -20,14 +20,14 @@ MAINTAINER= tg@FreeBSD.ORG LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80 \ Xpm.4:${PORTSDIR}/graphics/xpm \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - tiff34.1:${PORTSDIR}/graphics/tiff34 + tiff.1:${PORTSDIR}/graphics/tiff34 FETCH_BEFORE_ARGS= -b PATCH_DIST_ARGS= -p1 -d ${WRKDIR}/tk8.0 -E --quiet WRKSRC= ${WRKDIR}/tk8.0/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --enable-xpm --enable-step --enable-dnd \ - --enable-tiff --with-optimize="${CFLAGS} -I${PREFIX}/include -I${PREFIX}/include/tiff34" + --enable-tiff --with-optimize="${CFLAGS} -I${PREFIX}/include" CONFIGURE_ENV= PORTSDIR=${PORTSDIR} post-install: diff --git a/x11-toolkits/tkstep80/files/patch-aa b/x11-toolkits/tkstep80/files/patch-aa index 04df1b4db329..0e6759cbd6e5 100644 --- a/x11-toolkits/tkstep80/files/patch-aa +++ b/x11-toolkits/tkstep80/files/patch-aa @@ -43,15 +43,6 @@ RANLIB=":" else TK_SHARED_BUILD=0 -@@ -2480,7 +2487,7 @@ - - if test "$ok" = "yes" ; then - ENABLE_TIFF="-DENABLE_TIFF" -- EXTRA_LIBS="$EXTRA_LIBS -ltiff -ljpeg -lz" -+ EXTRA_LIBS="$EXTRA_LIBS -ltiff34 -ljpeg -lz" - IMAGE_OBJ="$IMAGE_OBJ tkImgTIFF.o" - else - ENABLE_TIFF="" @@ -2736,6 +2743,7 @@ s%@SHLIB_VERSION@%$SHLIB_VERSION%g s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g |