[Midnightbsd-cvs] mports [20370] trunk/devel/newt: update newt
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Oct 2 11:00:32 EDT 2015
Revision: 20370
http://svnweb.midnightbsd.org/mports/?rev=20370
Author: laffer1
Date: 2015-10-02 11:00:31 -0400 (Fri, 02 Oct 2015)
Log Message:
-----------
update newt
Modified Paths:
--------------
trunk/devel/newt/Makefile
trunk/devel/newt/distinfo
trunk/devel/newt/pkg-plist
Added Paths:
-----------
trunk/devel/newt/files/patch-whiptcl.c
Removed Paths:
-------------
trunk/devel/newt/files/setup.py.in
Modified: trunk/devel/newt/Makefile
===================================================================
--- trunk/devel/newt/Makefile 2015-10-02 15:00:15 UTC (rev 20369)
+++ trunk/devel/newt/Makefile 2015-10-02 15:00:31 UTC (rev 20370)
@@ -1,22 +1,20 @@
# $MidnightBSD$
PORTNAME= newt
-PORTVERSION= 0.52.15
+PORTVERSION= 0.52.17
CATEGORIES= devel
MASTER_SITES= https://fedorahosted.org/releases/n/e/newt/
MAINTAINER= ports at MidnightBSD.org
-COMMENT= Not Erik's Windowing Toolkit: console I/O handling library
+COMMENT= Not Eriks Windowing Toolkit: console I/O handling library
LICENSE= lgpl
-LIB_DEPENDS= slang:${PORTSDIR}/devel/libslang2 \
- popt:${PORTSDIR}/devel/popt
+LIB_DEPENDS= libslang.so:${PORTSDIR}/devel/libslang2 \
+ libpopt.so:${PORTSDIR}/devel/popt
-OPTIONS_DEFINE= PYTHON TCL NLS
-
-USE_GMAKE= yes
+USES= gmake
GNU_CONFIGURE= yes
-MAKE_ENV= PCFLAGS="${CFLAGS}" TCLVERSION="tcl${TCL_VER}"
+MAKE_ENV= PCFLAGS="${CFLAGS}"
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
@@ -26,80 +24,49 @@
PLIST_SUB= SOVERSION="${SOVERSION}" \
VERSION="${PORTVERSION}"
+SUB_FILES= pkgIndex.tcl
SUB_LIST= VERSION="${PORTVERSION}"
-MAN1= whiptail.1
+OPTIONS_DEFINE= NLS TCL
+OPTIONS_SUB= yes
+NLS_USES= gettext
+NLS_CONFIGURE_ENABLE= nls
+TCL_USES= tcl
+TCL_CONFIGURE_ENV= ac_cv_c_tclconfig=${TCL_LIBDIR:Q}
+TCL_CONFIGURE_WITH= tcl
+TCL_CPPFLAGS= -I${TCL_INCLUDEDIR:Q}
+
SOVERSION= ${PORTVERSION:R:E}
.include <bsd.mport.options.mk>
-.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON= -2.7
-INSTALLS_EGGINFO= yes
-PLIST_SUB+= PYTHONOPT=""
-SUB_FILES+= setup.py
-.else
-PLIST_SUB+= PYTHONOPT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTCL}
-USE_TCL= 84+
-MAKE_ENV+= TCL_LIBDIR=${TCL_LIBDIR:Q}
-CPPFLAGS+= -I${TCL_INCLUDEDIR:Q}
-SUB_FILES+= pkgIndex.tcl
-PLIST_SUB+= TCLOPT="" TCL_LIBDIR=${TCL_LIBDIR:S,${PREFIX}/,,}
-.else
-CONFIGURE_ARGS+=--without-tcl
-PLIST_SUB+= TCLOPT="@comment "
-.endif
-
post-patch:
@${REINPLACE_CMD} -e \
- '/^SONAME/s|=.*|=${SOVERSION}|' ${WRKSRC}/configure
+ '/^SONAME/s|=.*|=${SOVERSION}| ; \
+ s|-DUSE_INTERP_RESULT||' ${WRKSRC}/configure
@${REINPLACE_CMD} -e \
's|@CPP@|@CC@ -E| ; \
s|-I/usr/include/slang|| ; \
- /^PYTHONVERS/s|=.*|=${PYTHON_VERSION}| ; \
/^pkgconfigdir/s|=.*|=${PREFIX}/libdata/pkgconfig| ; \
s| -g | |g ; \
/make -C/s|^|#| ; \
- /whiptcl.so/s|install|${TRUE}|' ${WRKSRC}/Makefile.in
+ /whiptcl.$$(SOEXT)/s|install|${TRUE}|' ${WRKSRC}/Makefile.in
-post-build: apply-slist
-.if ${PORT_OPTIONS:MPYTHON}
- @${LN} -sf libnewt.so.${SOVERSION} ${WRKSRC}/libnewt.so
- @(cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${WRKDIR}/setup.py \
- build)
-.endif
-
post-install:
- @${STRIP_CMD} ${PREFIX}/bin/whiptail
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/whiptail
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnewt.so
.if ${PORT_OPTIONS:MNLS}
- @(cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
- ${MAKEFILE} ${MAKE_ARGS} datadir=${PREFIX}/share \
+ @(cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+ ${MAKEFILE} ${MAKE_ARGS} datadir=${STAGEDIR}${PREFIX}/share \
${INSTALL_TARGET})
.endif
-.if ${PORT_OPTIONS:MPYTHON}
- @(cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${WRKDIR}/setup.py \
- install --prefix=${PREFIX})
-.endif
.if ${PORT_OPTIONS:MTCL}
- @${MKDIR} ${TCL_LIBDIR}/whip
- (cd ${WRKSRC} && ${INSTALL_DATA} whiptcl.so ${TCL_LIBDIR}/whip)
- (cd ${WRKDIR} && ${INSTALL_DATA} pkgIndex.tcl ${TCL_LIBDIR}/whip)
+ @${MKDIR} ${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION}
+ (cd ${WRKSRC} && ${INSTALL_LIB} whiptcl.so \
+ ${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION})
+ (cd ${WRKDIR} && ${INSTALL_DATA} pkgIndex.tcl \
+ ${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION})
.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
- @${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC} && ${INSTALL_SCRIPT} peanuts.py popcorn.py ${EXAMPLESDIR})
-.endif
.include <bsd.port.mk>
Modified: trunk/devel/newt/distinfo
===================================================================
--- trunk/devel/newt/distinfo 2015-10-02 15:00:15 UTC (rev 20369)
+++ trunk/devel/newt/distinfo 2015-10-02 15:00:31 UTC (rev 20370)
@@ -1,2 +1,2 @@
-SHA256 (newt-0.52.15.tar.gz) = 7a6151923e7a8a950f9a8a21668a5780d09b0f35f9d76a7ec606c71c35a0e241
-SIZE (newt-0.52.15.tar.gz) = 183171
+SHA256 (newt-0.52.17.tar.gz) = 69837973ef2ee2fa644426f1c3e48d2b18785ebcd382ef7fd01eb2e67d2d632b
+SIZE (newt-0.52.17.tar.gz) = 178920
Added: trunk/devel/newt/files/patch-whiptcl.c
===================================================================
--- trunk/devel/newt/files/patch-whiptcl.c (rev 0)
+++ trunk/devel/newt/files/patch-whiptcl.c 2015-10-02 15:00:31 UTC (rev 20370)
@@ -0,0 +1,106 @@
+--- whiptcl.c.orig
++++ whiptcl.c
+@@ -137,45 +137,45 @@
+
+ if (arg < -1) {
+ /* this could buffer oveflow, bug we're not setuid so I don't care */
+- interp->result = malloc(200);
+- interp->freeProc = TCL_DYNAMIC;
+- sprintf(interp->result, "%s: %s\n",
++ char *tmp = malloc(200);
++ sprintf(tmp, "%s: %s\n",
+ poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
+ poptStrerror(arg));
++ Tcl_SetResult(interp, tmp, TCL_DYNAMIC);
+
+ return TCL_ERROR;
+ }
+
+ if (mode == MODE_NONE) {
+- interp->result = "no dialog mode was specified";
++ Tcl_SetResult(interp, "no dialog mode was specified", TCL_STATIC);
+ return TCL_ERROR;
+ } else if (rc) {
+- interp->result = "multiple modes were specified";
++ Tcl_SetResult(interp, "multiple modes were specified", TCL_STATIC);
+ return TCL_ERROR;
+ }
+
+ if (!(text = poptGetArg(optCon))) {
+- interp->result = "missing text parameter";
++ Tcl_SetResult(interp, "missing text parameter", TCL_STATIC);
+ return TCL_ERROR;
+ }
+
+ if (!(nextArg = poptGetArg(optCon))) {
+- interp->result = "height missing";
++ Tcl_SetResult(interp, "height missing", TCL_STATIC);
+ return TCL_ERROR;
+ }
+ height = strtoul(nextArg, &end, 10);
+ if (*end) {
+- interp->result = "height is not a number";
++ Tcl_SetResult(interp, "height is not a number", TCL_STATIC);
+ return TCL_ERROR;
+ }
+
+ if (!(nextArg = poptGetArg(optCon))) {
+- interp->result = "width missing";
++ Tcl_SetResult(interp, "width missing", TCL_STATIC);
+ return TCL_ERROR;
+ }
+ width = strtoul(nextArg, &end, 10);
+ if (*end) {
+- interp->result = "width is not a number";
++ Tcl_SetResult(interp, "width is not a number", TCL_STATIC);
+ return TCL_ERROR;
+ }
+
+@@ -196,33 +196,30 @@
+ case MODE_YESNO:
+ rc = messageBox(text, height, width, MSGBOX_YESNO, flags);
+ if (rc == DLG_OKAY)
+- interp->result = "yes";
++ Tcl_SetResult(interp, "yes", TCL_STATIC);
+ else
+- interp->result = "no";
++ Tcl_SetResult(interp, "no", TCL_STATIC);
+ if (rc == DLG_ERROR) rc = 0;
+ break;
+
+ case MODE_INPUTBOX:
+ rc = inputBox(text, height, width, optCon, flags, &result);
+ if (rc ==DLG_OKAY) {
+- interp->result = result;
+- interp->freeProc = TCL_DYNAMIC;
++ Tcl_SetResult(interp, strdup(result), TCL_DYNAMIC);
+ }
+ break;
+
+ case MODE_MENU:
+ rc = listBox(text, height, width, optCon, flags, default_item, &result);
+ if (rc==DLG_OKAY) {
+- interp->result = result;
+- interp->freeProc = TCL_DYNAMIC;
++ Tcl_SetResult(interp, strdup(result), TCL_DYNAMIC);
+ }
+ break;
+
+ case MODE_RADIOLIST:
+ rc = checkList(text, height, width, optCon, 1, flags, &selections);
+ if (rc==DLG_OKAY) {
+- interp->result = selections[0];
+- interp->freeProc = TCL_DYNAMIC;
++ Tcl_SetResult(interp, strdup(selections[0]), TCL_DYNAMIC);
+
+ free(selections);
+ }
+@@ -247,7 +244,7 @@
+ newtPopWindow();
+
+ if (rc == DLG_ERROR) {
+- interp->result = "bad paramter for whiptcl dialog box";
++ Tcl_SetResult(interp, "bad paramter for whiptcl dialog box", TCL_STATIC);
+ return TCL_ERROR;
+ }
+
Property changes on: trunk/devel/newt/files/patch-whiptcl.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/devel/newt/files/setup.py.in
===================================================================
--- trunk/devel/newt/files/setup.py.in 2015-10-02 15:00:15 UTC (rev 20369)
+++ trunk/devel/newt/files/setup.py.in 2015-10-02 15:00:31 UTC (rev 20370)
@@ -1,30 +0,0 @@
-# $FreeBSD: /tmp/pcvs/ports/devel/newt/files/setup.py.in,v 1.1 2010-01-10 23:40:05 pgollucci Exp $
-import os
-from distutils.core import setup, Extension
-
-setup ( name = 'newt',
- version = '%%VERSION%%',
- description = 'Python interface to Newt module',
- py_modules = ['snack'],
- ext_modules = [ Extension(
- name='_snack',
- sources=['snackmodule.c'],
- include_dirs=['.', '%%LOCALBASE%%'+'/include', '%%PREFIX%%'+'/include'],
- library_dirs=['.', '%%LOCALBASE%%'+'/lib', '%%PREFIX%%'+'/lib'],
- libraries=['newt', 'popt', 'slang', 'ncurses']
- )])
-# $FreeBSD: /tmp/pcvs/ports/devel/newt/files/setup.py.in,v 1.1 2010-01-10 23:40:05 pgollucci Exp $
-import os
-from distutils.core import setup, Extension
-
-setup ( name = 'newt',
- version = '%%VERSION%%',
- description = 'Python interface to Newt module',
- py_modules = ['snack'],
- ext_modules = [ Extension(
- name='_snack',
- sources=['snackmodule.c'],
- include_dirs=['.', '%%LOCALBASE%%'+'/include', '%%PREFIX%%'+'/include'],
- library_dirs=['.', '%%LOCALBASE%%'+'/lib', '%%PREFIX%%'+'/lib'],
- libraries=['newt', 'popt', 'slang', 'ncurses']
- )])
Modified: trunk/devel/newt/pkg-plist
===================================================================
--- trunk/devel/newt/pkg-plist 2015-10-02 15:00:15 UTC (rev 20369)
+++ trunk/devel/newt/pkg-plist 2015-10-02 15:00:31 UTC (rev 20370)
@@ -4,15 +4,10 @@
lib/libnewt.so
lib/libnewt.so.%%SOVERSION%%
lib/libnewt.so.%%VERSION%%
-%%PYTHONOPT%%%%PYTHON_SITELIBDIR%%/_snack.so
-%%PYTHONOPT%%%%PYTHON_SITELIBDIR%%/_snackmodule.so
-%%PYTHONOPT%%%%PYTHON_SITELIBDIR%%/snack.py
-%%PYTHONOPT%%%%PYTHON_SITELIBDIR%%/snack.pyc
-%%TCLOPT%%%%TCL_LIBDIR%%/whip/pkgIndex.tcl
-%%TCLOPT%%%%TCL_LIBDIR%%/whip/whiptcl.so
+%%TCL%%lib/whip%%VERSION%%/pkgIndex.tcl
+%%TCL%%lib/whip%%VERSION%%/whiptcl.so
libdata/pkgconfig/libnewt.pc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/peanuts.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/popcorn.py
+man/man1/whiptail.1.gz
%%NLS%%share/locale/ar/LC_MESSAGES/newt.mo
%%NLS%%share/locale/as/LC_MESSAGES/newt.mo
%%NLS%%share/locale/ast/LC_MESSAGES/newt.mo
@@ -86,39 +81,3 @@
%%NLS%%share/locale/xh/LC_MESSAGES/newt.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/newt.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/newt.mo
-%%NLS%%@dirrmtry share/locale/xh/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/xh
-%%NLS%%@dirrmtry share/locale/wo/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/wo
-%%NLS%%@dirrmtry share/locale/tl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/tl
-%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/te
-%%NLS%%@dirrmtry share/locale/sr at latin/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sr at latin
-%%NLS%%@dirrmtry share/locale/nds/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nds
-%%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/mr
-%%NLS%%@dirrmtry share/locale/mg/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/mg
-%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lv
-%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ku
-%%NLS%%@dirrmtry share/locale/km/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/km
-%%NLS%%@dirrmtry share/locale/ia/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ia
-%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/dz
-%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/bn_IN
-%%NLS%%@dirrmtry share/locale/bal/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/bal
-%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ast
-%%NLS%%@dirrmtry share/locale/as/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/as
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%TCLOPT%%@dirrm %%TCL_LIBDIR%%/whip
More information about the Midnightbsd-cvs
mailing list