svn commit: r301975 - in head: lang/tcl85 x11-toolkits/tk85

[Martin Matuska]

Author: mm
Date: Fri Aug  3 22:34:53 2012
New Revision: 301975
URL: http://svn.freebsd.org/changeset/ports/301975

Log:
  Always install tclsh and wish manual pages.

Modified:
  head/lang/tcl85/Makefile
  head/x11-toolkits/tk85/Makefile

Modified: head/lang/tcl85/Makefile
==============================================================================
--- head/lang/tcl85/Makefile	Fri Aug  3 21:32:55 2012	(r301974)
+++ head/lang/tcl85/Makefile	Fri Aug  3 22:34:53 2012	(r301975)
@@ -67,9 +67,7 @@ PLIST_SUB+=		TZDATA=""
 PLIST_SUB+=		TZDATA="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
 MAN1=	tclsh${TCL_VER}${THREADS_SUFFIX}.1
-.endif
 
 .if defined(BUILDING_TCL_THREADS)
 . if (${ARCH} == "ia64")
@@ -765,7 +763,6 @@ post-install:
 .endif
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/../doc/tclsh.1 ${MANPREFIX}/man/man1/tclsh${TCL_VER}${THREADS_SUFFIX}.1
 .if !defined(BUILDING_TCL_THREADS) && ${PORT_OPTIONS:MTCL85_MAN}
@@ -777,8 +774,6 @@ post-install:
 
 .endif # !defined(BUILDING_TCL_THREADS) && ${PORT_OPTIONS:MTCL85_MAN}
 
-.endif # ${PORT_OPTIONS:MDOCS}
-
 regression-test:	build
 	cd ${WRKSRC} && LC_ALL=C ${MAKE} test
 

Modified: head/x11-toolkits/tk85/Makefile
==============================================================================
--- head/x11-toolkits/tk85/Makefile	Fri Aug  3 21:32:55 2012	(r301974)
+++ head/x11-toolkits/tk85/Makefile	Fri Aug  3 22:34:53 2012	(r301975)
@@ -64,9 +64,7 @@ LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-font
 CONFIGURE_ARGS+=	--disable-xft
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
 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}
@@ -87,7 +85,7 @@ PLIST_SUB+=	DEMOS=""
 PLIST_SUB+=	DEMOS="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MTK85_MAN}
+.if ${PORT_OPTIONS:MTK85_MAN}
 
 MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
 	CanvTxtInfo.3 Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 \
@@ -403,7 +401,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromO
 	text.n tk_textCut.n \
 	text.n tk_textPaste.n
 
-.endif	# ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MTK85_MAN}
+.endif	# ${PORT_OPTIONS:MTK85_MAN}
 
 .endif	# defined(BUILDING_TK_THREADS)
 
@@ -453,7 +451,6 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/../doc/wish.1 ${MANPREFIX}/man/man1/wish${TCL_VER}${THREADS_SUFFIX}.1
 .if !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK85_MAN}
@@ -464,8 +461,6 @@ post-install:
 	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
 .endif # !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK85_MAN}
 
-.endif # ${PORT_OPTIONS:MDOCS}
-
 regression-test:	build
 	cd ${WRKSRC}; ${MAKE} test
 	${ECHO_CMD} "package require Tk" | tclsh${TK_VER}