From a152a878b7d2d67c239f5ff20fbb852443024b96 Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Thu, 26 Feb 2009 14:19:53 +0000 Subject: - Disable install of function manpages by default - Add manual page for tclsh8.x and wish8.x - Bump PORTREVISION --- x11-toolkits/tk84/Makefile | 32 ++++++++++++++++++++------------ x11-toolkits/tk84/files/patch-ab | 33 ++++++++++++++++++++------------- x11-toolkits/tk84/pkg-plist | 4 ++-- 3 files changed, 42 insertions(+), 27 deletions(-) (limited to 'x11-toolkits/tk84') diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index 31259fdabf29..92e1a7bac113 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= 8.4.19 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= x11-toolkits tk MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -38,7 +38,7 @@ SUB_FILES= pkgIndex.tcl .if !defined(BUILDING_TK_THREADS) USE_TCL= 84 -OPTIONS= TK84_MAN "Install tk 8.4 manpages" on +OPTIONS= TK84_DOC "Install tk 8.4 function manpages" off .else USE_TK= ${SHORT_TK_VER} PLIST= ${PKGDIR}/pkg-plist.threads @@ -50,6 +50,12 @@ SUB_LIST+= THREADS_SUFFIX="${THREADS_SUFFIX}" .include +DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} + +.if !defined(NO_INSTALL_MANPAGES) +MAN1= wish${TCL_VER}${THREADS_SUFFIX}.1 +.endif + .if defined(BUILDING_TK_THREADS) CONFIGURE_ARGS+= --enable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}${THREADS_SUFFIX} CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ @@ -62,16 +68,9 @@ CONFIGURE_ENV+= ac_cv_path_tclsh="${TCLSH}" SUB_LIST+= TK_PROVIDE="" -.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK84_MAN) - -PLIST_SUB+= INSTMAN='@comment ' -.else - -DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} -PLIST_SUB+= INSTMAN='' +.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK84_DOC) -MAN1= wish.1 MAN3= 3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \ CanvTxtInfo.3 Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 \ CoordToWin.3 CrtCmHdlr.3 CrtErrHdlr.3 CrtGenHdlr.3 CrtImgType.3 \ @@ -385,6 +384,10 @@ post-patch: @(cd ${WRKSRC}/..; ${PATCH} -p0 < ${PATCHDIR}/extra-lastevent-patch) @${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|wish |wish${TCL_VER}${THREADS_SUFFIX} |g' -e 's|Wish |Wish${TCL_VER}${THREADS_SUFFIX} |g' \ + -e 's|wish\\fR|wish${TCL_VER}${THREADS_SUFFIX}\\fR|g' -e 's|Wish\\fR|Wish${TCL_VER}${THREADS_SUFFIX}\\fR|g' \ + -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ + ${WRKSRC}/../doc/wish.1 .if defined(BUILDING_TK_THREADS) @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ -e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \ @@ -416,15 +419,20 @@ do-install: post-install: ${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/ -.if !defined(BUILDING_TK_THREADS) && !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK84_MAN) ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR} +.if !defined(NO_INSTALL_MANPAGES) + ${MKDIR} ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/../doc/wish.1 ${MANPREFIX}/man/man1/wish${TCL_VER}${THREADS_SUFFIX}.1 +.if !defined(BUILDING_TK_THREADS) && defined(WITH_TK84_MAN) .for mp in ${MAN1} ${MAN3} ${MANN} @${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ ${WRKSRC}/../doc/${mp} .endfor @cd ${WRKSRC} && ${MAKE} install-doc ${MAKE_ENV} -.endif +.endif # !defined(BUILDING_TK_THREADS) && defined(WITH_TK84_MAN) + +.endif # !defined(NO_INSTALL_MANPAGES) regression-test: build cd ${WRKSRC}; ${MAKE} test diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab index ea781cd6c152..811954ede3dd 100644 --- a/x11-toolkits/tk84/files/patch-ab +++ b/x11-toolkits/tk84/files/patch-ab @@ -1,5 +1,5 @@ ---- Makefile.in.orig Thu Oct 19 19:27:34 2006 -+++ Makefile.in Mon Mar 12 18:18:40 2007 +--- Makefile.in.orig 2008-04-17 17:14:08.000000000 +0200 ++++ Makefile.in 2009-02-26 12:06:12.362017966 +0100 @@ -64,6 +64,8 @@ # Directory in which to install the include file tk.h: @@ -18,6 +18,15 @@ # The directory containing the Tcl library archive file appropriate # for this version of Tk: +@@ -107,7 +109,7 @@ + TK_DBGX = @TK_DBGX@ + + # Flag, 1: we're building a shared lib, 0 we're not +-TK_SHARED_BUILD = @TK_SHARED_BUILD@ ++TK_SHARED_BUILD = #@TK_SHARED_BUILD@ + + # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk + TK_PKG_DIR = @TK_PKG_DIR@ @@ -130,7 +132,7 @@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) @@ -36,7 +45,7 @@ # Additional search flags needed to find the various shared libraries # at run-time. The first symbol is for use when creating a binary -@@ -477,6 +479,8 @@ +@@ -478,6 +480,8 @@ default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h \ tkPort.h tkScrollbar.h tkText.h @@ -45,7 +54,7 @@ DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget all: binaries libraries doc -@@ -496,6 +500,12 @@ +@@ -497,6 +501,12 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@ rm -f $@ @MAKE_LIB@ @@ -58,7 +67,7 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ -@@ -601,7 +611,7 @@ +@@ -602,7 +612,7 @@ gdb ./wish --command=gdb.run rm gdb.run @@ -67,7 +76,7 @@ install: $(INSTALL_TARGETS) -@@ -614,7 +624,8 @@ +@@ -615,7 +625,8 @@ # some ranlibs write to current directory, and this might not always be # possible (e.g. if installing as root). @@ -77,7 +86,7 @@ @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \ do \ if [ ! -d $$i ] ; then \ -@@ -645,10 +656,15 @@ +@@ -646,10 +657,15 @@ $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \ $(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \ fi @@ -95,7 +104,7 @@ @if test "$(STUB_LIB_FILE)" != "" ; then \ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ @INSTALL_STUB_LIB@ ; \ -@@ -659,6 +675,7 @@ +@@ -660,6 +676,7 @@ @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ XLIB_INCLUDE_INSTALL_DIR=$(INCLUDE_INSTALL_DIR)/X11; fi; \ for i in $(INCLUDE_INSTALL_DIR) $${XLIB_INCLUDE_INSTALL_DIR} \ @@ -103,7 +112,7 @@ $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \ $(SCRIPT_INSTALL_DIR)/msgs; \ do \ -@@ -673,11 +690,14 @@ +@@ -674,11 +691,14 @@ chmod +x $(SRC_DIR)/install-sh; \ fi @echo "Installing header files"; @@ -122,7 +131,7 @@ @list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \ do \ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \ -@@ -748,20 +768,13 @@ +@@ -749,20 +769,10 @@ else true; \ fi; \ done; @@ -135,13 +144,11 @@ - @for i in $(TOP_DIR)/doc/*.3; do \ - $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \ - done - +- - @echo "Installing and cross-linking command (.n) docs"; - @for i in $(TOP_DIR)/doc/*.n; do \ - $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \ - done -+ @echo "Installing top-level (.1) docs"; -+ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.1 $(MAN1_INSTALL_DIR) + @echo "Installing C API (.3) docs"; + ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.3 $(MAN3_INSTALL_DIR) + @echo "Installing command (.n) docs"; diff --git a/x11-toolkits/tk84/pkg-plist b/x11-toolkits/tk84/pkg-plist index 325f2caca5de..09c11b9a4bab 100644 --- a/x11-toolkits/tk84/pkg-plist +++ b/x11-toolkits/tk84/pkg-plist @@ -159,8 +159,8 @@ lib/tk%%TK_VER%%/tkConfig.sh lib/tk%%TK_VER%%/tkfbox.tcl lib/tk%%TK_VER%%/unsupported.tcl lib/tk%%TK_VER%%/xmfbox.tcl -%%INSTMAN%%%%DATADIR%%/man.macros -%%INSTMAN%%@dirrm %%DATADIR%% +%%DATADIR%%/man.macros +@dirrm %%DATADIR%% @dirrm lib/tk%%TK_VER%%/demos/images @dirrm lib/tk%%TK_VER%%/demos @dirrm lib/tk%%TK_VER%%/images -- cgit v1.2.3