Date: Fri, 10 Jan 2014 09:01:34 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339335 - in head/x11-toolkits/itk: . files Message-ID: <201401100901.s0A91Ya3011956@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Fri Jan 10 09:01:34 2014 New Revision: 339335 URL: http://svnweb.freebsd.org/changeset/ports/339335 Log: - Convert to new LIB_DEPENDS format - Convert to USES=tk - STAGE-clean Modified: head/x11-toolkits/itk/Makefile head/x11-toolkits/itk/files/Makefile.lib head/x11-toolkits/itk/pkg-plist (contents, props changed) Modified: head/x11-toolkits/itk/Makefile ============================================================================== --- head/x11-toolkits/itk/Makefile Fri Jan 10 09:01:16 2014 (r339334) +++ head/x11-toolkits/itk/Makefile Fri Jan 10 09:01:34 2014 (r339335) @@ -11,13 +11,13 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= erik@bz.bzflag.bz COMMENT= Object-oriented extension to Tk [incr Tk] -LIB_DEPENDS= itcl.${MAJOR}:${PORTSDIR}/lang/itcl +LIB_DEPENDS= libitcl.so.${MAJOR}:${PORTSDIR}/lang/itcl -USE_TK= 84+ +USES= tk USE_LDCONFIG= yes MAKE_ENV+= ${PLIST_SUB} \ SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \ - USE_TK=${USE_TK} TCL_INCLUDEDIR=${TCL_INCLUDEDIR} \ + USE_TK=${TK_SHLIB_VER} TCL_INCLUDEDIR=${TCL_INCLUDEDIR} \ TK_INCLUDEDIR=${TK_INCLUDEDIR} MAKEFILE= ${FILESDIR}/Makefile.lib @@ -28,11 +28,8 @@ MINOR= ${PORTVERSION:E} PLIST_SUB+= MAJOR=${MAJOR} MINOR=${MINOR} ITK_LIB= libitk.so.${MAJOR} -MANN= Archetype.n Toplevel.n Widget.n itk.n itkvars.n usual.n - ITK_LIB_FILE= ${ITK_LIB}.${SHLIB_MAJOR} -NO_STAGE= yes .if defined(DISPLAY) post-build: test .else Modified: head/x11-toolkits/itk/files/Makefile.lib ============================================================================== --- head/x11-toolkits/itk/files/Makefile.lib Fri Jan 10 09:01:16 2014 (r339334) +++ head/x11-toolkits/itk/files/Makefile.lib Fri Jan 10 09:01:34 2014 (r339335) @@ -3,7 +3,7 @@ LIB= itk ITK_LIBRARY= ${PREFIX}/lib/itk${MAJOR}.${MINOR} CFLAGS+= -I. -I./../generic \ -I${TCL_INCLUDEDIR}/generic \ - -I ${PREFIX}/include/itcl${MAJOR}.*/ \ + -I ${LOCALBASE}/include/itcl${MAJOR}.*/ \ -I${TK_INCLUDEDIR}/generic \ -I${LOCALBASE}/include \ -DHAVE_GETCWD=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1\ @@ -21,9 +21,9 @@ LDADD+= -L${PREFIX}/lib -litcl -L${LOCA SRCS= itk_cmds.c itk_option.c itk_archetype.c itk_util.c itkStubInit.c SCRIPTDIR= lib/itk${MAJOR}.${MINOR} -SCRIPTPATH= ${PREFIX}/${SCRIPTDIR} +SCRIPTPATH= ${DESTDIR}${PREFIX}/${SCRIPTDIR} LIBDIR= ${PREFIX}/lib -INCDIR= ${PREFIX}/include/itk${MAJOR}.${MINOR} +INCDIR= ${DESTDIR}${PREFIX}/include/itk${MAJOR}.${MINOR} pkgIndex.tcl: pkgIndex.tcl.in sed -e 's#"@PKG_LIB_FILE@"#.. ${SHLIB_NAME}#' -e "s#@PACKAGE_VERSION@#${MAJOR}.${MINOR}#" \ @@ -40,6 +40,6 @@ ${SCRIPTPATH} ${INCDIR}: beforeinstall: pkgIndex.tcl itkConfig.sh ${SCRIPTPATH} ${INCDIR} ${BSD_INSTALL_DATA} pkgIndex.tcl itkConfig.sh ${.CURDIR}/library/* ${SCRIPTPATH} ${BSD_INSTALL_DATA} ${.CURDIR}/generic/*.h ${INCDIR} - ${BSD_INSTALL_MAN} ${.CURDIR}/doc/*.n ${PREFIX}/man/mann/ + ${BSD_INSTALL_MAN} ${.CURDIR}/doc/*.n ${DESTDIR}${PREFIX}/man/mann/ .include <bsd.lib.mk> Modified: head/x11-toolkits/itk/pkg-plist ============================================================================== --- head/x11-toolkits/itk/pkg-plist Fri Jan 10 09:01:16 2014 (r339334) +++ head/x11-toolkits/itk/pkg-plist Fri Jan 10 09:01:34 2014 (r339335) @@ -10,5 +10,11 @@ lib/itk%%MAJOR%%.%%MINOR%%/itk.tcl lib/itk%%MAJOR%%.%%MINOR%%/itkConfig.sh lib/itk%%MAJOR%%.%%MINOR%%/tclIndex lib/itk%%MAJOR%%.%%MINOR%%/pkgIndex.tcl +man/mann/Archetype.n.gz +man/mann/Toplevel.n.gz +man/mann/Widget.n.gz +man/mann/itk.n.gz +man/mann/itkvars.n.gz +man/mann/usual.n.gz @dirrm include/itk%%MAJOR%%.%%MINOR%% @dirrm lib/itk%%MAJOR%%.%%MINOR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401100901.s0A91Ya3011956>