Date: Thu, 16 May 2013 19:48:30 +0000 (UTC) From: Ruslan Makhmatkhanov <rm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318331 - head/databases/py-sqlkit Message-ID: <201305161948.r4GJmUNM085163@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rm Date: Thu May 16 19:48:29 2013 New Revision: 318331 URL: http://svnweb.freebsd.org/changeset/ports/318331 Log: - fix pkg-plist (do not try to remove directories, installed by lang/pythonXX and python directory name was hardcoded anyway) - fix PGSQL option name (was POSTGRE) - eliminate usage of PYTHON_SITELIBDIR in depends - remove leading indefinite article from COMMENT - move license into proper block to pacify portlint - limit python version to 2.x only (because of pygtk2) - convert desktopfileutils dependency to USES - remove descriptions for FIREBIRD and MSSQL options (they are already defined in Mk/bsd.options.desc.mk) - define portdocs list unconditionally - bump PORTREVISION because of the changes Reported by: pointyhat (miwi, pkg-plist issue) Approved by: bsam (maintainer, by mail) Modified: head/databases/py-sqlkit/Makefile head/databases/py-sqlkit/pkg-plist Modified: head/databases/py-sqlkit/Makefile ============================================================================== --- head/databases/py-sqlkit/Makefile Thu May 16 19:46:52 2013 (r318330) +++ head/databases/py-sqlkit/Makefile Thu May 16 19:48:29 2013 (r318331) @@ -3,29 +3,28 @@ PORTNAME= sqlkit PORTVERSION= 0.9.5.1 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= http://sqlkit.argolinux.org/download/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= bsam@FreeBSD.org -COMMENT= A standalone program to browse and edit data +COMMENT= Standalone program to browse and edit data + +LICENSE= GPLv3 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.5:${PORTSDIR}/databases/py-sqlalchemy06 \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}Babel>=0:${PORTSDIR}/devel/py-babel -LICENSE= GPLv3 - -USE_PYTHON= yes +USE_PYTHON= -2.7 USE_PYDISTUTILS=easy_install -USE_GNOME= pygtk2 desktopfileutils -USES= gettext +USE_GNOME= pygtk2 +USES= desktop-file-utils gettext OPTIONS_DEFINE= FIREBIRD MSSQL MYSQL PGSQL SQLITE SYBASE OPTIONS_DEFAULT=MYSQL PGSQL SQLITE -FIREBIRD_DESC= FireBird support -MSSQL_DESC= MS SQL Server support SYBASE_DESC= Sybase support DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} @@ -33,10 +32,8 @@ DOCSDIR= ${PREFIX}/share/doc/py-${PORTNA post-patch: @${SED} -I.bak -e "s:/usr:${PREFIX}:" ${WRKSRC}/sqlkit.desktop -.if !defined(NOPORTDOCS) ALL_PORTDOCS= *.html *.js ALL_PORTDOCS_SUBDIR= _images _static debug layout misc printing sqlkit -.endif .include <bsd.port.options.mk> @@ -45,14 +42,14 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/kinte .endif .if ${PORT_OPTIONS:MMSSQL} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pymssql.py:${PORTSDIR}/databases/py-mssql +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mssql>0:${PORTSDIR}/databases/py-mssql .endif .if ${PORT_OPTIONS:MMYSQL} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb .endif -.if ${PORT_OPTIONS:MPOSTGRE} +.if ${PORT_OPTIONS:MPGSQL} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-psycopg2 .endif @@ -61,13 +58,12 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sql .endif .if ${PORT_OPTIONS:MSYBASE} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Sybase.py:${PORTSDIR}/databases/py-sybase +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sybase>0:${PORTSDIR}/databases/py-sybase .endif post-install: @${MKDIR} ${DESKTOPDIR} @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${DESKTOPDIR} - @-update-desktop-database > /dev/null .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} Modified: head/databases/py-sqlkit/pkg-plist ============================================================================== --- head/databases/py-sqlkit/pkg-plist Thu May 16 19:46:52 2013 (r318330) +++ head/databases/py-sqlkit/pkg-plist Thu May 16 19:48:29 2013 (r318331) @@ -679,8 +679,4 @@ share/applications/sqlkit.desktop @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/demo @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% -@dirrmtry lib/python2.6/site-packages -@dirrmtry lib/python2.6 @dirrmtry share/applications -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || : -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || :
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305161948.r4GJmUNM085163>