Fred <[email protected]> writes:
> Hi,
Hi,
> Attached is an update to py-serial I have lightly tested on amd64.
>
> Thanks
Thanks for your diff.
Some comments:
- unnecessary whitespace changes in the Makefile
- make plist is confused by the fact that ${MODPY_VERSION} ==
${MODPY_EGG_VERSION}. Since "MODPY_EGG_VERSION" is longer than
"MODPY_VERSION", some occurrences of "MODPY_VERSION" are incorrectly
replaced. make plist can only make guesses.
- this switch:
> -share/doc/py-serial/
> -share/doc/py-serial/LICENSE.txt
> -share/doc/py-serial/README.txt
> -share/examples/py-serial/
> -share/examples/py-serial/enhancedserial.py
> [...]
> +share/doc/${MODPY_PY_PREFIX}serial/
> +share/doc/${MODPY_PY_PREFIX}serial/LICENSE.txt
> +share/doc/${MODPY_PY_PREFIX}serial/README.txt
> +share/examples/${MODPY_PY_PREFIX}serial/
> +share/examples/${MODPY_PY_PREFIX}serial/enhancedserial.py
> [...]
is IMO correct. Keeping "py-" hardcoded in PLIST would prevent
a python3 package to be installed along with a python2 package. Since
python3 is supported upstream, here's an updated diff that adds support
for a python3 flavor.
No serial stuff handy so I'd appreciate more tests.
Comments / ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-serial/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 11 Mar 2013 10:50:26 -0000 1.7
+++ Makefile 14 Jul 2015 21:55:06 -0000
@@ -2,35 +2,36 @@
COMMENT = serial interface class for Python
-MODPY_EGG_VERSION = 2.4
+MODPY_EGG_VERSION = 2.7
DISTNAME = pyserial-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:S/py/py-/}
-REVISION = 4
CATEGORIES = devel
-HOMEPAGE = http://pyserial.wiki.sourceforge.net/pySerial
+HOMEPAGE = http://pyserial.sourceforge.net/
MAINTAINER = Daniel Gruber <[email protected]>
# Python license
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=pyserial/}
-
MODULES = lang/python
-MODPY_SETUPTOOLS = Yes
+MODPY_PI = Yes
+
+FLAVORS = python3
+FLAVOR ?=
-DOCSDIR = ${PREFIX}/share/doc/py-serial
-EXAMPLESDIR = ${PREFIX}/share/examples/py-serial
+DOCSDIR = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}-serial
+EXAMPLESDIR = ${PREFIX}/share/examples/${MODPY_PY_PREFIX}-serial
post-install:
+ cd ${PREFIX}/bin/ && mv miniterm.py miniterm-${MODPY_VERSION}.py
${INSTALL_DATA_DIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README.txt ${WRKSRC}/LICENSE.txt ${DOCSDIR}
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
-# NOTE: tests require a serial setup; see ${WRKSRC}/examples/test.py
+# NOTE: tests require a serial setup; see ${WRKSRC}/examples/test.py
# for more information
do-test:
cd ${WRKSRC} && \
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-serial/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 18 Jan 2015 03:13:43 -0000 1.2
+++ distinfo 14 Jul 2015 21:55:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (pyserial-2.4.tar.gz) = a2qePS/Vl4ySyEPgEJkYpLysSB7srjFiVEgcDg9+c8g=
-SIZE (pyserial-2.4.tar.gz) = 44723
+SHA256 (pyserial-2.7.tar.gz) = NULsCDh5PmHWIk4n/wXozkulpcXMTsXGo+jUkkeYVHc=
+SIZE (pyserial-2.7.tar.gz) = 122081
Index: patches/patch-serialposix_py
===================================================================
RCS file: patches/patch-serialposix_py
diff -N patches/patch-serialposix_py
--- patches/patch-serialposix_py 20 Jul 2011 15:50:13 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-serialposix_py,v 1.2 2011/07/20 15:50:13 sthen Exp $
---- serial/serialposix.py.orig Sat Jun 21 23:08:43 2008
-+++ serial/serialposix.py Wed Jul 20 16:48:47 2011
-@@ -35,13 +35,12 @@ elif plat == 'cygwin': #cywin/win32 (confirmed)
- def device(port):
- return '/dev/com%d' % (port + 1)
-
--elif plat == 'openbsd3': #BSD (confirmed)
-+elif plat[:7] == 'openbsd':
- def device(port):
-- return '/dev/ttyp%d' % port
-+ return '/dev/cua%02d' % port
-
- elif plat[:3] == 'bsd' or \
- plat[:7] == 'freebsd' or \
-- plat[:7] == 'openbsd' or \
- plat[:6] == 'darwin': #BSD (confirmed for freebsd4: cuaa%d)
- def device(port):
- return '/dev/cuad%d' % port
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-serial/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 5 Jun 2009 04:29:22 -0000 1.1.1.1
+++ pkg/PLIST 14 Jul 2015 21:55:06 -0000
@@ -1,37 +1,67 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/05 04:29:22 wcmaier Exp $
-lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+bin/miniterm-${MODPY_VERSION}.py
+lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/serial/
lib/python${MODPY_VERSION}/site-packages/serial/__init__.py
-lib/python${MODPY_VERSION}/site-packages/serial/__init__.pyc
+${MODY_COMMENT}
lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}rfc2217.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}serialcli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}serialjava.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}serialposix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}serialutil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}serialwin32.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}sermsdos.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}win32.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/rfc2217.py
lib/python${MODPY_VERSION}/site-packages/serial/serialcli.py
-lib/python${MODPY_VERSION}/site-packages/serial/serialcli.pyc
lib/python${MODPY_VERSION}/site-packages/serial/serialjava.py
-lib/python${MODPY_VERSION}/site-packages/serial/serialjava.pyc
lib/python${MODPY_VERSION}/site-packages/serial/serialposix.py
-lib/python${MODPY_VERSION}/site-packages/serial/serialposix.pyc
lib/python${MODPY_VERSION}/site-packages/serial/serialutil.py
-lib/python${MODPY_VERSION}/site-packages/serial/serialutil.pyc
lib/python${MODPY_VERSION}/site-packages/serial/serialwin32.py
-lib/python${MODPY_VERSION}/site-packages/serial/serialwin32.pyc
lib/python${MODPY_VERSION}/site-packages/serial/sermsdos.py
-lib/python${MODPY_VERSION}/site-packages/serial/sermsdos.pyc
-share/doc/py-serial/
-share/doc/py-serial/LICENSE.txt
-share/doc/py-serial/README.txt
-share/examples/py-serial/
-share/examples/py-serial/enhancedserial.py
-share/examples/py-serial/miniterm.py
-share/examples/py-serial/scan.py
-share/examples/py-serial/scanwin32.py
-share/examples/py-serial/setup-miniterm-py2exe.py
-share/examples/py-serial/setup_demo.py
-share/examples/py-serial/tcp_serial_redirect.py
-share/examples/py-serial/test.py
-share/examples/py-serial/test_advanced.py
-share/examples/py-serial/test_high_load.py
-share/examples/py-serial/wxSerialConfigDialog.py
-share/examples/py-serial/wxTerminal.py
+lib/python${MODPY_VERSION}/site-packages/serial/tools/
+lib/python${MODPY_VERSION}/site-packages/serial/tools/__init__.py
+${MODY_COMMENT}
lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}list_ports.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}list_ports_linux.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}list_ports_osx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}list_ports_posix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}list_ports_windows.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/tools/${MODPY_PYCACHE}miniterm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/tools/list_ports.py
+lib/python${MODPY_VERSION}/site-packages/serial/tools/list_ports_linux.py
+lib/python${MODPY_VERSION}/site-packages/serial/tools/list_ports_osx.py
+lib/python${MODPY_VERSION}/site-packages/serial/tools/list_ports_posix.py
+lib/python${MODPY_VERSION}/site-packages/serial/tools/list_ports_windows.py
+lib/python${MODPY_VERSION}/site-packages/serial/tools/miniterm.py
+lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/
+lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/__init__.py
+${MODY_COMMENT}
lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/${MODPY_PYCACHE}protocol_hwgrep.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/${MODPY_PYCACHE}protocol_loop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/${MODPY_PYCACHE}protocol_rfc2217.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/${MODPY_PYCACHE}protocol_socket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/protocol_hwgrep.py
+lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/protocol_loop.py
+lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/protocol_rfc2217.py
+lib/python${MODPY_VERSION}/site-packages/serial/urlhandler/protocol_socket.py
+lib/python${MODPY_VERSION}/site-packages/serial/win32.py
+share/doc/${MODPY_PY_PREFIX}-serial/
+share/doc/${MODPY_PY_PREFIX}-serial/LICENSE.txt
+share/doc/${MODPY_PY_PREFIX}-serial/README.txt
+share/examples/${MODPY_PY_PREFIX}-serial/
+share/examples/${MODPY_PY_PREFIX}-serial/enhancedserial.py
+share/examples/${MODPY_PY_PREFIX}-serial/port_publisher.py
+share/examples/${MODPY_PY_PREFIX}-serial/rfc2217_server.py
+share/examples/${MODPY_PY_PREFIX}-serial/scan.py
+share/examples/${MODPY_PY_PREFIX}-serial/scanlinux.py
+share/examples/${MODPY_PY_PREFIX}-serial/scanwin32.py
+share/examples/${MODPY_PY_PREFIX}-serial/setup-miniterm-py2exe.py
+share/examples/${MODPY_PY_PREFIX}-serial/setup-rfc2217_server-py2exe.py
+share/examples/${MODPY_PY_PREFIX}-serial/setup-wxTerminal-py2exe.py
+share/examples/${MODPY_PY_PREFIX}-serial/tcp_serial_redirect.py
+share/examples/${MODPY_PY_PREFIX}-serial/wxSerialConfigDialog.py
+share/examples/${MODPY_PY_PREFIX}-serial/wxTerminal.py
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
