From owner-svn-ports-head@FreeBSD.ORG Sun May 25 05:09:51 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B190F4EE; Sun, 25 May 2014 05:09:51 +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 9D5682D48; Sun, 25 May 2014 05:09: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 s4P59pKF024690; Sun, 25 May 2014 05:09:51 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4P59pOr024684; Sun, 25 May 2014 05:09:51 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201405250509.s4P59pOr024684@svn.freebsd.org> From: Martin Wilke Date: Sun, 25 May 2014 05:09:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355110 - in head/www/bins: . files 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: Sun, 25 May 2014 05:09:51 -0000 Author: miwi Date: Sun May 25 05:09:50 2014 New Revision: 355110 URL: http://svnweb.freebsd.org/changeset/ports/355110 QAT: https://qat.redports.org/buildarchive/r355110/ Log: - Stage support PR: 190015 Submitted by: Joseph Benden Modified: head/www/bins/Makefile head/www/bins/files/extra-patch-install.sh head/www/bins/pkg-plist Modified: head/www/bins/Makefile ============================================================================== --- head/www/bins/Makefile Sun May 25 04:09:13 2014 (r355109) +++ head/www/bins/Makefile Sun May 25 05:09:50 2014 (r355110) @@ -29,7 +29,6 @@ RUN_DEPENDS= \ USES= tar:bzip2 perl5 USE_PERL5= run NO_BUILD= yes -NO_STAGE= yes # additional scripts BINS_SCRIPTS= tools/bins_txt2xml @@ -49,16 +48,16 @@ post-patch:: ${WRKSRC}/tools/bins_txt2xml do-install: - @${SETENV} PREFIX=${PREFIX} RC=${PREFIX}/share/bins ${WRKSRC}/install.sh + @${SETENV} LOCALE=${PREFIX}/share/locale DESTDIR=${STAGEDIR} PREFIX=${PREFIX} RC=${PREFIX}/share/bins ${WRKSRC}/install.sh post-install: .for file in ${BINS_SCRIPTS} - @${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/bin + @${INSTALL_SCRIPT} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/bin .endfor .ifndef(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for ext in ${DOC_EXTS} - @${INSTALL_DATA} ${WRKSRC}/doc/*.${ext} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/*.${ext} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: head/www/bins/files/extra-patch-install.sh ============================================================================== --- head/www/bins/files/extra-patch-install.sh Sun May 25 04:09:13 2014 (r355109) +++ head/www/bins/files/extra-patch-install.sh Sun May 25 05:09:50 2014 (r355110) @@ -1,6 +1,23 @@ ---- install.sh.orig Thu Aug 25 06:07:05 2005 -+++ install.sh Mon Mar 19 02:47:24 2007 -@@ -67,11 +67,10 @@ +--- install.sh.orig 2014-05-20 08:56:00.000000000 -0700 ++++ install.sh 2014-05-20 09:00:43.000000000 -0700 +@@ -24,6 +24,7 @@ + GLOBAL_RC="$RC" + + DESTDIR=`echo "$DESTDIR"|sed 's%/$%%'` ++ORIGPREFIX=$PREFIX + PREFIX=$DESTDIR/`echo "$PREFIX"|sed 's%^/%%'` + PREFIX=`echo "$PREFIX"|sed 's%/$%%'` + ETC=$DESTDIR/`echo "$ETC"|sed 's%^/%%'` +@@ -35,7 +36,7 @@ + SHARE="$PREFIX/share" + DATA="$SHARE/bins" + GLADE="$DATA" +-LOCALE="$SHARE/locale" ++LOCALE="${SHARE}/locale" + MAN="$PREFIX/man/man1" + + cd `dirname $0` +@@ -67,11 +68,10 @@ if [ -w $BIN ] ; then echo "Installing program files in $BIN" # bins_cleanupgallery anti_bins @@ -13,7 +30,7 @@ chmod a+rx $BIN/anti_bins # perl -pi -e "s{/usr/local/share}{$SHARE}g" \ # $BIN/bins $BIN/bins_edit $BIN/bins-edit-gui -@@ -169,13 +168,6 @@ +@@ -169,13 +169,6 @@ fi set -o errexit @@ -27,7 +44,7 @@ # man pages mkdir -p $MAN 2>/dev/null || true if [ -w $MAN ] ; then -@@ -203,9 +195,6 @@ +@@ -203,9 +196,6 @@ do mkdir -p $LOCALE/$L/LC_MESSAGES 2>/dev/null || true cp intl/$L.mo $LOCALE/$L/LC_MESSAGES/bins.mo @@ -37,3 +54,12 @@ done else cat </dev/null +-1,\$s%/usr/local/share%$SHARE%g ++1,\$s%/usr/local/share%$ORIGPREFIX/share%g + 1,\$s%/etc/bins%$GLOBAL_RC%g + wq + EoF Modified: head/www/bins/pkg-plist ============================================================================== --- head/www/bins/pkg-plist Sun May 25 04:09:13 2014 (r355109) +++ head/www/bins/pkg-plist Sun May 25 05:09:50 2014 (r355110) @@ -1,6 +1,9 @@ bin/bins bin/bins_edit bin/bins_txt2xml +man/man1/bins-edit-gui.1.gz +man/man1/bins.1.gz +man/man1/bins_edit.1.gz %%DATADIR%%/binsrc %%DATADIR%%/templates.joi/details.html %%DATADIR%%/templates.joi/footer.html