Date: 18 Jun 2003 19:47:40 -0000 From: Rui Lopes <rui@ruilopes.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: bram@a-a-p.org Subject: ports/53456: [PATCH] for upgrading devel/aap to 0.900 Message-ID: <20030618194740.25058.qmail@ns.webtt.biz> Resent-Message-ID: <200306181950.h5IJoKTo063280@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 53456
>Category: ports
>Synopsis: [PATCH] for upgrading devel/aap to 0.900
>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 Jun 18 12:50:19 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:
- upgraded from 0.111 to 0.900
- changed -m 744 to -m 644 in install of files COPYING README.txt filetype.txt default.aap
- add pkg-install script that compiles python files after pkg installation
- removed the openssh dependency
>How-To-Repeat:
>Fix:
--- aap.patch begins here ---
diff -ruN aap.orig/Makefile aap/Makefile
--- aap.orig/Makefile Sun May 11 23:30:01 2003
+++ aap/Makefile Wed Jun 18 20:29:13 2003
@@ -6,19 +6,14 @@
#
PORTNAME= aap
-PORTVERSION= 0.111
+PORTVERSION= 0.900
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= a-a-p
-DISTNAME= exec-${PORTVERSION}
MAINTAINER= bram@a-a-p.org
COMMENT= A build tool alternative to make with internet access and CVS support
-# A-A-P requires an "scp" command. If it doesn't exist, we need to chose which
-# one to install. The OpenSSH one is probably the best choice.
-RUN_DEPENDS= scp:${PORTSDIR}/security/openssh
-
MAN1= aap.1
NO_WRKSUBDIR= yes
@@ -27,27 +22,33 @@
USE_PYTHON= yes
PLIST_SUB+= PORTVERSION=${PORTVERSION}
-# There is no Makefile for A-A-P; do the building and installing here.
-#
-# Building means compiling the Python files so that the .pyc and .pyo files are
-# generated.
+# This port does not need to build anything here
do-build:
- cd ${WRKSRC}; ${PYTHON_CMD} -c "import compileall; compileall.compile_dir('.', 0)"
- cd ${WRKSRC}; ${PYTHON_CMD} -O -c "import compileall; compileall.compile_dir('.', 0)"
+ @${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}
do-install:
- ${MKDIR} -m 0755 ${PREFIX}/lib/aap/Exec-${PORTVERSION}/doc
- cd ${WRKSRC}; ${INSTALL_SCRIPT} *.py *.pyc *.pyo aap ${PREFIX}/lib/aap/Exec-${PORTVERSION}
- cd ${WRKSRC}; ${INSTALL_DATA} -m 0744 COPYING README.txt filetype.txt default.aap ${PREFIX}/lib/aap/Exec-${PORTVERSION}
- cd ${WRKSRC}; ${INSTALL_DATA} doc/*.html doc/exec.pdf ${PREFIX}/lib/aap/Exec-${PORTVERSION}/doc
- cd ${WRKSRC}; ${INSTALL_DATA} aap.1 ${PREFIX}/man/man1
- cd ${PREFIX}/bin; ${LN} -fhs ../lib/aap/Exec-${PORTVERSION}/aap aap
- cd ${PREFIX}/share/doc; ${LN} -fhs ../../lib/aap/Exec-${PORTVERSION}/doc aap
+ cd ${WRKSRC} && \
+ ${MKDIR} -m 755 ${INSTALLDIR}/doc ${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 && \
+ ${LN} -fhs ${INSTALLDIR}/doc ${PREFIX}/share/doc/aap
+
+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
diff -ruN aap.orig/distinfo aap/distinfo
--- aap.orig/distinfo Sun May 11 23:30:01 2003
+++ aap/distinfo Mon May 12 00:53:30 2003
@@ -1 +1 @@
-MD5 (exec-0.111.zip) = 0b90a89eeb07d208ff5d2dda9277ed19
+MD5 (aap-0.900.zip) = 1993e6ece7f48dd10b3eb455470e97b5
diff -ruN aap.orig/files/pkg-install.in aap/files/pkg-install.in
--- aap.orig/files/pkg-install.in Thu Jan 1 01:00:00 1970
+++ aap/files/pkg-install.in Thu Jun 12 21:00:06 2003
@@ -0,0 +1,15 @@
+#!/bin/sh
+# $FreeBSD$
+
+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 Sun May 11 23:30:01 2003
+++ aap/pkg-plist Mon May 12 02:15:24 2003
@@ -1,118 +1,55 @@
bin/aap
lib/aap/Exec-%%PORTVERSION%%/Action.py
-lib/aap/Exec-%%PORTVERSION%%/Action.pyc
-lib/aap/Exec-%%PORTVERSION%%/Action.pyo
lib/aap/Exec-%%PORTVERSION%%/Args.py
-lib/aap/Exec-%%PORTVERSION%%/Args.pyc
-lib/aap/Exec-%%PORTVERSION%%/Args.pyo
lib/aap/Exec-%%PORTVERSION%%/COPYING
lib/aap/Exec-%%PORTVERSION%%/Cache.py
-lib/aap/Exec-%%PORTVERSION%%/Cache.pyc
-lib/aap/Exec-%%PORTVERSION%%/Cache.pyo
lib/aap/Exec-%%PORTVERSION%%/Commands.py
-lib/aap/Exec-%%PORTVERSION%%/Commands.pyc
-lib/aap/Exec-%%PORTVERSION%%/Commands.pyo
lib/aap/Exec-%%PORTVERSION%%/CopyMove.py
-lib/aap/Exec-%%PORTVERSION%%/CopyMove.pyc
-lib/aap/Exec-%%PORTVERSION%%/CopyMove.pyo
-lib/aap/Exec-%%PORTVERSION%%/Cvs.py
-lib/aap/Exec-%%PORTVERSION%%/Cvs.pyc
-lib/aap/Exec-%%PORTVERSION%%/Cvs.pyo
lib/aap/Exec-%%PORTVERSION%%/Depend.py
-lib/aap/Exec-%%PORTVERSION%%/Depend.pyc
-lib/aap/Exec-%%PORTVERSION%%/Depend.pyo
lib/aap/Exec-%%PORTVERSION%%/Dictlist.py
-lib/aap/Exec-%%PORTVERSION%%/Dictlist.pyc
-lib/aap/Exec-%%PORTVERSION%%/Dictlist.pyo
lib/aap/Exec-%%PORTVERSION%%/DoAddDef.py
-lib/aap/Exec-%%PORTVERSION%%/DoAddDef.pyc
-lib/aap/Exec-%%PORTVERSION%%/DoAddDef.pyo
lib/aap/Exec-%%PORTVERSION%%/DoArgs.py
-lib/aap/Exec-%%PORTVERSION%%/DoArgs.pyc
-lib/aap/Exec-%%PORTVERSION%%/DoArgs.pyo
lib/aap/Exec-%%PORTVERSION%%/DoBuild.py
-lib/aap/Exec-%%PORTVERSION%%/DoBuild.pyc
-lib/aap/Exec-%%PORTVERSION%%/DoBuild.pyo
+lib/aap/Exec-%%PORTVERSION%%/DoInstall.py
lib/aap/Exec-%%PORTVERSION%%/DoRead.py
-lib/aap/Exec-%%PORTVERSION%%/DoRead.pyc
-lib/aap/Exec-%%PORTVERSION%%/DoRead.pyo
lib/aap/Exec-%%PORTVERSION%%/Error.py
-lib/aap/Exec-%%PORTVERSION%%/Error.pyc
-lib/aap/Exec-%%PORTVERSION%%/Error.pyo
lib/aap/Exec-%%PORTVERSION%%/Filetype.py
-lib/aap/Exec-%%PORTVERSION%%/Filetype.pyc
-lib/aap/Exec-%%PORTVERSION%%/Filetype.pyo
lib/aap/Exec-%%PORTVERSION%%/Global.py
-lib/aap/Exec-%%PORTVERSION%%/Global.pyc
-lib/aap/Exec-%%PORTVERSION%%/Global.pyo
lib/aap/Exec-%%PORTVERSION%%/Main.py
-lib/aap/Exec-%%PORTVERSION%%/Main.pyc
-lib/aap/Exec-%%PORTVERSION%%/Main.pyo
lib/aap/Exec-%%PORTVERSION%%/Message.py
-lib/aap/Exec-%%PORTVERSION%%/Message.pyc
-lib/aap/Exec-%%PORTVERSION%%/Message.pyo
lib/aap/Exec-%%PORTVERSION%%/Node.py
-lib/aap/Exec-%%PORTVERSION%%/Node.pyc
-lib/aap/Exec-%%PORTVERSION%%/Node.pyo
lib/aap/Exec-%%PORTVERSION%%/ParsePos.py
-lib/aap/Exec-%%PORTVERSION%%/ParsePos.pyc
-lib/aap/Exec-%%PORTVERSION%%/ParsePos.pyo
lib/aap/Exec-%%PORTVERSION%%/PkgInstall.py
-lib/aap/Exec-%%PORTVERSION%%/PkgInstall.pyc
-lib/aap/Exec-%%PORTVERSION%%/PkgInstall.pyo
lib/aap/Exec-%%PORTVERSION%%/Port.py
-lib/aap/Exec-%%PORTVERSION%%/Port.pyc
-lib/aap/Exec-%%PORTVERSION%%/Port.pyo
lib/aap/Exec-%%PORTVERSION%%/PrintProfile.py
-lib/aap/Exec-%%PORTVERSION%%/PrintProfile.pyc
-lib/aap/Exec-%%PORTVERSION%%/PrintProfile.pyo
lib/aap/Exec-%%PORTVERSION%%/Process.py
-lib/aap/Exec-%%PORTVERSION%%/Process.pyc
-lib/aap/Exec-%%PORTVERSION%%/Process.pyo
lib/aap/Exec-%%PORTVERSION%%/README.txt
lib/aap/Exec-%%PORTVERSION%%/RecPos.py
-lib/aap/Exec-%%PORTVERSION%%/RecPos.pyc
-lib/aap/Exec-%%PORTVERSION%%/RecPos.pyo
+lib/aap/Exec-%%PORTVERSION%%/RecPython.py
lib/aap/Exec-%%PORTVERSION%%/Remote.py
-lib/aap/Exec-%%PORTVERSION%%/Remote.pyc
-lib/aap/Exec-%%PORTVERSION%%/Remote.pyo
+lib/aap/Exec-%%PORTVERSION%%/RootShell.py
lib/aap/Exec-%%PORTVERSION%%/Rule.py
-lib/aap/Exec-%%PORTVERSION%%/Rule.pyc
-lib/aap/Exec-%%PORTVERSION%%/Rule.pyo
+lib/aap/Exec-%%PORTVERSION%%/Scope.py
lib/aap/Exec-%%PORTVERSION%%/Sign.py
-lib/aap/Exec-%%PORTVERSION%%/Sign.pyc
-lib/aap/Exec-%%PORTVERSION%%/Sign.pyo
lib/aap/Exec-%%PORTVERSION%%/Util.py
-lib/aap/Exec-%%PORTVERSION%%/Util.pyc
-lib/aap/Exec-%%PORTVERSION%%/Util.pyo
lib/aap/Exec-%%PORTVERSION%%/VersCont.py
-lib/aap/Exec-%%PORTVERSION%%/VersCont.pyc
-lib/aap/Exec-%%PORTVERSION%%/VersCont.pyo
+lib/aap/Exec-%%PORTVERSION%%/VersContCvs.py
lib/aap/Exec-%%PORTVERSION%%/Version.py
-lib/aap/Exec-%%PORTVERSION%%/Version.pyc
-lib/aap/Exec-%%PORTVERSION%%/Version.pyo
lib/aap/Exec-%%PORTVERSION%%/Work.py
-lib/aap/Exec-%%PORTVERSION%%/Work.pyc
-lib/aap/Exec-%%PORTVERSION%%/Work.pyo
lib/aap/Exec-%%PORTVERSION%%/__init__.py
-lib/aap/Exec-%%PORTVERSION%%/__init__.pyc
-lib/aap/Exec-%%PORTVERSION%%/__init__.pyo
lib/aap/Exec-%%PORTVERSION%%/aap
lib/aap/Exec-%%PORTVERSION%%/aap.py
-lib/aap/Exec-%%PORTVERSION%%/aap.pyc
-lib/aap/Exec-%%PORTVERSION%%/aap.pyo
lib/aap/Exec-%%PORTVERSION%%/aapnetrc.py
-lib/aap/Exec-%%PORTVERSION%%/aapnetrc.pyc
-lib/aap/Exec-%%PORTVERSION%%/aapnetrc.pyo
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/p1235.html
-lib/aap/Exec-%%PORTVERSION%%/doc/p27.html
-lib/aap/Exec-%%PORTVERSION%%/doc/p805.html
-lib/aap/Exec-%%PORTVERSION%%/doc/p888.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
@@ -130,20 +67,32 @@
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
+lib/aap/Exec-%%PORTVERSION%%/tools/__init__.py
+lib/aap/Exec-%%PORTVERSION%%/tools/gcc.py
+lib/aap/Exec-%%PORTVERSION%%/tools/icc.py
+lib/aap/Exec-%%PORTVERSION%%/tools/mingw.py
+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
+@dirrm lib/aap/Exec-%%PORTVERSION%%/tools
@dirrm lib/aap/Exec-%%PORTVERSION%%
-@unexec rmdir %D/lib/aap 2>/dev/null || true
+@dirrm lib/aap
--- aap.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030618194740.25058.qmail>