Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F161159225
D21734.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
10 KB
Referenced Files
None
Subscribers
None
D21734.diff
View Options
Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -14385,3 +14385,4 @@
math/metis4|math/metis|2020-02-22|Has expired: EOL: use math/metis instead
multimedia/cinelerra-gg||2020-02-22|Has expired: Broken, uses EOLed python27
x11-toolkits/py-gnome2||2020-02-22|Has expired: Broken, uses EOLed python27
+devel/py-dialog3|devel/py-pythondialog|2020-02-25|Renamed to reflect PyPI name
Index: head/devel/Makefile
===================================================================
--- head/devel/Makefile
+++ head/devel/Makefile
@@ -4301,7 +4301,6 @@
SUBDIR += py-deprecation
SUBDIR += py-dexml
SUBDIR += py-dialog
- SUBDIR += py-dialog3
SUBDIR += py-diazo
SUBDIR += py-dill
SUBDIR += py-dirspec
@@ -4886,6 +4885,7 @@
SUBDIR += py-python-subunit
SUBDIR += py-python2-pythondialog
SUBDIR += py-pythonbrew
+ SUBDIR += py-pythondialog
SUBDIR += py-pytimeparse
SUBDIR += py-pytools
SUBDIR += py-pytrie
Index: head/devel/py-dialog3/Makefile
===================================================================
--- head/devel/py-dialog3/Makefile
+++ head/devel/py-dialog3/Makefile
@@ -1,34 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= dialog
-PORTVERSION= 3.4.0
-CATEGORIES= devel python
-MASTER_SITES= SF/python${PORTNAME}/python${PORTNAME}/${PORTVERSION} \
- LOCAL/jkim
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX= 3
-DISTNAME= python3-pythondialog-${PORTVERSION}
-
-MAINTAINER= jkim@FreeBSD.org
-COMMENT= Python 3 interface to dialog(3)
-
-LICENSE= LGPL20
-
-RUN_DEPENDS= cdialog:devel/cdialog
-
-USES= python:3.6 tar:bz2
-USE_PYTHON= autoplist concurrent distutils pythonprefix
-PYDISTUTILS_PKGNAME= python${PORTNAME}
-
-WRKSRC= "${WRKDIR}/${DISTNAME:C/^python3-//}"
-
-PORTEXAMPLES= *
-
-OPTIONS_DEFINE= EXAMPLES
-
-post-install-EXAMPLES-on:
- @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- cd ${WRKSRC}/examples/ && \
- ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! -name *\.orig"
-
-.include <bsd.port.mk>
Index: head/devel/py-dialog3/distinfo
===================================================================
--- head/devel/py-dialog3/distinfo
+++ head/devel/py-dialog3/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1568933548
-SHA256 (python3-pythondialog-3.4.0.tar.bz2) = 019cdbffe3f61d32d6fb158ce48a767478af2aac2f31fb40460b39aefae604fe
-SIZE (python3-pythondialog-3.4.0.tar.bz2) = 1415324
Index: head/devel/py-dialog3/files/patch-dialog.py
===================================================================
--- head/devel/py-dialog3/files/patch-dialog.py
+++ head/devel/py-dialog3/files/patch-dialog.py
@@ -1,11 +0,0 @@
---- dialog.py.orig 2016-05-07 16:38:28 UTC
-+++ dialog.py
-@@ -878,7 +878,7 @@ class Dialog:
- # wants to know the (integer) error exit status, here it is...
- return self._DIALOG_ERROR
-
-- def __init__(self, dialog="dialog", DIALOGRC=None,
-+ def __init__(self, dialog="cdialog", DIALOGRC=None,
- compat="dialog", use_stdout=None, *, autowidgetsize=False,
- pass_args_via_file=None):
- """Constructor for :class:`Dialog` instances.
Index: head/devel/py-dialog3/files/patch-doc_intro_example.py
===================================================================
--- head/devel/py-dialog3/files/patch-doc_intro_example.py
+++ head/devel/py-dialog3/files/patch-doc_intro_example.py
@@ -1,11 +0,0 @@
---- doc/intro/example.py.orig 2015-04-04 09:43:57 UTC
-+++ doc/intro/example.py
-@@ -35,7 +35,7 @@ from dialog import Dialog
- # This is almost always a good thing to do at the beginning of your programs.
- locale.setlocale(locale.LC_ALL, '')
-
--d = Dialog(dialog="dialog")
-+d = Dialog(dialog="cdialog")
-
- button_names = {d.OK: "OK",
- d.CANCEL: "Cancel",
Index: head/devel/py-dialog3/files/patch-doc_intro_intro.rst
===================================================================
--- head/devel/py-dialog3/files/patch-doc_intro_intro.rst
+++ head/devel/py-dialog3/files/patch-doc_intro_intro.rst
@@ -1,20 +0,0 @@
---- doc/intro/intro.rst.orig 2015-04-04 09:43:57 UTC
-+++ doc/intro/intro.rst
-@@ -8,7 +8,7 @@ A minimal program using pythondialog starts with the c
-
- from dialog import Dialog
-
-- d = Dialog(dialog="dialog")
-+ d = Dialog(dialog="cdialog")
-
- The *dialog* parameter indicates the executable to use to invoke the backend
- (which must be compatible with dialog_). For instance, one might use something
-@@ -181,7 +181,7 @@ improve readability, we obtain the code for our exampl
- # This is almost always a good thing to do at the beginning of your programs.
- locale.setlocale(locale.LC_ALL, '')
-
-- d = Dialog(dialog="dialog")
-+ d = Dialog(dialog="cdialog")
-
- button_names = {d.OK: "OK",
- d.CANCEL: "Cancel",
Index: head/devel/py-dialog3/files/patch-examples_demo.py
===================================================================
--- head/devel/py-dialog3/files/patch-examples_demo.py
+++ head/devel/py-dialog3/files/patch-examples_demo.py
@@ -1,11 +0,0 @@
---- examples/demo.py.orig 2016-05-07 16:38:28 UTC
-+++ examples/demo.py
-@@ -335,7 +335,7 @@ class MyApp:
- # If you want to use Xdialog (pathnames are also OK for the 'dialog'
- # argument), you can use:
- # dialog.Dialog(dialog="Xdialog", compat="Xdialog")
-- self.Dialog_instance = dialog.Dialog(dialog="dialog")
-+ self.Dialog_instance = dialog.Dialog(dialog="cdialog")
- # See the module docstring at the top of the file to understand the
- # purpose of MyDialog.
- d = MyDialog(self.Dialog_instance)
Index: head/devel/py-dialog3/files/patch-examples_simple__example.py
===================================================================
--- head/devel/py-dialog3/files/patch-examples_simple__example.py
+++ head/devel/py-dialog3/files/patch-examples_simple__example.py
@@ -1,11 +0,0 @@
---- examples/simple_example.py.orig 2016-05-07 16:38:28 UTC
-+++ examples/simple_example.py
-@@ -13,7 +13,7 @@ from dialog import Dialog
- locale.setlocale(locale.LC_ALL, '')
-
- # Initialize a dialog.Dialog instance
--d = Dialog(dialog="dialog")
-+d = Dialog(dialog="cdialog")
- d.set_background_title("A Simple Example")
-
-
Index: head/devel/py-dialog3/files/patch-examples_with-autowidgetsize_demo.py
===================================================================
--- head/devel/py-dialog3/files/patch-examples_with-autowidgetsize_demo.py
+++ head/devel/py-dialog3/files/patch-examples_with-autowidgetsize_demo.py
@@ -1,11 +0,0 @@
---- examples/with-autowidgetsize/demo.py.orig 2016-05-07 16:38:28 UTC
-+++ examples/with-autowidgetsize/demo.py
-@@ -340,7 +340,7 @@ class MyApp:
- # widget-producing methods behave as if width=0, height=0, etc. had
- # been passed, except where these parameters are explicitely specified
- # with different values.
-- self.Dialog_instance = dialog.Dialog(dialog="dialog",
-+ self.Dialog_instance = dialog.Dialog(dialog="cdialog",
- autowidgetsize=True)
- # See the module docstring at the top of the file to understand the
- # purpose of MyDialog.
Index: head/devel/py-dialog3/files/patch-examples_with-autowidgetsize_simple__example.py
===================================================================
--- head/devel/py-dialog3/files/patch-examples_with-autowidgetsize_simple__example.py
+++ head/devel/py-dialog3/files/patch-examples_with-autowidgetsize_simple__example.py
@@ -1,11 +0,0 @@
---- examples/with-autowidgetsize/simple_example.py.orig 2016-05-07 16:38:28 UTC
-+++ examples/with-autowidgetsize/simple_example.py
-@@ -17,7 +17,7 @@ locale.setlocale(locale.LC_ALL, '')
- # With the 'autowidgetsize' option enabled, pythondialog's widget-producing
- # methods behave as if width=0, height=0, etc. had been passed, except where
- # these parameters are explicitely specified with different values.
--d = Dialog(dialog="dialog", autowidgetsize=True)
-+d = Dialog(dialog="cdialog", autowidgetsize=True)
- d.set_background_title("A Simple Example")
-
-
Index: head/devel/py-dialog3/pkg-descr
===================================================================
--- head/devel/py-dialog3/pkg-descr
+++ head/devel/py-dialog3/pkg-descr
@@ -1,7 +0,0 @@
-pythondialog 3 is a Python 3 wrapper for the dialog utility originally
-written by Savio Lam, and later rewritten by Thomas E. Dickey. Its purpose
-is to provide an easy to use, pythonic and comprehensive Python 3 interface
-to dialog. This allows one to make simple text-mode user interfaces on
-Unix-like systems.
-
-WWW: http://pythondialog.sourceforge.net/
Index: head/devel/py-pythondialog/Makefile
===================================================================
--- head/devel/py-pythondialog/Makefile
+++ head/devel/py-pythondialog/Makefile
@@ -0,0 +1,34 @@
+# $FreeBSD$
+
+PORTNAME= pythondialog
+PORTVERSION= 3.5.1
+CATEGORIES= devel python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= jkim@FreeBSD.org
+COMMENT= Python interface to dialog(3)
+
+LICENSE= LGPL21+
+
+RUN_DEPENDS= cdialog:devel/cdialog
+
+USES= python:3.5+
+USE_PYTHON= autoplist concurrent distutils
+
+PORTEXAMPLES= *
+REINPLACE_ARGS= -i ""
+
+OPTIONS_DEFINE= EXAMPLES
+
+post-patch:
+ # devel/cdialog installs dialog as cdialog not to conflict
+ # with dialog(1).
+ ${FIND} ${WRKSRC} -type f | \
+ ${XARGS} ${REINPLACE_CMD} -e 's|dialog="dialog"|dialog="cdialog"|g'
+
+post-install-EXAMPLES-on:
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+
+.include <bsd.port.mk>
Index: head/devel/py-pythondialog/distinfo
===================================================================
--- head/devel/py-pythondialog/distinfo
+++ head/devel/py-pythondialog/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1578951047
+SHA256 (pythondialog-3.5.1.tar.gz) = 34a0687290571f37d7d297514cc36bd4cd044a3a4355271549f91490d3e7ece8
+SIZE (pythondialog-3.5.1.tar.gz) = 1485873
Index: head/devel/py-pythondialog/pkg-descr
===================================================================
--- head/devel/py-pythondialog/pkg-descr
+++ head/devel/py-pythondialog/pkg-descr
@@ -0,0 +1,6 @@
+pythondialog is a Python wrapper for the UNIX dialog utility originally
+written by Savio Lam and later rewritten by Thomas E. Dickey. Its purpose
+is to provide an easy to use, pythonic and as complete as possible
+interface to dialog from Python code.
+
+WWW: http://pythondialog.sourceforge.net/
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Jul 2, 2:37 AM (3 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34574201
Default Alt Text
D21734.diff (10 KB)
Attached To
Mode
D21734: Rename devel/py-dialog to devel/py-pythondialog and merge it with devel/py-dialog3
Attached
Detach File
Event Timeline
Log In to Comment