[Midnightbsd-cvs] mports: x11-toolkits/tk85: Update to 8.5.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri May 9 14:31:12 EDT 2008
Log Message:
-----------
Update to 8.5.2
Modified Files:
--------------
mports/x11-toolkits/tk85:
Makefile (r1.1 -> r1.2)
distinfo (r1.1 -> r1.2)
pkg-descr (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
mports/x11-toolkits/tk85/files:
patch-unix::Makefile.in (r1.1 -> r1.2)
pkgIndex.tcl.in (r1.1 -> r1.2)
Added Files:
-----------
mports/x11-toolkits/tk85/files:
patch-unix::configure (r1.1)
Removed Files:
-------------
mports/x11-toolkits/tk85/files:
patch-configure
-------------- next part --------------
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/tk85/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-toolkits/tk85/pkg-descr -L x11-toolkits/tk85/pkg-descr -u -r1.1 -r1.2
--- x11-toolkits/tk85/pkg-descr
+++ x11-toolkits/tk85/pkg-descr
@@ -1,6 +1,11 @@
This is Tk version 8.5, a GUI toolkit for Tcl.
-The best way to get started with Tcl is to read ``Tcl and the Tk
-Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
+Tk is a graphical user interface toolkit that takes developing desktop
+applications to a higher level than conventional approaches. Tk is the
+standard GUI not only for Tcl, but for many other dynamic languages, and can
+produce rich, native applications that run unchanged across Windows, Mac OS X,
+Linux and more.
+
+A full set of manual pages is also provided with this port.
WWW: http://www.tcl.tk/
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/tk85/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-toolkits/tk85/pkg-plist -L x11-toolkits/tk85/pkg-plist -u -r1.1 -r1.2
--- x11-toolkits/tk85/pkg-plist
+++ x11-toolkits/tk85/pkg-plist
@@ -10,7 +10,6 @@
include/tk%%TK_VER%%/generic/tkEntry.h
include/tk%%TK_VER%%/generic/tkFileFilter.h
include/tk%%TK_VER%%/generic/tkFont.h
-include/tk%%TK_VER%%/generic/tkInitScript.h
include/tk%%TK_VER%%/generic/tkInt.h
include/tk%%TK_VER%%/generic/tkIntDecls.h
include/tk%%TK_VER%%/generic/tkIntPlatDecls.h
@@ -41,77 +40,88 @@
lib/tk%%TK_VER%%/clrpick.tcl
lib/tk%%TK_VER%%/comdlg.tcl
lib/tk%%TK_VER%%/console.tcl
-lib/tk%%TK_VER%%/demos/README
-lib/tk%%TK_VER%%/demos/anilabel.tcl
-lib/tk%%TK_VER%%/demos/aniwave.tcl
-lib/tk%%TK_VER%%/demos/arrow.tcl
-lib/tk%%TK_VER%%/demos/bind.tcl
-lib/tk%%TK_VER%%/demos/bitmap.tcl
-lib/tk%%TK_VER%%/demos/browse
-lib/tk%%TK_VER%%/demos/button.tcl
-lib/tk%%TK_VER%%/demos/check.tcl
-lib/tk%%TK_VER%%/demos/clrpick.tcl
-lib/tk%%TK_VER%%/demos/colors.tcl
-lib/tk%%TK_VER%%/demos/cscroll.tcl
-lib/tk%%TK_VER%%/demos/ctext.tcl
-lib/tk%%TK_VER%%/demos/dialog1.tcl
-lib/tk%%TK_VER%%/demos/dialog2.tcl
-lib/tk%%TK_VER%%/demos/en.msg
-lib/tk%%TK_VER%%/demos/entry1.tcl
-lib/tk%%TK_VER%%/demos/entry2.tcl
-lib/tk%%TK_VER%%/demos/entry3.tcl
-lib/tk%%TK_VER%%/demos/filebox.tcl
-lib/tk%%TK_VER%%/demos/floor.tcl
-lib/tk%%TK_VER%%/demos/form.tcl
-lib/tk%%TK_VER%%/demos/goldberg.tcl
-lib/tk%%TK_VER%%/demos/hello
-lib/tk%%TK_VER%%/demos/hscale.tcl
-lib/tk%%TK_VER%%/demos/icon.tcl
-lib/tk%%TK_VER%%/demos/image1.tcl
-lib/tk%%TK_VER%%/demos/image2.tcl
-lib/tk%%TK_VER%%/demos/images/earth.gif
-lib/tk%%TK_VER%%/demos/images/earthris.gif
-lib/tk%%TK_VER%%/demos/images/face.xbm
-lib/tk%%TK_VER%%/demos/images/flagdown.xbm
-lib/tk%%TK_VER%%/demos/images/flagup.xbm
-lib/tk%%TK_VER%%/demos/images/gray25.xbm
-lib/tk%%TK_VER%%/demos/images/letters.xbm
-lib/tk%%TK_VER%%/demos/images/noletter.xbm
-lib/tk%%TK_VER%%/demos/images/pattern.xbm
-lib/tk%%TK_VER%%/demos/images/tcllogo.gif
-lib/tk%%TK_VER%%/demos/images/teapot.ppm
-lib/tk%%TK_VER%%/demos/items.tcl
-lib/tk%%TK_VER%%/demos/ixset
-lib/tk%%TK_VER%%/demos/label.tcl
-lib/tk%%TK_VER%%/demos/labelframe.tcl
-lib/tk%%TK_VER%%/demos/license.terms
-lib/tk%%TK_VER%%/demos/menu.tcl
-lib/tk%%TK_VER%%/demos/menubu.tcl
-lib/tk%%TK_VER%%/demos/msgbox.tcl
-lib/tk%%TK_VER%%/demos/nl.msg
-lib/tk%%TK_VER%%/demos/paned1.tcl
-lib/tk%%TK_VER%%/demos/paned2.tcl
-lib/tk%%TK_VER%%/demos/pendulum.tcl
-lib/tk%%TK_VER%%/demos/plot.tcl
-lib/tk%%TK_VER%%/demos/puzzle.tcl
-lib/tk%%TK_VER%%/demos/radio.tcl
-lib/tk%%TK_VER%%/demos/rmt
-lib/tk%%TK_VER%%/demos/rolodex
-lib/tk%%TK_VER%%/demos/ruler.tcl
-lib/tk%%TK_VER%%/demos/sayings.tcl
-lib/tk%%TK_VER%%/demos/search.tcl
-lib/tk%%TK_VER%%/demos/spin.tcl
-lib/tk%%TK_VER%%/demos/square
-lib/tk%%TK_VER%%/demos/states.tcl
-lib/tk%%TK_VER%%/demos/style.tcl
-lib/tk%%TK_VER%%/demos/tclIndex
-lib/tk%%TK_VER%%/demos/tcolor
-lib/tk%%TK_VER%%/demos/text.tcl
-lib/tk%%TK_VER%%/demos/timer
-lib/tk%%TK_VER%%/demos/twind.tcl
-lib/tk%%TK_VER%%/demos/unicodeout.tcl
-lib/tk%%TK_VER%%/demos/vscale.tcl
-lib/tk%%TK_VER%%/demos/widget
+%%DEMOS%%lib/tk%%TK_VER%%/demos/README
+%%DEMOS%%lib/tk%%TK_VER%%/demos/anilabel.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/aniwave.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/arrow.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/bind.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/bitmap.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/browse
+%%DEMOS%%lib/tk%%TK_VER%%/demos/button.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/check.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/clrpick.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/colors.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/combo.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/cscroll.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ctext.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/dialog1.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/dialog2.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/en.msg
+%%DEMOS%%lib/tk%%TK_VER%%/demos/entry1.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/entry2.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/entry3.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/filebox.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/floor.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/form.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/goldberg.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/hello
+%%DEMOS%%lib/tk%%TK_VER%%/demos/hscale.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/icon.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/image1.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/image2.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/earth.gif
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/earthris.gif
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/face.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagdown.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagup.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/gray25.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/letters.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/noletter.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/pattern.xbm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/tcllogo.gif
+%%DEMOS%%lib/tk%%TK_VER%%/demos/images/teapot.ppm
+%%DEMOS%%lib/tk%%TK_VER%%/demos/items.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ixset
+%%DEMOS%%lib/tk%%TK_VER%%/demos/knightstour.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/label.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/labelframe.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/license.terms
+%%DEMOS%%lib/tk%%TK_VER%%/demos/mclist.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/menu.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/menubu.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/msgbox.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/nl.msg
+%%DEMOS%%lib/tk%%TK_VER%%/demos/paned1.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/paned2.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/pendulum.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/plot.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/puzzle.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/radio.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/rmt
+%%DEMOS%%lib/tk%%TK_VER%%/demos/rolodex
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ruler.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/sayings.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/search.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/spin.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/square
+%%DEMOS%%lib/tk%%TK_VER%%/demos/states.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/style.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/tclIndex
+%%DEMOS%%lib/tk%%TK_VER%%/demos/tcolor
+%%DEMOS%%lib/tk%%TK_VER%%/demos/text.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/textpeer.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/timer
+%%DEMOS%%lib/tk%%TK_VER%%/demos/toolbar.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/tree.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkbut.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkmenu.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ttknote.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkpane.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/ttkprogress.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/twind.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/unicodeout.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/vscale.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/widget
lib/tk%%TK_VER%%/dialog.tcl
lib/tk%%TK_VER%%/entry.tcl
lib/tk%%TK_VER%%/focus.tcl
@@ -133,14 +143,15 @@
lib/tk%%TK_VER%%/mkpsenc.tcl
lib/tk%%TK_VER%%/msgbox.tcl
lib/tk%%TK_VER%%/msgs/cs.msg
+lib/tk%%TK_VER%%/msgs/da.msg
lib/tk%%TK_VER%%/msgs/de.msg
lib/tk%%TK_VER%%/msgs/el.msg
lib/tk%%TK_VER%%/msgs/en.msg
lib/tk%%TK_VER%%/msgs/en_gb.msg
lib/tk%%TK_VER%%/msgs/eo.msg
lib/tk%%TK_VER%%/msgs/es.msg
-lib/tk%%TK_VER%%/msgs/es_ES.msg
lib/tk%%TK_VER%%/msgs/fr.msg
+lib/tk%%TK_VER%%/msgs/hu.msg
lib/tk%%TK_VER%%/msgs/it.msg
lib/tk%%TK_VER%%/msgs/nl.msg
lib/tk%%TK_VER%%/msgs/pl.msg
@@ -164,12 +175,35 @@
lib/tk%%TK_VER%%/tkAppInit.c
lib/tk%%TK_VER%%/tkConfig.sh
lib/tk%%TK_VER%%/tkfbox.tcl
+lib/tk%%TK_VER%%/ttk/altTheme.tcl
+lib/tk%%TK_VER%%/ttk/aquaTheme.tcl
+lib/tk%%TK_VER%%/ttk/button.tcl
+lib/tk%%TK_VER%%/ttk/clamTheme.tcl
+lib/tk%%TK_VER%%/ttk/classicTheme.tcl
+lib/tk%%TK_VER%%/ttk/combobox.tcl
+lib/tk%%TK_VER%%/ttk/cursors.tcl
+lib/tk%%TK_VER%%/ttk/defaults.tcl
+lib/tk%%TK_VER%%/ttk/entry.tcl
+lib/tk%%TK_VER%%/ttk/fonts.tcl
+lib/tk%%TK_VER%%/ttk/menubutton.tcl
+lib/tk%%TK_VER%%/ttk/notebook.tcl
+lib/tk%%TK_VER%%/ttk/panedwindow.tcl
+lib/tk%%TK_VER%%/ttk/progress.tcl
+lib/tk%%TK_VER%%/ttk/scale.tcl
+lib/tk%%TK_VER%%/ttk/scrollbar.tcl
+lib/tk%%TK_VER%%/ttk/sizegrip.tcl
+lib/tk%%TK_VER%%/ttk/treeview.tcl
+lib/tk%%TK_VER%%/ttk/ttk.tcl
+lib/tk%%TK_VER%%/ttk/utils.tcl
+lib/tk%%TK_VER%%/ttk/winTheme.tcl
+lib/tk%%TK_VER%%/ttk/xpTheme.tcl
lib/tk%%TK_VER%%/unsupported.tcl
lib/tk%%TK_VER%%/xmfbox.tcl
%%INSTMAN%%%%DATADIR%%/man.macros
%%INSTMAN%%@dirrm %%DATADIR%%
- at dirrm lib/tk%%TK_VER%%/demos/images
- at dirrm lib/tk%%TK_VER%%/demos
+ at dirrm lib/tk%%TK_VER%%/ttk
+%%DEMOS%%@dirrm lib/tk%%TK_VER%%/demos/images
+%%DEMOS%%@dirrm lib/tk%%TK_VER%%/demos
@dirrm lib/tk%%TK_VER%%/images
@dirrm lib/tk%%TK_VER%%/msgs
@dirrm lib/tk%%TK_VER%%
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/tk85/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-toolkits/tk85/Makefile -L x11-toolkits/tk85/Makefile -u -r1.1 -r1.2
--- x11-toolkits/tk85/Makefile
+++ x11-toolkits/tk85/Makefile
@@ -1,34 +1,35 @@
# New ports collection makefile for: tk
# Date created: 17 January 2007
-# Whom: Martin Matuska <martin at matuska.org>
+# Whom: Martin Matuska <mm at FreeBSD.org>
#
-# $MidnightBSD$
-# $FreeBSD: ports/x11-toolkits/tk85/Makefile,v 1.6 2007/03/16 20:40:00 miwi Exp $
+# $MIdnightBSD$
+# $FreeBSD: ports/x11-toolkits/tk85/Makefile,v 1.18 2008/04/02 12:02:41 mm Exp $
#
PORTNAME= tk
-PORTVERSION= 8.5.a.5
-PORTREVISION= 3
+PORTVERSION= 8.5.2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
PKGNAMESUFFIX?= ${THREADS_SUFFIX}
-DISTNAME= ${PORTNAME}${PORTVERSION:S/.a./a/}-src
+DISTNAME= ${PORTNAME}${PORTVERSION}-src
MAINTAINER= ports at MidnightBSD.org
COMMENT= Graphical toolkit for TCL
+LICENSE= other
LATEST_LINK?= tk85
-USE_XLIB= yes
+USE_XORG= x11
USE_LDCONFIG= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/.a./a/}/unix
+WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/unix
GNU_CONFIGURE= yes
TK_VER= 8.5
SHORT_TK_VER= 85
-CONFIGURE_ARGS= --enable-shared --includedir=${PREFIX}/include/tk${TK_VER} \
- --build=${ARCH}-portbld-freebsd6.0
-CONFIGURE_TARGET= ${ARCH}-portbld-freebsd6.0
+CONFIGURE_ARGS= --enable-shared --includedir=${PREFIX}/include/tk${TK_VER}
CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd6.0 \
+ --host=${ARCH}-portbld-freebsd6.0 \
+ --target=${ARCH}-portbld-freebsd6.0
MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER}
PLIST_SUB= TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken
@@ -38,10 +39,10 @@
.if !defined(BUILDING_TK_THREADS)
USE_TCL= ${SHORT_TK_VER}
-USE_TCL_BUILD= ${SHORT_TK_VER}
OPTIONS= TK85_MAN "Install tk 8.5 manpages" off \
- WISH_WRAPPER "Require wish wrapper from ports" off
+ XFT "Use Xft fonts" on \
+ DEMOS "Install demos" off
.else
USE_TK= ${SHORT_TK_VER}
PLIST= ${PKGDIR}/pkg-plist.threads
@@ -53,20 +54,33 @@
.include <bsd.port.pre.mk>
+.if !defined(WITHOUT_XFT)
+CONFIGURE_ARGS+= --enable-xft
+LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft
+.else
+CONFIGURE_ARGS+= --disable-xft
+.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}" \
ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}${THREADS_SUFFIX}"
LATEST_LINK= tk85${THREADS_SUFFIX}
+SUB_LIST+= TK_PROVIDE="; package provide Tk-threads ${TK_VER}"
.else
CONFIGURE_ARGS+= --disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
ac_cv_path_tclsh="${TCLSH}"
-.if defined(WITH_WISH_WRAPPER)
-RUN_DEPENDS+= wish:${PORTSDIR}/lang/tcl-tk-wrapper
+SUB_LIST+= TK_PROVIDE=""
+
+.if defined(WITH_DEMOS)
+INSTALL_TARGET+= install install-demos
+PLIST_SUB+= DEMOS=""
+.else
+PLIST_SUB+= DEMOS="@comment "
.endif
-.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK84_MAN)
+.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK85_MAN)
PLIST_SUB+= INSTMAN='@comment '
@@ -91,7 +105,8 @@
Name.3 NameOfImg.3 OwnSelect.3 ParseArgv.3 QWinEvent.3 Restack.3 \
RestrictEv.3 SetAppName.3 SetCaret.3 SetClass.3 SetClassProcs.3 \
SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 TextLayout.3 \
- Tk_Init.3 Tk_Main.3 TkInitStubs.3 WindowId.3
+ Tk_Init.3 Tk_Main.3 TkInitStubs.3 WindowId.3 ttk_Geometry.3 \
+ ttk_Theme.3
MANN= bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
chooseColor.n chooseDirectory.n clipboard.n colors.n console.n \
@@ -101,7 +116,12 @@
message.n messageBox.n option.n optionMenu.n options.n pack-old.n \
pack.n panedwindow.n palette.n photo.n place.n popup.n radiobutton.n \
raise.n scale.n scrollbar.n selection.n send.n spinbox.n text.n tk.n \
- tkerror.n tkvars.n tkwait.n toplevel.n winfo.n wm.n
+ tkerror.n tkvars.n tkwait.n toplevel.n winfo.n wm.n \
+ ttk_button.n ttk_checkbutton.n ttk_combobox.n ttk_entry.n ttk_frame.n \
+ ttk_image.n ttk_intro.n ttk_label.n ttk_labelframe.n ttk_menubutton.n \
+ ttk_notebook.n ttk_panedwindow.n ttk_progressbar.n ttk_radiobutton.n \
+ ttk_scrollbar.n ttk_separator.n ttk_sizegrip.n ttk_style.n \
+ ttk_treeview.n ttk_widget.n
# MLINKS generated via awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
@@ -393,6 +413,7 @@
@if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi
post-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
.if defined(BUILDING_TK_THREADS)
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
@@ -403,8 +424,8 @@
-e 's/-ltkstub`echo $${TK_VERSION} | tr -d .`/-ltkstub`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|libtk$${SHORT_TK_VER}|libtk$${SHORT_TK_VER}${THREADS_SUFFIX}|g' \
- -e 's|$$(BIN_INSTALL_DIR)/wish$$(VERSION)|$$(BIN_INSTALL_DIR)/wish$$(VERSION)${THREADS_SUFFIX}|g' \
- -e 's|tk$$(VERSION)/tkConfig.sh|tk$$(VERSION)/tkConfig${THREADS_SUFFIX}.sh|g' \
+ -e 's|/wish$$(VERSION)|/wish$$(VERSION)${THREADS_SUFFIX}|g' \
+ -e 's|/tkConfig.sh|/tkConfig${THREADS_SUFFIX}.sh|g' \
-e 's|$$(LIB_INSTALL_DIR)$$(TK_PKG_DIR)|${WRKDIR}|g' \
-e 's|$$(MINOR_VERSION)$$(TCLPATCHL)|$$(MINOR_VERSION)$$(TCLPATCHL)${THREADS_SUFFIX}|g' \
${WRKSRC}/Makefile.in
@@ -414,6 +435,7 @@
${REINPLACE_CMD} \
-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
${WRKSRC}/tkConfig.sh
+ ${REINPLACE_CMD} -e 's|-Wl,--rpath -Wl,/usr/local/lib||g' ${WRKSRC}/Makefile
.if defined(BUILDING_TK_THREADS)
do-install:
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/tk85/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-toolkits/tk85/distinfo -L x11-toolkits/tk85/distinfo -u -r1.1 -r1.2
--- x11-toolkits/tk85/distinfo
+++ x11-toolkits/tk85/distinfo
@@ -1,3 +1,3 @@
-MD5 (tk8.5a5-src.tar.gz) = c46f923384b18c2b5ff9dc931df9a47c
-SHA256 (tk8.5a5-src.tar.gz) = bd71a3799f2c1d149afb9bee6ebbcbae901462e86d0ed064bceab7de0fba4233
-SIZE (tk8.5a5-src.tar.gz) = 3262112
+MD5 (tk8.5.2-src.tar.gz) = bd014bd3e1a818e06ad375b95241452d
+SHA256 (tk8.5.2-src.tar.gz) = a2a28bb651dd1ba67fabc5be5deb120c0d75418ef84dc59ee6c0005d42e46e5a
+SIZE (tk8.5.2-src.tar.gz) = 3763820
--- x11-toolkits/tk85/files/patch-configure
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.orig Mon Oct 23 09:45:33 2006
-+++ configure Wed Apr 4 18:01:07 2007
-@@ -3530,6 +3530,7 @@
- # Threads support - this auto-enables if Tcl was compiled threaded
- #------------------------------------------------------------------------
-
-+TCL_SRC_DIR=${prefix}/include/tcl${TCLVERSION}
-
- # Check whether --enable-threads or --disable-threads was given.
- if test "${enable_threads+set}" = set; then
-@@ -5444,28 +5445,29 @@
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
- TCL_LIB_VERSIONS_OK=nodots
- ;;
-- FreeBSD-*)
-+ FreeBSD-*|MidnightBSD-*)
- # FreeBSD 3.* and greater have ELF.
- SHLIB_CFLAGS="-fPIC"
-- SHLIB_LD="ld -Bshareable -x"
-+ TCL_SHLIB_LD_EXTRAS="-soname \$@"
-+ SHLIB_LD="ld -shared -x"
- SHLIB_LD_LIBS='${LIBS}'
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS=""
-- LDFLAGS="$LDFLAGS -export-dynamic"
-+ LDFLAGS=""
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- if test "${TCL_THREADS}" = "1" ; then
-- # The -pthread needs to go in the CFLAGS, not LIBS
-+ # The -pthread needs to go in the LDFLAGS, not LIBS
- LIBS=`echo $LIBS | sed s/-pthread//`
-- CFLAGS="$CFLAGS -pthread"
-- LDFLAGS="$LDFLAGS -pthread"
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- fi
- case $system in
-- FreeBSD-3.*)
-+ FreeBSD-*|MidnightBSD-*)
- # FreeBSD-3 doesn't handle version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
- TCL_LIB_VERSIONS_OK=nodots
- ;;
- esac
-@@ -6183,7 +6185,7 @@
- ;;
- IRIX*)
- ;;
-- NetBSD-*|FreeBSD-*)
-+ NetBSD-*|FreeBSD-*|MidnightBSD-*)
- ;;
- Darwin-*)
- ;;
Index: pkgIndex.tcl.in
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/tk85/files/pkgIndex.tcl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-toolkits/tk85/files/pkgIndex.tcl.in -L x11-toolkits/tk85/files/pkgIndex.tcl.in -u -r1.1 -r1.2
--- x11-toolkits/tk85/files/pkgIndex.tcl.in
+++ x11-toolkits/tk85/files/pkgIndex.tcl.in
@@ -1,3 +1,3 @@
# Tcl package index file, version 1.0
-package ifneeded Tk%%THREADS_SUFFIX%% 8.5 [list load "[file join [file dirname $dir] libtk85%%THREADS_SUFFIX%%.so.1]" Tk]
+package ifneeded Tk%%THREADS_SUFFIX%% 8.5 "[list load "[file join [file dirname $dir] libtk85%%THREADS_SUFFIX%%.so.1]" Tk]%%TK_PROVIDE%%"
--- /dev/null
+++ x11-toolkits/tk85/files/patch-unix::configure
@@ -0,0 +1,85 @@
+--- configure.orig Fri Mar 28 14:46:36 2008
++++ configure Fri May 9 14:27:39 2008
+@@ -3536,6 +3536,7 @@
+ # Threads support - this auto-enables if Tcl was compiled threaded
+ #------------------------------------------------------------------------
+
++TCL_SRC_DIR=${prefix}/include/tcl${TCLVERSION}
+
+ # Check whether --enable-threads or --disable-threads was given.
+ if test "${enable_threads+set}" = set; then
+@@ -5811,7 +5812,7 @@
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+- NetBSD-*|FreeBSD-*)
++ NetBSD-*|FreeBSD-*|MidnightBSD-*)
+ # FreeBSD 3.* and greater have ELF.
+ # NetBSD 2.* has ELF and can use 'cc -shared' to build shared libs
+ SHLIB_CFLAGS="-fPIC"
+@@ -5820,7 +5821,7 @@
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS=""
+- LDFLAGS="$LDFLAGS -export-dynamic"
++ LDFLAGS=""
+ if test $doRpath = yes; then
+
+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -5831,16 +5832,16 @@
+
+ # The -pthread needs to go in the CFLAGS, not LIBS
+ LIBS=`echo $LIBS | sed s/-pthread//`
+- CFLAGS="$CFLAGS -pthread"
+- LDFLAGS="$LDFLAGS -pthread"
++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++ LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
+
+ fi
+
+ case $system in
+- FreeBSD-3.*)
++ FreeBSD-*|MidnightBSD-*)
+ # FreeBSD-3 doesn't handle version numbers with dots.
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
+ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ esac
+@@ -6830,7 +6831,7 @@
+ AIX-*) ;;
+ BSD/OS*) ;;
+ IRIX*) ;;
+- NetBSD-*|FreeBSD-*) ;;
++ NetBSD-*|FreeBSD-*|MidnightBSD-*) ;;
+ Darwin-*) ;;
+ SCO_SV-3.2*) ;;
+ *) SHLIB_CFLAGS="-fPIC" ;;
+@@ -9575,7 +9576,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ else
+- if test ! -r $x_includes/X11/Intrinsic.h; then
++ if test ! -r $x_includes/X11/Xlib.h; then
+ not_really_there="yes"
+ fi
+ fi
+@@ -9590,7 +9591,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <X11/Intrinsic.h>
++#include <X11/Xlib.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -9621,7 +9622,7 @@
+ if test "$found_xincludes" = "no"; then
+ dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include"
+ for i in $dirs ; do
+- if test -r $i/X11/Intrinsic.h; then
++ if test -r $i/X11/Xlib.h; then
+ echo "$as_me:$LINENO: result: $i" >&5
+ echo "${ECHO_T}$i" >&6
+ XINCLUDES=" -I$i"
Index: patch-unix::Makefile.in
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/tk85/files/patch-unix::Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-toolkits/tk85/files/patch-unix::Makefile.in -L x11-toolkits/tk85/files/patch-unix::Makefile.in -u -r1.1 -r1.2
--- x11-toolkits/tk85/files/patch-unix::Makefile.in
+++ x11-toolkits/tk85/files/patch-unix::Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig Mon Oct 23 15:45:33 2006
-+++ Makefile.in Mon Mar 12 18:32:29 2007
-@@ -64,6 +64,8 @@
+--- Makefile.in.orig 2008-03-28 19:46:36.000000000 +0100
++++ Makefile.in 2008-04-02 12:27:05.000000000 +0200
+@@ -65,6 +65,8 @@
# Directory in which to install the include file tk.h:
INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
@@ -9,7 +9,7 @@
# Path to the private tk header dir:
PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
-@@ -94,7 +96,7 @@
+@@ -95,7 +97,7 @@
# The directory containing the Tcl sources and headers appropriate
# for this version of Tk ("srcdir" will be replaced or has already
# been replaced by the configure script):
@@ -18,7 +18,16 @@
# The directory containing the platform specific Tcl sources and headers
# appropriate for this version of Tk:
-@@ -131,7 +133,7 @@
+@@ -109,7 +111,7 @@
+ TCL_LIB_FLAG = @TCL_LIB_FLAG@
+
+ # 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@
+@@ -132,7 +134,7 @@
#CFLAGS = $(CFLAGS_DEBUG)
#CFLAGS = $(CFLAGS_OPTIMIZE)
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -27,7 +36,7 @@
# Flags to pass to the linker
LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
-@@ -266,7 +268,7 @@
+@@ -267,7 +269,7 @@
STLIB_LD = @STLIB_LD@
SHLIB_LD = @SHLIB_LD@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
@@ -36,16 +45,16 @@
# Additional search flags needed to find the various shared libraries
# at run-time. The first symbol is for use when creating a binary
-@@ -489,6 +491,8 @@
- default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h \
- tkPort.h tkScrollbar.h tkText.h
+@@ -550,6 +552,8 @@
+ $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
+ $(TTK_HDRS) $(@TK_WINDOWINGSYSTEM at _PRIVATE_HDRS)
+INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h
+
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
- all: binaries libraries doc
-@@ -508,6 +512,12 @@
+ SHELL_ENV = \
+@@ -575,6 +579,12 @@
${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
rm -f $@
@MAKE_LIB@
@@ -58,94 +67,87 @@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
-@@ -613,7 +623,7 @@
+@@ -674,7 +684,7 @@
gdb ./wish --command=gdb.run
rm gdb.run
-INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@
-+INSTALL_TARGETS = install-binaries install-libraries install-demos @EXTRA_INSTALL@
++INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
install: $(INSTALL_TARGETS)
-@@ -626,7 +636,8 @@
+@@ -687,7 +697,8 @@
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \
+ libtk${SHORT_TK_VER}.a wish
- @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \
+ @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" "$(PKG_INSTALL_DIR)"; \
do \
- if [ ! -d $$i ] ; then \
-@@ -659,10 +670,15 @@
+ if [ ! -d "$$i" ] ; then \
+@@ -719,10 +730,15 @@
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
- $(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \
+ "$(LIB_INSTALL_DIR)"/$(TK_EXP_FILE); \
fi
+ @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so
+ @echo "Installing libtk${SHORT_TK_VER}.a"
+ @$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
+ @chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
- @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
+ @$(INSTALL_PROGRAM) wish "$(BIN_INSTALL_DIR)"/wish$(VERSION)
- @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
-- @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
+- @$(INSTALL_DATA) tkConfig.sh "$(LIB_INSTALL_DIR)"/tkConfig.sh
+ @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/tk$(VERSION)"
-+ @mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION)
-+ @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh
++ @mkdir -p "$(LIB_INSTALL_DIR)"/tk$(VERSION)
++ @$(INSTALL_DATA) tkConfig.sh "$(LIB_INSTALL_DIR)"/tk$(VERSION)/tkConfig.sh
@if test "$(STUB_LIB_FILE)" != "" ; then \
echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
@INSTALL_STUB_LIB@ ; \
-@@ -673,6 +689,7 @@
+@@ -733,6 +749,7 @@
@if test "$(@TK_WINDOWINGSYSTEM at _XLIB_HDRS)" != ""; then \
- XLIB_INCLUDE_INSTALL_DIR=$(INCLUDE_INSTALL_DIR)/X11; fi; \
- for i in $(INCLUDE_INSTALL_DIR) $${XLIB_INCLUDE_INSTALL_DIR} \
-+ $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
- $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \
- $(SCRIPT_INSTALL_DIR)/msgs; \
+ XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
+ for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
++ "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)" \
+ "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"/images \
+ "$(SCRIPT_INSTALL_DIR)"/msgs "$(SCRIPT_INSTALL_DIR)"/ttk; \
do \
-@@ -687,11 +704,14 @@
+@@ -747,10 +764,14 @@
chmod +x $(SRC_DIR)/install-sh; \
fi
@echo "Installing header files";
-- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
-- $(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM at _HDRS) ; \
-+ ${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h $(GENERIC_INCLUDE_INSTALL_DIR)/
-+ ${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h $(UNIX_INCLUDE_INSTALL_DIR)/
+- @for i in $(PUBLIC_HDRS); \
++ ${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/
++ ${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/
+ @for i in $(INSTALL_HDRS) ; \
do \
-- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
+- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
- done;
+ j=`basename $$i` ; \
-+ ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/$$j $(INCLUDE_INSTALL_DIR)/$$j ; \
++ ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/$$j "$(INCLUDE_INSTALL_DIR)"/$$j ; \
+ done
-+
++
@list='$(@TK_WINDOWINGSYSTEM at _XLIB_HDRS)'; for i in $$list ; \
do \
- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \
-@@ -762,20 +782,13 @@
- else true; \
- fi; \
+ $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
+@@ -830,17 +851,17 @@
done;
-- @echo "Installing and cross-linking top-level (.1) docs";
-- @for i in $(TOP_DIR)/doc/*.1; do \
-- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
-- done
--
-- @echo "Installing and cross-linking C API (.3) docs";
-- @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";
-+ ${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.n $(MANN_INSTALL_DIR)
+ @echo "Installing and cross-linking top-level (.1) docs";
+ @for i in $(TOP_DIR)/doc/*.1; do \
+- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
++ ${BSD_INSTALL_MAN} $$i "$(MAN1_INSTALL_DIR)"; \
+ done
+
+ @echo "Installing and cross-linking C API (.3) docs";
+ @for i in $(TOP_DIR)/doc/*.3; do \
+- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
++ ${BSD_INSTALL_MAN} $$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)"; \
++ ${BSD_INSTALL_MAN} $$i "$(MANN_INSTALL_DIR)"; \
+ done
# Optional target to install private headers
- install-private-headers: libraries
More information about the Midnightbsd-cvs
mailing list