From owner-svn-ports-head@FreeBSD.ORG Mon Jun 9 23:29:52 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D64788F; Mon, 9 Jun 2014 23:29:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F305F2DF9; Mon, 9 Jun 2014 23:29:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s59NTprC099621; Mon, 9 Jun 2014 23:29:51 GMT (envelope-from mi@svn.freebsd.org) Received: (from mi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s59NToSE099605; Mon, 9 Jun 2014 23:29:50 GMT (envelope-from mi@svn.freebsd.org) Message-Id: <201406092329.s59NToSE099605@svn.freebsd.org> From: Mikhail Teterin Date: Mon, 9 Jun 2014 23:29:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357224 - in head/textproc/wordnet: . files scripts X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jun 2014 23:29:52 -0000 Author: mi Date: Mon Jun 9 23:29:50 2014 New Revision: 357224 URL: http://svnweb.freebsd.org/changeset/ports/357224 QAT: https://qat.redports.org/buildarchive/r357224/ Log: Support staging. Modified: head/textproc/wordnet/Makefile head/textproc/wordnet/files/dict.Makefile head/textproc/wordnet/files/include.Makefile head/textproc/wordnet/files/src.wnb.Makefile head/textproc/wordnet/pkg-plist head/textproc/wordnet/scripts/configure Modified: head/textproc/wordnet/Makefile ============================================================================== --- head/textproc/wordnet/Makefile Mon Jun 9 23:27:02 2014 (r357223) +++ head/textproc/wordnet/Makefile Mon Jun 9 23:29:50 2014 (r357224) @@ -10,9 +10,9 @@ MASTER_SITES= http://wordnetcode.princet MAINTAINER= mi@aldan.algebra.com COMMENT= Dictionaries and thesauri with devel. libraries (C, TCL) and browsers -USES= tcl +USES= tcl uidfix SCRIPTS_ENV+= TCL_DVER=${TCL_VER} VER=${PORTVERSION} -MAKE_ENV+= TCL_DVER=${TCL_VER} VER=${PORTVERSION} +MAKE_ENV+= TCL_DVER=${TCL_VER} VER=${PORTVERSION} STAGEDIR="${STAGEDIR}" PLIST_SUB+= TCL_DVER=${TCL_VER} VER=${PORTVERSION} USE_BZIP2= yes REINPLACE_ARGS= -i "" @@ -20,7 +20,6 @@ USE_LDCONFIG= yes SUB_FILES= pkg-message SUB_LIST+= TCL_VER=${TCL_VER} -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e 's,/usr/local/WordNet-2.1,${DATADIR},g' \ ${WRKSRC}/src/wnb ${WRKSRC}/doc/man/*.? @@ -29,10 +28,4 @@ post-patch: post-install: @${CAT} ${PKGMESSAGE} -.include - -.for s in 1 3 5 7 -MAN$s != ${MAKE} -f ${FILESDIR}/man.Makefile -V MAN$s -.endfor - -.include +.include Modified: head/textproc/wordnet/files/dict.Makefile ============================================================================== --- head/textproc/wordnet/files/dict.Makefile Mon Jun 9 23:27:02 2014 (r357223) +++ head/textproc/wordnet/files/dict.Makefile Mon Jun 9 23:29:50 2014 (r357224) @@ -1,4 +1,4 @@ -WN_INSTALLDIR= ${PREFIX}/share/WordNet +WN_INSTALLDIR= ${STAGEDIR}${PREFIX}/share/WordNet WN_FILES= adj.exc adv.exc cntlist cntlist.rev data.adj \ data.adv data.noun data.verb frames.vrb index.adj \ index.adv index.noun index.sense index.verb \ Modified: head/textproc/wordnet/files/include.Makefile ============================================================================== --- head/textproc/wordnet/files/include.Makefile Mon Jun 9 23:27:02 2014 (r357223) +++ head/textproc/wordnet/files/include.Makefile Mon Jun 9 23:29:50 2014 (r357224) @@ -1,4 +1,4 @@ -WN_INSTALLDIR = ${PREFIX}/include/WordNet +WN_INSTALLDIR = ${STAGEDIR}${PREFIX}/include/WordNet WN_FILES= wn.h wngrind.h Modified: head/textproc/wordnet/files/src.wnb.Makefile ============================================================================== --- head/textproc/wordnet/files/src.wnb.Makefile Mon Jun 9 23:27:02 2014 (r357223) +++ head/textproc/wordnet/files/src.wnb.Makefile Mon Jun 9 23:29:50 2014 (r357224) @@ -23,14 +23,14 @@ pkgIndex.tcl: > pkgIndex.tcl LIBDIR= ${PREFIX}/lib -RESDIR= ${PREFIX}/share/WordNet/ +RESDIR= ${STAGEDIR}${PREFIX}/share/WordNet/ -${LIBDIR} ${RESDIR} ${LIBDIR}/tcl${TCL_DVER}/Wordnet: +${LIBDIR} ${RESDIR} ${STAGEDIR}${LIBDIR}/tcl${TCL_DVER}/Wordnet: mkdir -p ${.TARGET} -beforeinstall: ${LIBDIR} ${RESDIR} ${LIBDIR}/tcl${TCL_DVER}/Wordnet - ${BSD_INSTALL_DATA} pkgIndex.tcl ${LIBDIR}/tcl${TCL_DVER}/Wordnet +beforeinstall: ${RESDIR} ${STAGEDIR}${LIBDIR}/tcl${TCL_DVER}/Wordnet + ${BSD_INSTALL_DATA} pkgIndex.tcl ${STAGEDIR}${LIBDIR}/tcl${TCL_DVER}/Wordnet ${BSD_INSTALL_DATA} ${.CURDIR}/*.xbm ${RESDIR} - ${BSD_INSTALL_SCRIPT} ${.CURDIR:H:H}/src/wnb ${PREFIX}/bin + ${BSD_INSTALL_SCRIPT} ${.CURDIR:H:H}/src/wnb ${STAGEDIR}${PREFIX}/bin .include Modified: head/textproc/wordnet/pkg-plist ============================================================================== --- head/textproc/wordnet/pkg-plist Mon Jun 9 23:27:02 2014 (r357223) +++ head/textproc/wordnet/pkg-plist Mon Jun 9 23:29:50 2014 (r357224) @@ -31,3 +31,25 @@ lib/tcl%%TCL_DVER%%/Wordnet/pkgIndex.tcl @dirrm include/WordNet @dirrm lib/tcl%%TCL_DVER%%/Wordnet @dirrm %%DATADIR%% +man/man1/wn.1.gz +man/man1/wnb.1.gz +man/man1/wnintro.1.gz +man/man3/binsrch.3.gz +man/man3/morph.3.gz +man/man3/wnintro.3.gz +man/man3/wnsearch.3.gz +man/man3/wnutil.3.gz +man/man5/cntlist.5.gz +man/man5/lexnames.5.gz +man/man5/senseidx.5.gz +man/man5/wndb.5.gz +man/man5/wninput.5.gz +man/man5/wnintro.5.gz +man/man7/morphy.7.gz +man/man7/uniqbeg.7.gz +man/man7/wngloss.7.gz +man/man7/wngroups.7.gz +man/man7/wnintro.7.gz +man/man7/wnlicens.7.gz +man/man7/wnpkgs.7.gz +man/man7/wnstats.7.gz Modified: head/textproc/wordnet/scripts/configure ============================================================================== --- head/textproc/wordnet/scripts/configure Mon Jun 9 23:27:02 2014 (r357223) +++ head/textproc/wordnet/scripts/configure Mon Jun 9 23:29:50 2014 (r357224) @@ -18,7 +18,7 @@ for mf in ${FILESDIR}/*Makefile ; do \ dir=${WRKSRC}/$dir test -f ${dir}Makefile.orig && continue test -f ${dir}Makefile && mv ${dir}Makefile ${dir}Makefile.orig - cp -p $mf ${dir}Makefile + ln -s $mf ${dir}Makefile done patch -d ${WRKSRC}/src -p << EOPATCH