diff options
| author | Alberto Villa <avilla@FreeBSD.org> | 2012-02-04 17:39:12 +0000 |
|---|---|---|
| committer | Alberto Villa <avilla@FreeBSD.org> | 2012-02-04 17:39:12 +0000 |
| commit | 7a906d1a4957823a72acb27503f76142c0a7cecf (patch) | |
| tree | df3c3bf667b4aa70c794b716e00e828385bbed93 /comms | |
| parent | Update to 1.3.2 (diff) | |
- Move Python scripts to DATADIR to avoid spamming Python directories
without depending on Python. [1]
- Remove hardcoded Python binary path from Python scripts.
- Bump PORTREVISION.
Requested by: pav [1]
Notes
Notes:
svn path=/head/; revision=290399
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/usbmuxd/Makefile | 14 | ||||
| -rw-r--r-- | comms/usbmuxd/pkg-plist | 7 |
2 files changed, 11 insertions, 10 deletions
diff --git a/comms/usbmuxd/Makefile b/comms/usbmuxd/Makefile index a2a607b59fe3..2302ae77b218 100644 --- a/comms/usbmuxd/Makefile +++ b/comms/usbmuxd/Makefile @@ -6,7 +6,7 @@ PORTNAME= usbmuxd PORTVERSION= 1.0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms MASTER_SITES= http://marcansoft.com/uploads/${PORTNAME}/ @@ -15,8 +15,6 @@ COMMENT= A daemon for multiplexing connections over USB to an iPhone/iPod Touch LIB_DEPENDS= plist.1:${PORTSDIR}/devel/libplist -USE_PYTHON= yes -PYTHON_NO_DEPENDS= yes USE_BZIP2= yes USE_CMAKE= yes MAKE_JOBS_SAFE= yes @@ -34,10 +32,14 @@ pre-configure: ${REINPLACE_CMD} -e 's|$${LIB_SUFFIX}/pkgconfig|data/pkgconfig|' \ ${WRKSRC}/CMakeLists.txt +pre-install: + ${REINPLACE_CMD} -e '1 s|python|env python|' \ + ${WRKSRC}/python-client/*.py + post-install: - ${MKDIR} ${PYTHON_SITELIBDIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/python-client/*.py \ - ${PYTHON_SITELIBDIR}/${PORTNAME}/ + ${MKDIR} ${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/python-client/*.py \ + ${DATADIR}/ .ifndef(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} diff --git a/comms/usbmuxd/pkg-plist b/comms/usbmuxd/pkg-plist index 67fa67179041..3086a49b40a5 100644 --- a/comms/usbmuxd/pkg-plist +++ b/comms/usbmuxd/pkg-plist @@ -4,9 +4,8 @@ include/usbmuxd.h lib/libusbmuxd.so lib/libusbmuxd.so.1 lib/libusbmuxd.so.1.0.7 -%%PYTHON_SITELIBDIR%%/usbmuxd/tcprelay.py -%%PYTHON_SITELIBDIR%%/usbmuxd/usbmux.py libdata/pkgconfig/libusbmuxd.pc sbin/usbmuxd -@dirrm %%PYTHON_SITELIBDIR%%/usbmuxd -@dirrmtry %%PYTHON_SITELIBDIR%% +%%DATADIR%%/tcprelay.py +%%DATADIR%%/usbmux.py +@dirrm %%DATADIR%% |