diff options
| author | Thomas Gellekum <tg@FreeBSD.org> | 1997-12-01 12:41:45 +0000 |
|---|---|---|
| committer | Thomas Gellekum <tg@FreeBSD.org> | 1997-12-01 12:41:45 +0000 |
| commit | 8e5ce1ebd5fbca6cdee1ea5f82d410ced3350ba8 (patch) | |
| tree | 5086a49a1c83a4e7ce209a7aede9ad6fdf38fa56 /x11-toolkits/tkstep80 | |
| parent | Add back @dirrm's. (diff) | |
Use the new location for the tiff34 headers.
Closes PR: 5160
Notes
Notes:
svn path=/head/; revision=8934
Diffstat (limited to 'x11-toolkits/tkstep80')
| -rw-r--r-- | x11-toolkits/tkstep80/Makefile | 5 | ||||
| -rw-r--r-- | x11-toolkits/tkstep80/files/patch-aa | 21 |
2 files changed, 17 insertions, 9 deletions
diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile index 12a941b1870c..2ecdde172de9 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.2 1997/11/26 08:00:21 tg Exp $ +# $Id: Makefile,v 1.3 1997/11/27 08:07:25 tg Exp $ # DISTNAME= tk8.0 @@ -21,13 +21,12 @@ LIB_DEPENDS= tcl80\\.1\\.:${PORTSDIR}/lang/tcl80 \ jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \ tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 -BROKEN= "Needs my private tiff34 patches currently" FETCH_BEFORE_ARGS= -b PATCH_DIST_ARGS= -p -d ${WRKDIR} -E --quiet WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shared --enable-xpm --enable-step --enable-dnd \ - --enable-tiff --with-optimize="${CFLAGS} -I${PREFIX}/include" + --enable-tiff --with-optimize="${CFLAGS} -I${PREFIX}/include -I${PREFIX}/include/tiff34" CONFIGURE_ENV= PORTSDIR=${PORTSDIR} post-install: diff --git a/x11-toolkits/tkstep80/files/patch-aa b/x11-toolkits/tkstep80/files/patch-aa index c39f29c64f77..229b3f5c2b1c 100644 --- a/x11-toolkits/tkstep80/files/patch-aa +++ b/x11-toolkits/tkstep80/files/patch-aa @@ -1,7 +1,7 @@ ---- configure.orig Fri Aug 15 22:17:52 1997 -+++ configure Wed Oct 1 10:50:54 1997 -@@ -662,14 +662,14 @@ - if test -n "$withval"; then +--- configure.orig Mon Dec 1 12:56:45 1997 ++++ configure Mon Dec 1 13:11:06 1997 +@@ -877,14 +877,14 @@ + withval="$with_tcl" TCL_BIN_DIR=$withval else - TCL_BIN_DIR=`cd ../../tcl8.0/unix; pwd` @@ -18,7 +18,7 @@ fi #-------------------------------------------------------------------- -@@ -688,6 +688,8 @@ +@@ -903,6 +903,8 @@ DL_LIBS=$TCL_DL_LIBS LD_FLAGS=$TCL_LD_FLAGS @@ -27,7 +27,16 @@ LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' # If Tcl and Tk are installed in different places, adjust the library -@@ -2271,6 +2273,7 @@ +@@ -2475,7 +2477,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="" +@@ -2731,6 +2733,7 @@ s%@SHLIB_VERSION@%$SHLIB_VERSION%g s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g |