Skip to content

Commit

Permalink
- Convert existing ports to a new bsd.tcl.mk order
Browse files Browse the repository at this point in the history
PR:		ports/109097
Submitted by:	Martin Matuska <martin@matuska.org>
Tested on:	pointyhat exp-run
  • Loading branch information
Pav Lucistnik authored and Pav Lucistnik committed Apr 2, 2007
1 parent 779cd6a commit cfa7269
Show file tree
Hide file tree
Showing 46 changed files with 64 additions and 98 deletions.
2 changes: 1 addition & 1 deletion astro/gpsman/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ MAINTAINER= david@catwhisker.org
COMMENT= A Tcl/Tk-based GPS management utility

#RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84
USE_TK= 84
USE_TK_RUN= 84

WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
NO_BUILD= yes
Expand Down
2 changes: 1 addition & 1 deletion astro/ptiger/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ COMMENT= Displays U.S. Census Burea populated places on a map
LIB_DEPENDS= tkgeomap.0:${PORTSDIR}/astro/tkgeomap

USE_XLIB= yes
USE_TK= yes
USE_TK_RUN= yes
NO_BUILD= yes

post-patch:
Expand Down
2 changes: 0 additions & 2 deletions astro/tclgeomap/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ MASTER_SITES= SF/tkgeomap
MAINTAINER= infofarmer@FreeBSD.org
COMMENT= Read, manipulate and display geo data

LIB_DEPENDS= tcl${USE_TCL}.1:${PORTSDIR}/lang/tcl${USE_TCL}

USE_TCL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR} \
Expand Down
3 changes: 1 addition & 2 deletions astro/tkgeomap/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ MASTER_SITES= SF
MAINTAINER= infofarmer@FreeBSD.org
COMMENT= Read, manipulate and display geo data

LIB_DEPENDS= tclgeomap.0:${PORTSDIR}/astro/tclgeomap \
tk${USE_TK}.1:${PORTSDIR}/x11-toolkits/tk${USE_TK}
LIB_DEPENDS= tclgeomap.0:${PORTSDIR}/astro/tclgeomap

CONFIGURE_ARGS= --with-tclgeomap-include=${LOCALBASE}/include/tclgeomap --with-x \
--with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR} \
Expand Down
2 changes: 1 addition & 1 deletion astro/xeartk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ COMMENT= Small demo for tkgeomap
LIB_DEPENDS= tkgeomap.0:${PORTSDIR}/astro/tkgeomap

USE_XLIB= yes
USE_TK= yes
USE_TK_RUN= yes
NO_BUILD= yes
DATA_FILES= README cities land.xdr rivers.xdr water.xdr
PLIST_FILES= bin/${PORTNAME} ${DATA_FILES:S,^,%%DATADIR%%/,}
Expand Down
2 changes: 1 addition & 1 deletion cad/pcb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ USE_GNOME= gtk20
.endif
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_TK= 83
USE_TK_RUN= 83
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib"

Expand Down
2 changes: 1 addition & 1 deletion comms/tkhylafax/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A tcl/tk interface to Sam Leffler's fax package

USE_GHOSTSCRIPT_RUN= yes
USE_TK= yes
USE_TK_RUN= yes

RUN_DEPENDS= sendfax:${PORTSDIR}/comms/hylafax \
gv:${PORTSDIR}/print/gv
Expand Down
2 changes: 1 addition & 1 deletion deskutils/zorro/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-1.1p8
MAINTAINER= carpetsmoker@xs4all.nl
COMMENT= A simple to-do list manager

USE_TK= yes
USE_TK_RUN= yes
NO_BUILD= yes
PLIST_FILES= bin/zorro
PORTDOCS= DOTzorrorc
Expand Down
2 changes: 1 addition & 1 deletion devel/cbrowser/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jkoshy@freebsd.org
COMMENT= Graphical front end for cscope and cscope clones

USE_TK= yes
USE_TK_RUN= yes
NO_BUILD= yes

# Private variables
Expand Down
2 changes: 1 addition & 1 deletion devel/tkcvs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Tcl/Tk frontends to CVS, Subversion and diff

NO_BUILD= yes
USE_TK= 84
USE_TK_RUN= 84

MAN1= tkcvs.1
PORTDOCS= CHANGELOG COPYING FAQ INSTALL vendor5readme.pdf
Expand Down
2 changes: 1 addition & 1 deletion devel/tkp4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN_DEPENDS= p4:${PORTSDIR}/devel/perforce

NO_BUILD= yes
REINPLACE_ARGS= -i ""
USE_TK= yes
USE_TK_RUN= yes

do-install:
${MKDIR} ${DATADIR}
Expand Down
2 changes: 1 addition & 1 deletion editors/impress/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ DISTNAME= imp${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Publishing and presentation tool

USE_TK= 84
USE_TK_RUN= 84

WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}

Expand Down
2 changes: 1 addition & 1 deletion emulators/bsvc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ COMMENT= An extensible hardware simulation framework with MC68K support

WRKSRC= ${WRKDIR}/${DISTNAME}/src
MAKE_ENV= PROJECT_BASE=${PREFIX} WRKSRC=${WRKSRC}
USE_TK= yes
USE_TK_RUN= yes

.include <bsd.port.pre.mk>

Expand Down
9 changes: 6 additions & 3 deletions games/klondike/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ COMMENT= A solitaire game for X11
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${PREFIX}/share/games \
--mandir=${PREFIX}/man
CONFIGURE_ENV= WISHX=${PREFIX}/bin/wish8.4
USE_TK= yes
USE_TK_RUN= yes
MAN6= klondike.6

.include <bsd.port.mk>
.include <bsd.port.pre.mk>

CONFIGURE_ENV= WISHX=${WISH}

.include <bsd.port.post.mk>
2 changes: 1 addition & 1 deletion games/tkmoo/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ DISTNAME= tkMOO-light-${PORTVERSION}
MAINTAINER= adam-ports@blacktabby.org
COMMENT= Tk-based M** client with scripting support

USE_TK= yes
USE_TK_RUN= yes
MAKE_ENV+= TKMOO_LIB_DIR="${DATADIR}" \
TKMOO_BIN_DIR="${PREFIX}/bin" WISH8.3="${WISH}"

Expand Down
9 changes: 2 additions & 7 deletions graphics/aolserver-nsgd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,8 @@ PLIST_SUB+= AOLSERVERBASE=${AOLSERVERBASE:S/${PREFIX}\///}

USE_GMAKE= yes

USE_TCL_VER?= 84

.if ${USE_TCL_VER} != 84 && ${USE_TCL_VER} != 85
IGNORE= supported values for USE_TCL_VER are only 84 and 85
.endif

USE_TCL_BUILD= ${USE_TCL_VER}-thread
USE_TCL= 84+
USE_TCL_THREADS= yes

.include <bsd.port.pre.mk>

Expand Down
2 changes: 0 additions & 2 deletions graphics/tkpng/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= infofarmer@FreeBSD.org
COMMENT= PNG support for Tcl/Tk

LIB_DEPENDS= tk${USE_TK}.1:${PORTSDIR}/x11-toolkits/tk${USE_TK}

USE_TK= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
Expand Down
2 changes: 1 addition & 1 deletion irc/tkirc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ COMMENT= A GUI for the ircII Internet Relay Chat client

RUN_DEPENDS= irc:${PORTSDIR}/irc/ircII

USE_TK= yes
USE_TK_RUN= yes
WRKSRC= ${WRKDIR}/tkirc2
NO_BUILD= yes

Expand Down
2 changes: 1 addition & 1 deletion lang/erlang/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ SCRIPT_ENV+= PATH=${PATH}:${JAVA_HOME}/bin
.endif

.if !defined(WITHOUT_X11)
USE_TK= yes
USE_TK_RUN= yes
.endif

.include <bsd.port.pre.mk>
Expand Down
2 changes: 1 addition & 1 deletion lang/erlang14/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ SCRIPT_ENV+= PATH=${PATH}:${JAVA_HOME}/bin
.endif

.if !defined(WITHOUT_X11)
USE_TK= yes
USE_TK_RUN= yes
.endif

.include <bsd.port.pre.mk>
Expand Down
4 changes: 2 additions & 2 deletions lang/tcl-wrapper/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ TX_SHELL= wish
TX_PORT= tk
TX_PORT_U= Tk
TX_CAT= x11-toolkits
USE_TK= yes
USE_TK_RUN= yes
.else
USE_TCL= yes
USE_TCL_RUN= yes
.endif

TX_CONF= ${TX_SHELL}.conf
Expand Down
4 changes: 2 additions & 2 deletions math/py-matplotlib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_GNOME= gtk20 pygtk2
USE_TCL= yes
USE_TK= yes
USE_TCL_RUN= yes
USE_TK_RUN= yes
CFLAGS+= -I${X11BASE}/include

EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME}
Expand Down
2 changes: 1 addition & 1 deletion misc/ewipe/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ COMMENT?= Tcl/tk-based presentation tool
.if defined(KANJI)
RUN_DEPENDS= wish8.0jp:${PORTSDIR}/japanese/tk80
.else
USE_TK= yes
USE_TK_RUN= yes
.endif

NO_BUILD= yes
Expand Down
2 changes: 1 addition & 1 deletion misc/fcalc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/tix8.1/Tix.tcl:${PORTSDIR}/x11-toolkits/tix

NO_BUILD= yes
USE_X_PREFIX= yes
USE_TK= 84
USE_TK_RUN= 84

WRKSRC= ${WRKDIR}/${PORTNAME}-1.00

Expand Down
2 changes: 1 addition & 1 deletion misc/tkregexp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ DISTNAME= visual_regexp-${PORTVERSION}
MAINTAINER= carpetsmoker@xs4all.nl
COMMENT= An interactive regexp design tool

USE_TK= yes
USE_TK_RUN= yes
NO_BUILD= yes
PLIST_FILES= bin/tkregexp

Expand Down
2 changes: 1 addition & 1 deletion multimedia/tkxanim/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Tcl/Tk frontend to xanim

RUN_DEPENDS= xanim:${PORTSDIR}/multimedia/xanim
USE_TK= yes
USE_TK_RUN= yes

WRKSRC= ${WRKDIR}/Tkxanim

Expand Down
4 changes: 2 additions & 2 deletions net-im/tkabber-devel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}

USE_BZIP2= yes
USE_TCL= yes
USE_TK= yes
USE_TCL_RUN= yes
USE_TK_RUN= yes

SUBDIRS= emoticons ifacetk jabberlib-tclxml mclistbox msgs pixmaps \
plugins sounds trans
Expand Down
2 changes: 1 addition & 1 deletion net-mgmt/ipacco/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/include/tclExtend.h:${PORTSDIR}/lang/tclX \

NO_BUILD= yes
USE_PHP= mysql gd
USE_TCL= yes
USE_TCL_RUN= yes

IPACCO?= www/${PORTNAME}
IPACCO_WEB= ${PREFIX}/${IPACCO}
Expand Down
4 changes: 2 additions & 2 deletions net/openverse/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ DISTNAME= ${PORTNAME}-0.8-7
MAINTAINER= ports@FreeBSD.org
COMMENT= A visual chat program written in Tcl/Tk

USE_TK= yes
USE_TCL= yes
USE_TK_RUN= yes
USE_TCL_RUN= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/OpenVerse

Expand Down
1 change: 0 additions & 1 deletion net/tcpillust/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ COMMENT= A graphical TCP connection analysis tool

USE_TCL= yes
USE_TK= yes
USE_TK_BUILD= yes
USE_XLIB= yes
USE_MOTIF= yes

Expand Down
4 changes: 2 additions & 2 deletions ports-mgmt/instant-tinderbox/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ USE_APACHE= yes

USE_PHP= yes

USE_TCL= yes
USE_TK= yes
USE_TCL_RUN= yes
USE_TK_RUN= yes

USE_XLIB= yes
USE_PERL5= yes
Expand Down
9 changes: 2 additions & 7 deletions security/aolserver-nsmcrypt/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,8 @@ PLIST_SUB+= AOLSERVERBASE=${AOLSERVERBASE:S/${PREFIX}\///}

USE_GMAKE= yes

USE_TCL_VER?= 84

.if ${USE_TCL_VER} != 84 && ${USE_TCL_VER} != 85
IGNORE= supported values for USE_TCL_VER are only 84 and 85
.endif

USE_TCL_BUILD= ${USE_TCL_VER}-thread
USE_TCL= 84+
USE_TCL_THREADS= yes

.include <bsd.port.pre.mk>

Expand Down
9 changes: 2 additions & 7 deletions security/aolserver-nsmhash/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,8 @@ PLIST_SUB+= AOLSERVERBASE=${AOLSERVERBASE:S/${PREFIX}\///}

USE_GMAKE= yes

USE_TCL_VER?= 84

.if ${USE_TCL_VER} != 84 && ${USE_TCL_VER} != 85
IGNORE= supported values for USE_TCL_VER are only 84 and 85
.endif

USE_TCL_BUILD= ${USE_TCL_VER}-thread
USE_TCL= 84+
USE_TCL_THREADS= yes

.include <bsd.port.pre.mk>

Expand Down
3 changes: 1 addition & 2 deletions security/gorilla/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ COMMENT= Password Gorilla is cross-platform Password Manager
LIB_DEPENDS= itcl.3:${PORTSDIR}/lang/itcl
RUN_DEPENDS= ${LOCALBASE}/lib/bwidget/init.tcl:${PORTSDIR}/x11-toolkits/bwidget

USE_TCL= yes
USE_TCL_RUN= yes
USE_TK= yes
USE_TK_BUILD= yes
GNU_CONFIGURE= yes
NO_BUILD= yes

Expand Down
2 changes: 1 addition & 1 deletion security/secpanel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ COMMENT= GUI for managing and running ssh and related utilities
RUN_DEPENDS= ssh-askpass:${PORTSDIR}/security/openssh-askpass

USE_X_PREFIX= yes
USE_TK= 84
USE_TK_RUN= 84

NO_BUILD= yes

Expand Down
2 changes: 1 addition & 1 deletion textproc/msort/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN_DEPENDS= iwidgets>=0:${PORTSDIR}/x11-toolkits/iwidgets
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV+= INCLUDES="-I${LOCALBASE}/include"
GNU_CONFIGURE= yes
USE_TK= yes
USE_TK_RUN= yes

PLIST_FILES= bin/msg bin/msort

Expand Down
2 changes: 1 addition & 1 deletion textproc/redet/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/iwidgets/iwidgets.tcl:${PORTSDIR}/x11-toolkits/iwi

NO_BUILD= yes
USE_BZIP2= yes
USE_TK= 84
USE_TK_RUN= 84

PORTDOCS= AUTHORS COPYING CREDITS LICENSE NEWS README-General ChangeLog
MAN1= redet.1
Expand Down
4 changes: 2 additions & 2 deletions textproc/redland-bindings/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ PLIST_SUB+= WITH_RUBY="@comment "
.endif
.if defined(WITH_TCL)
.if defined(WITH_TCL83)
USE_TCL= 83
USE_TCL_RUN= 83
TCL_LONG_V= 8.3
.else
USE_TCL= 84
USE_TCL_RUN= 84
TCL_LONG_V= 8.4
.endif
PLIST_SUB+= WITH_TCL=""
Expand Down
4 changes: 2 additions & 2 deletions textproc/xml2rfc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ EXTRACT_SUFX= .tgz
MAINTAINER= lennox@cs.columbia.edu
COMMENT= A tool to create RFCs and related documents from XML, as per RFC2629

USE_TCL=yes
USE_TCL_RUN= yes

.if !defined(WITHOUT_X11)
USE_TK=yes
USE_TK_RUN= yes
.endif

PATCH_TCL_SCRIPTS=xml2rfc.tcl
Expand Down
Loading

0 comments on commit cfa7269

Please sign in to comment.