From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 2 05:50:15 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E08F37B401 for ; Wed, 2 Jul 2003 05:50:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F6534401A for ; Wed, 2 Jul 2003 05:50:14 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h62CoDUp018255 for ; Wed, 2 Jul 2003 05:50:14 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h62CoD1o018253; Wed, 2 Jul 2003 05:50:13 -0700 (PDT) Resent-Date: Wed, 2 Jul 2003 05:50:13 -0700 (PDT) Resent-Message-Id: <200307021250.h62CoD1o018253@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rui Lopes Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E407437B404 for ; Wed, 2 Jul 2003 05:44:42 -0700 (PDT) Received: from ns.webtt.biz (ns.webtt.biz [64.239.29.225]) by mx1.FreeBSD.org (Postfix) with SMTP id A873B43FBF for ; Wed, 2 Jul 2003 05:44:41 -0700 (PDT) (envelope-from root@ns.webtt.biz) Received: (qmail 7051 invoked by uid 0); 2 Jul 2003 12:46:59 -0000 Message-Id: <20030702124659.7050.qmail@ns.webtt.biz> Date: 2 Jul 2003 12:46:59 -0000 From: Rui Lopes To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: bram@a-a-p.org cc: marcus@FreeBSD.org Subject: ports/54014: [PATCH] for updating devel/aap X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Rui Lopes List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2003 12:50:15 -0000 >Number: 54014 >Category: ports >Synopsis: [PATCH] for updating devel/aap >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jul 02 05:50:13 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Rui Lopes >Release: FreeBSD 5.1-RELEASE i386 >Organization: >Environment: System: FreeBSD disty 5.1-RELEASE FreeBSD 5.1-RELEASE #0: Fri Jun 6 19:30:44 WEST 2003 root@disty:/usr/obj/usr/src/sys/DEBUGGER i386 >Description: Things changed/fixed: * removed pkg-install script and bundled .pyc on package * don't create .pyo files since they will not be used * honor the NOPORTDOCS variable * install .html files inside html directory * other minor tweaks >How-To-Repeat: >Fix: --- aap.patch begins here --- # * removed pkg-install script and bundled .pyc on package # * don't create .pyo files since they will not be used # * honor the NOPORTDOCS variable # * install .html files inside html directory # * other minor tweaks diff -ruN aap.orig/Makefile aap/Makefile --- aap.orig/Makefile Fri Jun 27 19:30:23 2003 +++ aap/Makefile Wed Jul 2 13:32:35 2003 @@ -7,6 +7,7 @@ PORTNAME= aap PORTVERSION= 0.900 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= a-a-p @@ -16,41 +17,38 @@ MAN1= aap.1 +NO_BUILD= yes NO_WRKSUBDIR= yes USE_ZIP= yes USE_PYTHON= yes PLIST_SUB+= PORTVERSION=${PORTVERSION} -# This port does not need to build anything here -do-build: - @${TRUE} - # The files are installed in lib/aap/Exec-${PORTVERSION} and below. Create # a symbolic link for bin/aap so that it's found in $PATH and still knows # where to find the Python modules. # Also create a link for share/doc/aap, so that more people can find the docs # without clobbering share/doc. -AAPEXECDIR= lib/aap/Exec-${PORTVERSION} -INSTALLDIR= ${PREFIX}/${AAPEXECDIR} +INSTALLDIR= ${PREFIX}/lib/aap/Exec-${PORTVERSION} do-install: cd ${WRKSRC} && \ - ${MKDIR} -m 755 ${INSTALLDIR}/doc ${INSTALLDIR}/tools && \ + ${MKDIR} -m 755 ${INSTALLDIR}/tools && \ ${INSTALL_SCRIPT} *.py aap ${INSTALLDIR} && \ - ${INSTALL_SCRIPT} tools/*.py ${INSTALLDIR}/tools && \ - ${INSTALL_DATA} -m 644 COPYING README.txt filetype.txt default.aap ${INSTALLDIR} && \ - ${INSTALL_DATA} doc/*.html doc/exec.pdf ${INSTALLDIR}/doc && \ - ${INSTALL_DATA} aap.1 ${PREFIX}/man/man1 && \ ${LN} -fhs ${INSTALLDIR}/aap ${PREFIX}/bin/aap && \ + ${INSTALL_SCRIPT} tools/*.py ${INSTALLDIR}/tools && \ + ${INSTALL_DATA} -m 644 COPYING README.txt default.aap ${INSTALLDIR} && \ + ${INSTALL_DATA} aap.1 ${PREFIX}/man/man1 +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && \ + ${MKDIR} -m 755 ${INSTALLDIR}/doc ${INSTALLDIR}/doc/html && \ + ${INSTALL_DATA} filetype.txt doc/exec.pdf ${INSTALLDIR}/doc && \ + ${INSTALL_DATA} doc/*.html ${INSTALLDIR}/doc/html && \ ${LN} -fhs ${INSTALLDIR}/doc ${PREFIX}/share/doc/aap +.endif + cd ${INSTALLDIR} && \ + ${PYTHON_CMD} -c "import compileall; compileall.compile_dir('.', 1)" -post-install: - @${SED} -e 's,@PYTHON_CMD@,${PYTHON_CMD},g ; \ - s,@AAPEXECDIR@,${AAPEXECDIR},g' \ - < ${FILESDIR}/pkg-install.in > ${WRKSRC}/pkg-install - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${WRKSRC}/pkg-install ${PKGNAME} POST-INSTALL - -test: - cd ${WRKSRC}; ./aap +test: install + cd ${WRKSRC}; ${PREFIX}/bin/aap .include diff -ruN aap.orig/files/pkg-install.in aap/files/pkg-install.in --- aap.orig/files/pkg-install.in Fri Jun 27 19:30:23 2003 +++ aap/files/pkg-install.in Thu Jan 1 01:00:00 1970 @@ -1,15 +0,0 @@ -#!/bin/sh -# $FreeBSD: ports/devel/aap/files/pkg-install.in,v 1.1 2003/06/18 20:40:55 marcus Exp $ - -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -PYTHON_CMD=@PYTHON_CMD@ -INSTALLDIR=${PKG_PREFIX}/@AAPEXECDIR@ - -echo 'Compiling files...' -(cd ${INSTALLDIR} && \ - ${PYTHON_CMD} -c "import compileall; compileall.compile_dir('.', 1)" && \ - ${PYTHON_CMD} -O -c "import compileall; compileall.compile_dir('.', 1)" \ - ) || exit 1 diff -ruN aap.orig/pkg-plist aap/pkg-plist --- aap.orig/pkg-plist Fri Jun 27 19:30:23 2003 +++ aap/pkg-plist Tue Jul 1 22:40:46 2003 @@ -1,98 +1,140 @@ bin/aap lib/aap/Exec-%%PORTVERSION%%/Action.py +lib/aap/Exec-%%PORTVERSION%%/Action.pyc lib/aap/Exec-%%PORTVERSION%%/Args.py +lib/aap/Exec-%%PORTVERSION%%/Args.pyc lib/aap/Exec-%%PORTVERSION%%/COPYING lib/aap/Exec-%%PORTVERSION%%/Cache.py +lib/aap/Exec-%%PORTVERSION%%/Cache.pyc lib/aap/Exec-%%PORTVERSION%%/Commands.py +lib/aap/Exec-%%PORTVERSION%%/Commands.pyc lib/aap/Exec-%%PORTVERSION%%/CopyMove.py +lib/aap/Exec-%%PORTVERSION%%/CopyMove.pyc lib/aap/Exec-%%PORTVERSION%%/Depend.py +lib/aap/Exec-%%PORTVERSION%%/Depend.pyc lib/aap/Exec-%%PORTVERSION%%/Dictlist.py +lib/aap/Exec-%%PORTVERSION%%/Dictlist.pyc lib/aap/Exec-%%PORTVERSION%%/DoAddDef.py +lib/aap/Exec-%%PORTVERSION%%/DoAddDef.pyc lib/aap/Exec-%%PORTVERSION%%/DoArgs.py +lib/aap/Exec-%%PORTVERSION%%/DoArgs.pyc lib/aap/Exec-%%PORTVERSION%%/DoBuild.py +lib/aap/Exec-%%PORTVERSION%%/DoBuild.pyc lib/aap/Exec-%%PORTVERSION%%/DoInstall.py +lib/aap/Exec-%%PORTVERSION%%/DoInstall.pyc lib/aap/Exec-%%PORTVERSION%%/DoRead.py +lib/aap/Exec-%%PORTVERSION%%/DoRead.pyc lib/aap/Exec-%%PORTVERSION%%/Error.py +lib/aap/Exec-%%PORTVERSION%%/Error.pyc lib/aap/Exec-%%PORTVERSION%%/Filetype.py +lib/aap/Exec-%%PORTVERSION%%/Filetype.pyc lib/aap/Exec-%%PORTVERSION%%/Global.py +lib/aap/Exec-%%PORTVERSION%%/Global.pyc lib/aap/Exec-%%PORTVERSION%%/Main.py +lib/aap/Exec-%%PORTVERSION%%/Main.pyc lib/aap/Exec-%%PORTVERSION%%/Message.py +lib/aap/Exec-%%PORTVERSION%%/Message.pyc lib/aap/Exec-%%PORTVERSION%%/Node.py +lib/aap/Exec-%%PORTVERSION%%/Node.pyc lib/aap/Exec-%%PORTVERSION%%/ParsePos.py +lib/aap/Exec-%%PORTVERSION%%/ParsePos.pyc lib/aap/Exec-%%PORTVERSION%%/PkgInstall.py +lib/aap/Exec-%%PORTVERSION%%/PkgInstall.pyc lib/aap/Exec-%%PORTVERSION%%/Port.py +lib/aap/Exec-%%PORTVERSION%%/Port.pyc lib/aap/Exec-%%PORTVERSION%%/PrintProfile.py +lib/aap/Exec-%%PORTVERSION%%/PrintProfile.pyc lib/aap/Exec-%%PORTVERSION%%/Process.py +lib/aap/Exec-%%PORTVERSION%%/Process.pyc lib/aap/Exec-%%PORTVERSION%%/README.txt lib/aap/Exec-%%PORTVERSION%%/RecPos.py +lib/aap/Exec-%%PORTVERSION%%/RecPos.pyc lib/aap/Exec-%%PORTVERSION%%/RecPython.py +lib/aap/Exec-%%PORTVERSION%%/RecPython.pyc lib/aap/Exec-%%PORTVERSION%%/Remote.py +lib/aap/Exec-%%PORTVERSION%%/Remote.pyc lib/aap/Exec-%%PORTVERSION%%/RootShell.py +lib/aap/Exec-%%PORTVERSION%%/RootShell.pyc lib/aap/Exec-%%PORTVERSION%%/Rule.py +lib/aap/Exec-%%PORTVERSION%%/Rule.pyc lib/aap/Exec-%%PORTVERSION%%/Scope.py +lib/aap/Exec-%%PORTVERSION%%/Scope.pyc lib/aap/Exec-%%PORTVERSION%%/Sign.py +lib/aap/Exec-%%PORTVERSION%%/Sign.pyc lib/aap/Exec-%%PORTVERSION%%/Util.py +lib/aap/Exec-%%PORTVERSION%%/Util.pyc lib/aap/Exec-%%PORTVERSION%%/VersCont.py +lib/aap/Exec-%%PORTVERSION%%/VersCont.pyc lib/aap/Exec-%%PORTVERSION%%/VersContCvs.py +lib/aap/Exec-%%PORTVERSION%%/VersContCvs.pyc lib/aap/Exec-%%PORTVERSION%%/Version.py +lib/aap/Exec-%%PORTVERSION%%/Version.pyc lib/aap/Exec-%%PORTVERSION%%/Work.py +lib/aap/Exec-%%PORTVERSION%%/Work.pyc lib/aap/Exec-%%PORTVERSION%%/__init__.py +lib/aap/Exec-%%PORTVERSION%%/__init__.pyc lib/aap/Exec-%%PORTVERSION%%/aap lib/aap/Exec-%%PORTVERSION%%/aap.py +lib/aap/Exec-%%PORTVERSION%%/aap.pyc lib/aap/Exec-%%PORTVERSION%%/aapnetrc.py +lib/aap/Exec-%%PORTVERSION%%/aapnetrc.pyc lib/aap/Exec-%%PORTVERSION%%/default.aap -lib/aap/Exec-%%PORTVERSION%%/doc/exec.html -lib/aap/Exec-%%PORTVERSION%%/doc/exec.pdf -lib/aap/Exec-%%PORTVERSION%%/doc/index.html -lib/aap/Exec-%%PORTVERSION%%/doc/license.html -lib/aap/Exec-%%PORTVERSION%%/doc/ln12.html -lib/aap/Exec-%%PORTVERSION%%/doc/p1714.html -lib/aap/Exec-%%PORTVERSION%%/doc/p2794.html -lib/aap/Exec-%%PORTVERSION%%/doc/p30.html -lib/aap/Exec-%%PORTVERSION%%/doc/p794.html -lib/aap/Exec-%%PORTVERSION%%/doc/ref-arguments.html -lib/aap/Exec-%%PORTVERSION%%/doc/ref-attributes.html -lib/aap/Exec-%%PORTVERSION%%/doc/ref-commands.html -lib/aap/Exec-%%PORTVERSION%%/doc/ref-syntax.html -lib/aap/Exec-%%PORTVERSION%%/doc/ref-variables.html -lib/aap/Exec-%%PORTVERSION%%/doc/tutor-actions.html -lib/aap/Exec-%%PORTVERSION%%/doc/tutor-compile.html -lib/aap/Exec-%%PORTVERSION%%/doc/tutor-cvs.html -lib/aap/Exec-%%PORTVERSION%%/doc/tutor-distribute.html -lib/aap/Exec-%%PORTVERSION%%/doc/tutor-include.html -lib/aap/Exec-%%PORTVERSION%%/doc/tutor-pipe.html -lib/aap/Exec-%%PORTVERSION%%/doc/tutor-port.html -lib/aap/Exec-%%PORTVERSION%%/doc/tutor-python.html -lib/aap/Exec-%%PORTVERSION%%/doc/tutor-start.html -lib/aap/Exec-%%PORTVERSION%%/doc/tutor-variant.html -lib/aap/Exec-%%PORTVERSION%%/doc/tutor-website.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-autodep.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-basics.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-cvs.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-debug.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-depend.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-fetch.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-filetype.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-install.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-issue.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-makedif.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-package.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-porting.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-publish.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-python.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-tools.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-variant.html -lib/aap/Exec-%%PORTVERSION%%/doc/user-version.html -lib/aap/Exec-%%PORTVERSION%%/filetype.txt +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/exec.pdf +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/filetype.txt +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/exec.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/index.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/license.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ln12.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/p1714.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/p2794.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/p30.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/p794.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-arguments.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-attributes.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-commands.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-syntax.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/ref-variables.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-actions.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-compile.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-cvs.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-distribute.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-include.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-pipe.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-port.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-python.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-start.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-variant.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/tutor-website.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-autodep.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-basics.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-cvs.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-debug.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-depend.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-fetch.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-filetype.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-install.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-issue.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-makedif.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-package.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-porting.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-publish.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-python.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-tools.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-variant.html +%%PORTDOCS%%lib/aap/Exec-%%PORTVERSION%%/doc/html/user-version.html lib/aap/Exec-%%PORTVERSION%%/tools/__init__.py +lib/aap/Exec-%%PORTVERSION%%/tools/__init__.pyc lib/aap/Exec-%%PORTVERSION%%/tools/gcc.py +lib/aap/Exec-%%PORTVERSION%%/tools/gcc.pyc lib/aap/Exec-%%PORTVERSION%%/tools/icc.py +lib/aap/Exec-%%PORTVERSION%%/tools/icc.pyc lib/aap/Exec-%%PORTVERSION%%/tools/mingw.py +lib/aap/Exec-%%PORTVERSION%%/tools/mingw.pyc lib/aap/Exec-%%PORTVERSION%%/tools/msvc.py -share/doc/aap -@unexec rm -f %D/lib/aap/Exec-%%PORTVERSION%%/tools/*.py[co] -@unexec rm -f %D/lib/aap/Exec-%%PORTVERSION%%/*.py[co] -@dirrm lib/aap/Exec-%%PORTVERSION%%/doc +lib/aap/Exec-%%PORTVERSION%%/tools/msvc.pyc +%%PORTDOCS%%share/doc/aap @dirrm lib/aap/Exec-%%PORTVERSION%%/tools +%%PORTDOCS%%@dirrm lib/aap/Exec-%%PORTVERSION%%/doc/html +%%PORTDOCS%%@dirrm lib/aap/Exec-%%PORTVERSION%%/doc @dirrm lib/aap/Exec-%%PORTVERSION%% @dirrm lib/aap --- aap.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: