Attachment 76479 Details for Bug 110237 – file.diff

[patch] file.diff

file.diff (text/plain), 2.43 KB, created by Martin Matuska on 2007-03-12 17:00:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2007-03-12 17:00:29 UTC

Size: 2.43 KB

patch

obsolete

>diff -Nbur x11-toolkits/tk82.orig/Makefile x11-toolkits/tk82/Makefile
>--- x11-toolkits/tk82.orig/Makefile	Fri Mar  9 10:49:17 2007
>+++ x11-toolkits/tk82/Makefile	Mon Mar 12 17:45:02 2007
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	tk
> PORTVERSION=	8.2.3
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	x11-toolkits tk82
> MASTER_SITES=	${MASTER_SITE_TCLTK}
> MASTER_SITE_SUBDIR=	tcl8_2
>@@ -30,12 +30,10 @@
> CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1
> MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}
> PLIST_SUB=	TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
>-PKGINSTALL=	${PKGDIR}/pkg-install.wish
>-PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.wish
> TCL82_PORT?=	lang/tcl82
> MANCOMPRESSED=	no
> 
>-OPTIONS=	TK82_MAN "Install tk 8.2 manpages" on \
>+OPTIONS=	TK82_MAN "Install tk 8.2 manpages" off \
> 		WISH_WRAPPER "Require wish wrapper from ports" off
> 
> .include <bsd.port.pre.mk>
>@@ -320,15 +318,11 @@
> 	${REINPLACE_CMD} \
> 		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
> 		${WRKSRC}/tkConfig.sh
>-.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK82_MAN)
>-	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
>-		${WRKSRC}/Makefile
>-.endif
> 
> post-install:
> 	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/
>-.if exists(${PKGINSTALL})
>-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
>+.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK82_MAN)
>+	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc
> .endif
> 
> test:
>diff -Nbur x11-toolkits/tk82.orig/files/patch-ab x11-toolkits/tk82/files/patch-ab
>--- x11-toolkits/tk82.orig/files/patch-ab	Mon Apr 24 15:46:33 2000
>+++ x11-toolkits/tk82/files/patch-ab	Mon Mar 12 17:43:15 2007
>@@ -1,5 +1,5 @@
>---- Makefile.in.orig	Tue Dec 14 23:00:19 1999
>-+++ Makefile.in	Mon Apr 24 09:41:33 2000
>+--- Makefile.in.orig	Wed Dec 15 05:00:19 1999
>++++ Makefile.in	Mon Mar 12 17:42:52 2007
> @@ -56,7 +56,9 @@
>  BIN_DIR =		$(exec_prefix)/bin
>  
>@@ -53,7 +53,14 @@
>  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
>  	rm -f ${STUB_LIB_FILE}
>  	@MAKE_STUB_LIB@
>-@@ -425,7 +433,7 @@
>+@@ -419,13 +427,13 @@
>+ 	TK_LIBRARY=@TK_SRC_DIR@/library; export TK_LIBRARY; \
>+ 	./tktest
>+ 
>+-install: all install-binaries install-libraries install-demos install-doc
>++install: all install-binaries install-libraries install-demos
>+ 
>+ # Note: before running ranlib below, must cd to target directory because
>  # some ranlibs write to current directory, and this might not always be
>  # possible (e.g. if installing as root).

Actions: View | Diff

Attachments on bug 110237: 76479