From 863667859c9b87592751754a386ea16948807e99 Mon Sep 17 00:00:00 2001 From: rillig Date: Wed, 15 Feb 2006 22:02:56 +0000 Subject: Converted to the SUBST framework. Fixed all pkglint warnings. --- lang/tcl-itcl-current/Makefile | 18 +-- lang/tcl-itcl-current/PLIST | 222 ++++++++++++++++++------------------ lang/tcl-itcl-current/buildlink3.mk | 14 +-- 3 files changed, 127 insertions(+), 127 deletions(-) diff --git a/lang/tcl-itcl-current/Makefile b/lang/tcl-itcl-current/Makefile index ff9fca3bacf..0d1bee76522 100644 --- a/lang/tcl-itcl-current/Makefile +++ b/lang/tcl-itcl-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/02/05 23:09:52 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2006/02/15 22:02:56 rillig Exp $ DISTNAME= tcl-itcl-20040920 PKGNAME= ${DISTNAME:S/itcl/itcl-current/} @@ -22,15 +22,15 @@ CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl:Q}/lib CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk:Q}/lib CONFIGURE_ARGS+= --enable-shared -MAKE_ENV+= TCL_HEADER_DIR=${BUILDLINK_PREFIX.tcl}/include/tcl +MAKE_ENV+= TCL_HEADER_DIR=${BUILDLINK_PREFIX.tcl:Q}/include/tcl -post-build: - ${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|" \ - -e "s|${WRKSRC}/itcl|${PREFIX}/lib/tcl/itcl${ITCL_VERS}|"\ - -e "s|${PREFIX}/lib/itcl${ITCL_VERS}|${PREFIX}/lib/tcl/itcl${ITCL_VERS}|"\ - -e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}|" \ - ${WRKSRC}/itcl/itclConfig.sh > ${WRKSRC}/itcl/itclConfig.sh.tmp &&\ - ${MV} ${WRKSRC}/itcl/itclConfig.sh.tmp ${WRKSRC}/itcl/itclConfig.sh +SUBST_CLASSES+= tcl-itcl +SUBST_STAGE.tcl-itcl= post-build +SUBST_FILES.tcl-itcl= itcl/itclConfig.sh +SUBST_SED.tcl-itcl= -e 's|^\(.*\)='\''\(.*\)'\''|\1="\2"|' +SUBST_SED.tcl-itcl+= -e s\|${WRKSRC:Q}/itcl\|${PREFIX:Q}/lib/tcl/itcl${ITCL_VERS:Q}\| +SUBST_SED.tcl-itcl+= -e s\|${PREFIX:Q}/lib/itcl${ITCL_VERS:Q}\|${PREFIX:Q}/lib/tcl/itcl${ITCL_VERS:Q}\| +SUBST_SED.tcl-itcl+= -e s\|${WRKDIR:Q}/${DISTNAME:C/-src//:Q}\|${PREFIX:Q}\| .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" diff --git a/lang/tcl-itcl-current/PLIST b/lang/tcl-itcl-current/PLIST index 104f21367de..2194d6ad344 100644 --- a/lang/tcl-itcl-current/PLIST +++ b/lang/tcl-itcl-current/PLIST @@ -1,103 +1,45 @@ -@comment $NetBSD: PLIST,v 1.2 2004/10/07 16:21:38 tv Exp $ +@comment $NetBSD: PLIST,v 1.3 2006/02/15 22:02:56 rillig Exp $ include/itcl.h include/itclDecls.h include/itclInt.h include/itclIntDecls.h include/itk.h include/itkDecls.h -lib/iwidgets lib/itclConfig.sh -lib/tcl/itcl3.3/pkgIndex.tcl +lib/iwidgets lib/tcl/itcl3.3/itcl.tcl lib/tcl/itcl3.3/libitcl33.la lib/tcl/itcl3.3/libitclstub33.a -lib/tcl/itk3.3/pkgIndex.tcl +lib/tcl/itcl3.3/pkgIndex.tcl lib/tcl/itk3.3/Archetype.itk lib/tcl/itk3.3/Toplevel.itk lib/tcl/itk3.3/Widget.itk lib/tcl/itk3.3/itk.tcl -lib/tcl/itk3.3/tclIndex lib/tcl/itk3.3/libitk33.la -lib/tcl/iwidgets/scripts/buttonbox.itk -lib/tcl/iwidgets/scripts/calendar.itk -lib/tcl/iwidgets/scripts/canvasprintbox.itk -lib/tcl/iwidgets/scripts/canvasprintdialog.itk -lib/tcl/iwidgets/scripts/checkbox.itk -lib/tcl/iwidgets/scripts/combobox.itk -lib/tcl/iwidgets/scripts/dateentry.itk -lib/tcl/iwidgets/scripts/datefield.itk -lib/tcl/iwidgets/scripts/dialog.itk -lib/tcl/iwidgets/scripts/dialogshell.itk -lib/tcl/iwidgets/scripts/disjointlistbox.itk -lib/tcl/iwidgets/scripts/entryfield.itk -lib/tcl/iwidgets/scripts/extbutton.itk -lib/tcl/iwidgets/scripts/extfileselectionbox.itk -lib/tcl/iwidgets/scripts/extfileselectiondialog.itk -lib/tcl/iwidgets/scripts/feedback.itk -lib/tcl/iwidgets/scripts/fileselectionbox.itk -lib/tcl/iwidgets/scripts/fileselectiondialog.itk -lib/tcl/iwidgets/scripts/finddialog.itk -lib/tcl/iwidgets/scripts/hierarchy.itk -lib/tcl/iwidgets/scripts/hyperhelp.itk -lib/tcl/iwidgets/scripts/labeledframe.itk -lib/tcl/iwidgets/scripts/labeledwidget.itk -lib/tcl/iwidgets/scripts/mainwindow.itk -lib/tcl/iwidgets/scripts/menubar.itk -lib/tcl/iwidgets/scripts/messagebox.itk -lib/tcl/iwidgets/scripts/messagedialog.itk -lib/tcl/iwidgets/scripts/notebook.itk -lib/tcl/iwidgets/scripts/optionmenu.itk -lib/tcl/iwidgets/scripts/pane.itk -lib/tcl/iwidgets/scripts/panedwindow.itk -lib/tcl/iwidgets/scripts/promptdialog.itk -lib/tcl/iwidgets/scripts/pushbutton.itk -lib/tcl/iwidgets/scripts/radiobox.itk -lib/tcl/iwidgets/scripts/regexpfield.itk -lib/tcl/iwidgets/scripts/scrolledcanvas.itk -lib/tcl/iwidgets/scripts/scrolledframe.itk -lib/tcl/iwidgets/scripts/scrolledhtml.itk -lib/tcl/iwidgets/scripts/scrolledlistbox.itk -lib/tcl/iwidgets/scripts/scrolledtext.itk -lib/tcl/iwidgets/scripts/scrolledwidget.itk -lib/tcl/iwidgets/scripts/selectionbox.itk -lib/tcl/iwidgets/scripts/selectiondialog.itk -lib/tcl/iwidgets/scripts/shell.itk -lib/tcl/iwidgets/scripts/spindate.itk -lib/tcl/iwidgets/scripts/spinint.itk -lib/tcl/iwidgets/scripts/spinner.itk -lib/tcl/iwidgets/scripts/spintime.itk -lib/tcl/iwidgets/scripts/tabnotebook.itk -lib/tcl/iwidgets/scripts/tabset.itk -lib/tcl/iwidgets/scripts/timeentry.itk -lib/tcl/iwidgets/scripts/timefield.itk -lib/tcl/iwidgets/scripts/toolbar.itk -lib/tcl/iwidgets/scripts/watch.itk -lib/tcl/iwidgets/scripts/colors.itcl -lib/tcl/iwidgets/scripts/roman.itcl -lib/tcl/iwidgets/scripts/scopedobject.itcl -lib/tcl/iwidgets/scripts/tclIndex -lib/tcl/iwidgets/scripts/unknownimage.gif -lib/tcl/iwidgets/demos/images/box.xbm -lib/tcl/iwidgets/demos/images/clear.gif -lib/tcl/iwidgets/demos/images/close.gif -lib/tcl/iwidgets/demos/images/copy.gif -lib/tcl/iwidgets/demos/images/cut.gif -lib/tcl/iwidgets/demos/images/exit.gif -lib/tcl/iwidgets/demos/images/find.gif -lib/tcl/iwidgets/demos/images/help.gif -lib/tcl/iwidgets/demos/images/line.xbm -lib/tcl/iwidgets/demos/images/mag.gif -lib/tcl/iwidgets/demos/images/new.gif -lib/tcl/iwidgets/demos/images/open.gif -lib/tcl/iwidgets/demos/images/oval.xbm -lib/tcl/iwidgets/demos/images/paste.gif -lib/tcl/iwidgets/demos/images/points.xbm -lib/tcl/iwidgets/demos/images/poly.gif -lib/tcl/iwidgets/demos/images/print.gif -lib/tcl/iwidgets/demos/images/ruler.gif -lib/tcl/iwidgets/demos/images/save.gif -lib/tcl/iwidgets/demos/images/select.gif -lib/tcl/iwidgets/demos/images/text.xbm +lib/tcl/itk3.3/pkgIndex.tcl +lib/tcl/itk3.3/tclIndex +lib/tcl/iwidgets/demos/buttonbox +lib/tcl/iwidgets/demos/calendar +lib/tcl/iwidgets/demos/canvasprintbox +lib/tcl/iwidgets/demos/canvasprintdialog +lib/tcl/iwidgets/demos/catalog +lib/tcl/iwidgets/demos/checkbox +lib/tcl/iwidgets/demos/combobox +lib/tcl/iwidgets/demos/dateentry +lib/tcl/iwidgets/demos/datefield +lib/tcl/iwidgets/demos/demo.html +lib/tcl/iwidgets/demos/dialog +lib/tcl/iwidgets/demos/dialogshell +lib/tcl/iwidgets/demos/disjointlistbox +lib/tcl/iwidgets/demos/entryfield +lib/tcl/iwidgets/demos/extbutton +lib/tcl/iwidgets/demos/extfileselectionbox +lib/tcl/iwidgets/demos/extfileselectiondialog +lib/tcl/iwidgets/demos/feedback +lib/tcl/iwidgets/demos/fileselectionbox +lib/tcl/iwidgets/demos/fileselectiondialog +lib/tcl/iwidgets/demos/finddialog +lib/tcl/iwidgets/demos/hierarchy lib/tcl/iwidgets/demos/html/buttonbox.n.html lib/tcl/iwidgets/demos/html/calendar.n.html lib/tcl/iwidgets/demos/html/canvasprintbox.n.html @@ -114,9 +56,9 @@ lib/tcl/iwidgets/demos/html/extbutton.n.html lib/tcl/iwidgets/demos/html/extfileselectionbox.n.html lib/tcl/iwidgets/demos/html/extfileselectiondialog.n.html lib/tcl/iwidgets/demos/html/feedback.n.html -lib/tcl/iwidgets/demos/html/finddialog.n.html lib/tcl/iwidgets/demos/html/fileselectionbox.n.html lib/tcl/iwidgets/demos/html/fileselectiondialog.n.html +lib/tcl/iwidgets/demos/html/finddialog.n.html lib/tcl/iwidgets/demos/html/hierarchy.n.html lib/tcl/iwidgets/demos/html/hyperhelp.n.html lib/tcl/iwidgets/demos/html/iwidgets4.0.0UserCmds.html @@ -151,29 +93,28 @@ lib/tcl/iwidgets/demos/html/timeentry.n.html lib/tcl/iwidgets/demos/html/timefield.n.html lib/tcl/iwidgets/demos/html/toolbar.n.html lib/tcl/iwidgets/demos/html/watch.n.html -lib/tcl/iwidgets/demos/buttonbox -lib/tcl/iwidgets/demos/calendar -lib/tcl/iwidgets/demos/canvasprintbox -lib/tcl/iwidgets/demos/canvasprintdialog -lib/tcl/iwidgets/demos/catalog -lib/tcl/iwidgets/demos/checkbox -lib/tcl/iwidgets/demos/combobox -lib/tcl/iwidgets/demos/dateentry -lib/tcl/iwidgets/demos/datefield -lib/tcl/iwidgets/demos/demo.html -lib/tcl/iwidgets/demos/dialog -lib/tcl/iwidgets/demos/dialogshell -lib/tcl/iwidgets/demos/disjointlistbox -lib/tcl/iwidgets/demos/entryfield -lib/tcl/iwidgets/demos/extbutton -lib/tcl/iwidgets/demos/extfileselectionbox -lib/tcl/iwidgets/demos/extfileselectiondialog -lib/tcl/iwidgets/demos/feedback -lib/tcl/iwidgets/demos/fileselectionbox -lib/tcl/iwidgets/demos/fileselectiondialog -lib/tcl/iwidgets/demos/finddialog -lib/tcl/iwidgets/demos/hierarchy lib/tcl/iwidgets/demos/hyperhelp +lib/tcl/iwidgets/demos/images/box.xbm +lib/tcl/iwidgets/demos/images/clear.gif +lib/tcl/iwidgets/demos/images/close.gif +lib/tcl/iwidgets/demos/images/copy.gif +lib/tcl/iwidgets/demos/images/cut.gif +lib/tcl/iwidgets/demos/images/exit.gif +lib/tcl/iwidgets/demos/images/find.gif +lib/tcl/iwidgets/demos/images/help.gif +lib/tcl/iwidgets/demos/images/line.xbm +lib/tcl/iwidgets/demos/images/mag.gif +lib/tcl/iwidgets/demos/images/new.gif +lib/tcl/iwidgets/demos/images/open.gif +lib/tcl/iwidgets/demos/images/oval.xbm +lib/tcl/iwidgets/demos/images/paste.gif +lib/tcl/iwidgets/demos/images/points.xbm +lib/tcl/iwidgets/demos/images/poly.gif +lib/tcl/iwidgets/demos/images/print.gif +lib/tcl/iwidgets/demos/images/ruler.gif +lib/tcl/iwidgets/demos/images/save.gif +lib/tcl/iwidgets/demos/images/select.gif +lib/tcl/iwidgets/demos/images/text.xbm lib/tcl/iwidgets/demos/iwidgets.gif lib/tcl/iwidgets/demos/labeledframe lib/tcl/iwidgets/demos/labeledwidget @@ -207,8 +148,67 @@ lib/tcl/iwidgets/demos/timefield lib/tcl/iwidgets/demos/toolbar lib/tcl/iwidgets/demos/watch lib/tcl/iwidgets/iwidgets.tcl -lib/tcl/iwidgets/pkgIndex.tcl lib/tcl/iwidgets/license.terms +lib/tcl/iwidgets/pkgIndex.tcl +lib/tcl/iwidgets/scripts/buttonbox.itk +lib/tcl/iwidgets/scripts/calendar.itk +lib/tcl/iwidgets/scripts/canvasprintbox.itk +lib/tcl/iwidgets/scripts/canvasprintdialog.itk +lib/tcl/iwidgets/scripts/checkbox.itk +lib/tcl/iwidgets/scripts/colors.itcl +lib/tcl/iwidgets/scripts/combobox.itk +lib/tcl/iwidgets/scripts/dateentry.itk +lib/tcl/iwidgets/scripts/datefield.itk +lib/tcl/iwidgets/scripts/dialog.itk +lib/tcl/iwidgets/scripts/dialogshell.itk +lib/tcl/iwidgets/scripts/disjointlistbox.itk +lib/tcl/iwidgets/scripts/entryfield.itk +lib/tcl/iwidgets/scripts/extbutton.itk +lib/tcl/iwidgets/scripts/extfileselectionbox.itk +lib/tcl/iwidgets/scripts/extfileselectiondialog.itk +lib/tcl/iwidgets/scripts/feedback.itk +lib/tcl/iwidgets/scripts/fileselectionbox.itk +lib/tcl/iwidgets/scripts/fileselectiondialog.itk +lib/tcl/iwidgets/scripts/finddialog.itk +lib/tcl/iwidgets/scripts/hierarchy.itk +lib/tcl/iwidgets/scripts/hyperhelp.itk +lib/tcl/iwidgets/scripts/labeledframe.itk +lib/tcl/iwidgets/scripts/labeledwidget.itk +lib/tcl/iwidgets/scripts/mainwindow.itk +lib/tcl/iwidgets/scripts/menubar.itk +lib/tcl/iwidgets/scripts/messagebox.itk +lib/tcl/iwidgets/scripts/messagedialog.itk +lib/tcl/iwidgets/scripts/notebook.itk +lib/tcl/iwidgets/scripts/optionmenu.itk +lib/tcl/iwidgets/scripts/pane.itk +lib/tcl/iwidgets/scripts/panedwindow.itk +lib/tcl/iwidgets/scripts/promptdialog.itk +lib/tcl/iwidgets/scripts/pushbutton.itk +lib/tcl/iwidgets/scripts/radiobox.itk +lib/tcl/iwidgets/scripts/regexpfield.itk +lib/tcl/iwidgets/scripts/roman.itcl +lib/tcl/iwidgets/scripts/scopedobject.itcl +lib/tcl/iwidgets/scripts/scrolledcanvas.itk +lib/tcl/iwidgets/scripts/scrolledframe.itk +lib/tcl/iwidgets/scripts/scrolledhtml.itk +lib/tcl/iwidgets/scripts/scrolledlistbox.itk +lib/tcl/iwidgets/scripts/scrolledtext.itk +lib/tcl/iwidgets/scripts/scrolledwidget.itk +lib/tcl/iwidgets/scripts/selectionbox.itk +lib/tcl/iwidgets/scripts/selectiondialog.itk +lib/tcl/iwidgets/scripts/shell.itk +lib/tcl/iwidgets/scripts/spindate.itk +lib/tcl/iwidgets/scripts/spinint.itk +lib/tcl/iwidgets/scripts/spinner.itk +lib/tcl/iwidgets/scripts/spintime.itk +lib/tcl/iwidgets/scripts/tabnotebook.itk +lib/tcl/iwidgets/scripts/tabset.itk +lib/tcl/iwidgets/scripts/tclIndex +lib/tcl/iwidgets/scripts/timeentry.itk +lib/tcl/iwidgets/scripts/timefield.itk +lib/tcl/iwidgets/scripts/toolbar.itk +lib/tcl/iwidgets/scripts/unknownimage.gif +lib/tcl/iwidgets/scripts/watch.itk man/mann/Archetype.n man/mann/Toplevel.n man/mann/Widget.n @@ -279,10 +279,10 @@ man/mann/iwidgets_watch.n man/mann/local.n man/mann/scope.n man/mann/usual.n -@dirrm lib/tcl/itcl3.3 -@dirrm lib/tcl/itk3.3 @dirrm lib/tcl/iwidgets/scripts @dirrm lib/tcl/iwidgets/demos/images @dirrm lib/tcl/iwidgets/demos/html @dirrm lib/tcl/iwidgets/demos @dirrm lib/tcl/iwidgets +@dirrm lib/tcl/itk3.3 +@dirrm lib/tcl/itcl3.3 diff --git a/lang/tcl-itcl-current/buildlink3.mk b/lang/tcl-itcl-current/buildlink3.mk index a644ec47c71..2841ad8ed2c 100644 --- a/lang/tcl-itcl-current/buildlink3.mk +++ b/lang/tcl-itcl-current/buildlink3.mk @@ -1,6 +1,6 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:52 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2006/02/15 22:02:56 rillig Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TCL_ITCL_CURRENT_BUILDLINK3_MK:= ${TCL_ITCL_CURRENT_BUILDLINK3_MK}+ .if !empty(BUILDLINK_DEPTH:M+) @@ -11,16 +11,16 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-itcl-current} BUILDLINK_PACKAGES+= tcl-itcl-current .if !empty(TCL_ITCL_CURRENT_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.tcl-itcl-current+= tcl-itcl-current>=20040920 +BUILDLINK_DEPENDS.tcl-itcl-current+= tcl-itcl-current>=20040920 BUILDLINK_RECOMMENDED.tcl-itcl-current?= tcl-itcl-current>=20040920nb4 -BUILDLINK_PKGSRCDIR.tcl-itcl-current?= ../../lang/tcl-itcl-current +BUILDLINK_PKGSRCDIR.tcl-itcl-current?= ../../lang/tcl-itcl-current -BUILDLINK_TRANSFORM+= l:itcl:itcl33 -BUILDLINK_TRANSFORM+= l:itk:itk33 +BUILDLINK_TRANSFORM+= l:itcl:itcl33 +BUILDLINK_TRANSFORM+= l:itk:itk33 .endif # TCL_ITCL_CURRENT_BUILDLINK3_MK .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -- cgit v1.2.3