Page MenuHomeFreeBSD
Files F153956710

D21734.id62371.diff
No OneTemporary
Actions

D21734.id62371.diff
View Options

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -12955,3 +12955,5 @@
databases/tablelog||2019-09-19|Has expired: Abandonware
databases/skytools||2019-09-19|Has expired: Abandonware
devel/xfce4-vala||2019-09-20|Deprecated, functionality moved to xfce libraries with option VAPI on (default)
+devel/py-dialog|devel/py-pythondialog|2019-09-21|Merged with devel/py-dialog3 and renamed to reflect PyPI name
+devel/py-dialog3|devel/py-pythondialog|2019-09-21|Merged with devel/py-dialog and renamed to reflect PyPI name
Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -4369,8 +4369,6 @@
SUBDIR += py-deprecated
SUBDIR += py-deprecation
SUBDIR += py-dexml
- SUBDIR += py-dialog
- SUBDIR += py-dialog3
SUBDIR += py-diazo
SUBDIR += py-dill
SUBDIR += py-dirspec
@@ -4929,6 +4927,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: devel/py-dialog/Makefile
===================================================================
--- devel/py-dialog/Makefile
+++ devel/py-dialog/Makefile
@@ -1,29 +0,0 @@
-# Created by: ijliao
-# $FreeBSD$
-
-PORTNAME= dialog
-PORTVERSION= 2.7
-PORTREVISION= 4
-CATEGORIES= devel python
-MASTER_SITES= SF/python${PORTNAME}/python${PORTNAME}/${PORTVERSION}
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= pythondialog-${PORTVERSION}
-
-MAINTAINER= mek@mek.uz.ua
-COMMENT= Python interface to dialog(3)
-
-LICENSE= LGPL20
-
-RUN_DEPENDS= cdialog:devel/cdialog
-
-USES= python:2.7 tar:bzip2
-USE_PYTHON= distutils
-PYDISTUTILS_PKGNAME= pythondialog
-
-EXAMPLESDIR= ${PREFIX}/share/examples/py-dialog
-
-post-install:
- ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/demo.py ${STAGEDIR}${EXAMPLESDIR}
-
-.include <bsd.port.mk>
Index: devel/py-dialog/distinfo
===================================================================
--- devel/py-dialog/distinfo
+++ devel/py-dialog/distinfo
@@ -1,2 +0,0 @@
-SHA256 (pythondialog-2.7.tar.bz2) = 5f7dbcbd28eebadc736d957b9511a87ad5570c8fc822c8123a42e7259773cb7f
-SIZE (pythondialog-2.7.tar.bz2) = 29088
Index: devel/py-dialog/files/patch-demo.py
===================================================================
--- devel/py-dialog/files/patch-demo.py
+++ devel/py-dialog/files/patch-demo.py
@@ -1,11 +0,0 @@
---- demo.py.old Mon Dec 5 01:13:57 2005
-+++ demo.py Mon Dec 5 01:14:02 2005
-@@ -269,7 +269,7 @@
- # If you want to use Xdialog (pathnames are also OK for the 'dialog'
- # argument)
- # d = dialog.Dialog(dialog="Xdialog", compat="Xdialog")
-- d = dialog.Dialog(dialog="dialog")
-+ d = dialog.Dialog(dialog="cdialog")
-
- d.add_persistent_args(["--backtitle", "pythondialog demo"])
-
Index: devel/py-dialog/files/patch-dialog.py
===================================================================
--- devel/py-dialog/files/patch-dialog.py
+++ devel/py-dialog/files/patch-dialog.py
@@ -1,22 +0,0 @@
---- dialog.py.orig
-+++ dialog.py
-@@ -214,6 +214,10 @@
- "create_rc": lambda file: ("--create-rc", file),
- "defaultno": lambda enable: _simple_option("--defaultno", enable),
- "default_item": lambda string: ("--default-item", string),
-+ "yes_label": lambda string: ("--yes-label", string),
-+ "no_label": lambda string: ("--no-label", string),
-+ "exit_label": lambda string: ("--exit-label", string),
-+ "extra_button": lambda enable: _simple_option("--extra-button", enable),
- "help": lambda enable: _simple_option("--help", enable),
- "help_button": lambda enable: _simple_option("--help-button", enable),
- "help_label": lambda string: ("--help-label", string),
-@@ -524,7 +528,7 @@
-
- """
-
-- def __init__(self, dialog="dialog", DIALOGRC=None, compat="dialog",
-+ def __init__(self, dialog="cdialog", DIALOGRC=None, compat="dialog",
- use_stdout=None):
- """Constructor for Dialog instances.
-
Index: devel/py-dialog/pkg-descr
===================================================================
--- devel/py-dialog/pkg-descr
+++ devel/py-dialog/pkg-descr
@@ -1,3 +0,0 @@
-This is a Python module for making simple Text/Console-mode user interfaces.
-
-WWW: http://pythondialog.sourceforge.net/
Index: devel/py-dialog/pkg-plist
===================================================================
--- devel/py-dialog/pkg-plist
+++ devel/py-dialog/pkg-plist
@@ -1,4 +0,0 @@
-%%PYTHON_SITELIBDIR%%/dialog.py
-%%PYTHON_SITELIBDIR%%/dialog.pyc
-%%PYTHON_SITELIBDIR%%/dialog.pyo
-%%EXAMPLESDIR%%/demo.py
Index: devel/py-dialog3/Makefile
===================================================================
--- devel/py-dialog3/Makefile
+++ 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: devel/py-dialog3/distinfo
===================================================================
--- devel/py-dialog3/distinfo
+++ 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: devel/py-dialog3/files/patch-dialog.py
===================================================================
--- devel/py-dialog3/files/patch-dialog.py
+++ 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: devel/py-dialog3/files/patch-doc_intro_example.py
===================================================================
--- devel/py-dialog3/files/patch-doc_intro_example.py
+++ 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: devel/py-dialog3/files/patch-doc_intro_intro.rst
===================================================================
--- devel/py-dialog3/files/patch-doc_intro_intro.rst
+++ 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: devel/py-dialog3/files/patch-examples_demo.py
===================================================================
--- devel/py-dialog3/files/patch-examples_demo.py
+++ 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: devel/py-dialog3/files/patch-examples_simple__example.py
===================================================================
--- devel/py-dialog3/files/patch-examples_simple__example.py
+++ 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: devel/py-dialog3/files/patch-examples_with-autowidgetsize_demo.py
===================================================================
--- devel/py-dialog3/files/patch-examples_with-autowidgetsize_demo.py
+++ 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: devel/py-dialog3/files/patch-examples_with-autowidgetsize_simple__example.py
===================================================================
--- devel/py-dialog3/files/patch-examples_with-autowidgetsize_simple__example.py
+++ 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: devel/py-dialog3/pkg-descr
===================================================================
--- devel/py-dialog3/pkg-descr
+++ 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: devel/py-pythondialog/Makefile
===================================================================
--- devel/py-pythondialog/Makefile
+++ devel/py-pythondialog/Makefile
@@ -1,29 +1,38 @@
-# Created by: ijliao
# $FreeBSD$
-PORTNAME= dialog
-PORTVERSION= 2.7
-PORTREVISION= 4
+PORTNAME= pythondialog
+PORTVERSION= 3.4.0
CATEGORIES= devel python
-MASTER_SITES= SF/python${PORTNAME}/python${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF \
+ LOCAL/jkim
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= pythondialog-${PORTVERSION}
+DISTNAME= python${PYTHON_MAJOR_VER}-${PORTNAME}-${PORTVERSION}
-MAINTAINER= mek@mek.uz.ua
+MAINTAINER= jkim@FreeBSD.org
COMMENT= Python interface to dialog(3)
-LICENSE= LGPL20
+LICENSE= LGPL21+
RUN_DEPENDS= cdialog:devel/cdialog
-USES= python:2.7 tar:bzip2
-USE_PYTHON= distutils
-PYDISTUTILS_PKGNAME= pythondialog
+USES= python tar:bz2
+USE_PYTHON= autoplist concurrent distutils pythonprefix
-EXAMPLESDIR= ${PREFIX}/share/examples/py-dialog
+CONFLICTS= ${PYTHON_PKGNAMEPREFIX}dialog${PYTHON_MAJOR_VER:S/^2//}
-post-install:
- ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/demo.py ${STAGEDIR}${EXAMPLESDIR}
+PORTEXAMPLES= *
+REINPLACE_ARGS= -i ""
+WRKSRC= "${WRKDIR}/${DISTNAME:C/^python3-//}"
+OPTIONS_DEFINE= EXAMPLES
+
+post-patch:
+ ${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} "! -name *\.bak"
+
.include <bsd.port.mk>
Index: devel/py-pythondialog/distinfo
===================================================================
--- devel/py-pythondialog/distinfo
+++ devel/py-pythondialog/distinfo
@@ -1,2 +1,5 @@
-SHA256 (pythondialog-2.7.tar.bz2) = 5f7dbcbd28eebadc736d957b9511a87ad5570c8fc822c8123a42e7259773cb7f
-SIZE (pythondialog-2.7.tar.bz2) = 29088
+TIMESTAMP = 1569036696
+SHA256 (python2-pythondialog-3.4.0.tar.bz2) = 8978d355c8db6728eeb9e23b39449b14597f1c76cb06dc72462642ca7cde46a0
+SIZE (python2-pythondialog-3.4.0.tar.bz2) = 1419164
+SHA256 (python3-pythondialog-3.4.0.tar.bz2) = 019cdbffe3f61d32d6fb158ce48a767478af2aac2f31fb40460b39aefae604fe
+SIZE (python3-pythondialog-3.4.0.tar.bz2) = 1415324
Index: devel/py-pythondialog/pkg-descr
===================================================================
--- devel/py-pythondialog/pkg-descr
+++ devel/py-pythondialog/pkg-descr
@@ -1,3 +1,6 @@
-This is a Python module for making simple Text/Console-mode user interfaces.
+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

Mime Type
text/plain
Expires
Sun, Apr 26, 2:20 AM (21 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32155240
Default Alt Text
D21734.id62371.diff (14 KB)

Event Timeline