Attachment #165576 for bug #206245

View | Details | Raw Unified | Return to bug 206245
Collapse All | Expand All




# $FreeBSD: head/devel/newt/Makefile 379211 2015-02-18 15:16:43Z amdmi3 $

PORTNAME=	newt
PORTVERSION=	0.52.18
CATEGORIES=	devel
MASTER_SITES=	https://fedorahosted.org/releases/n/e/newt/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Not Eriks Windowing Toolkit: console I/O handling library

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2 \
		libpopt.so:${PORTSDIR}/devel/popt


SUB_FILES=	pkgIndex.tcl
SUB_LIST=	VERSION="${PORTVERSION}"

OPTIONS_DEFINE=		NLS PYTHON TCL
OPTIONS_DEFAULT=	PYTHON
OPTIONS_SUB=		yes

NLS_USES=		gettext
NLS_CONFIGURE_ENABLE=	nls
PYTHON_USES=		python
PYTHON_CONFIGURE_WITH=	python
TCL_USES=		tcl
TCL_CONFIGURE_ENV=	ac_cv_c_tclconfig=${TCL_LIBDIR:Q}
TCL_CONFIGURE_WITH=	tcl


SOVERSION=	${PORTVERSION:R:E}

.include <bsd.port.options.mk>

post-patch:
	@${REINPLACE_CMD} -e \
		'/^SONAME/s|=.*|=${SOVERSION}| ; \

		 /make -C/s|^|#| ; \
		 /whiptcl.$$(SOEXT)/s|install|${TRUE}|' ${WRKSRC}/Makefile.in

post-patch-PYTHON-on:
	@${REINPLACE_CMD} -e \
		'/PYTHONVERS/s|=.*|=${PYTHON_VERSION}|' ${WRKSRC}/configure

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/whiptail
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnewt.so

post-install-NLS-on:
	@(cd ${WRKSRC}/po && ${DO_MAKE_BUILD} ${MAKE_ARGS} \
		datadir=${STAGEDIR}${PREFIX}/share ${INSTALL_TARGET})

post-install-PYTHON-on:
	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_snack.so

post-install-TCL-on:
	@${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

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/newt/distinfo (-2 / +2 lines)
1	SHA256 (newt-0.52.17.tar.gz) = 69837973ef2ee2fa644426f1c3e48d2b18785ebcd382ef7fd01eb2e67d2d632b	1	SHA256 (newt-0.52.18.tar.gz) = 771b0e634ede56ae6a6acd910728bb5832ac13ddb0d1d27919d2498dab70c91e
2	SIZE (newt-0.52.17.tar.gz) = 178920	2	SIZE (newt-0.52.18.tar.gz) = 180425

Lines 1-5 Link Here

(-)devel/newt/files/patch-form.c (-2 / +2 lines)
1	--- form.c.orig Tue Jun 11 22:15:33 2002	1	--- form.c.orig 2014-10-23 08:34:37 UTC
2	+++ form.c Sat Jun 22 06:36:12 2002	2	+++ form.c
3	@@ -10,7 +10,6 @@	3	@@ -10,7 +10,6 @@
4	#endif	4	#endif
5	#include <sys/time.h>	5	#include <sys/time.h>

Lines 1-9 Link Here

(-)devel/newt/files/patch-newt.c (-3 / +5 lines)
1	--- newt.c 2009-09-24 11:03:09.000000000 -0400	1	--- newt.c.orig 2014-10-23 08:34:37 UTC
2	+++ newt.c 2010-01-06 01:04:01.000000000 -0500	2	+++ newt.c
3	@@ -99,4 +99,6 @@	3	@@ -98,6 +98,8 @@ static const struct keymap keymap[] = {
		4	{ "\033[6~", NEWT_KEY_PGDN, "kN" },
4	{ "\033V", NEWT_KEY_PGUP, NULL },	5	{ "\033V", NEWT_KEY_PGUP, NULL },
5	{ "\033v", NEWT_KEY_PGUP, NULL },	6	{ "\033v", NEWT_KEY_PGUP, NULL },
6	+ { "\033[G", NEWT_KEY_PGDN, NULL },	7	+ { "\033[G", NEWT_KEY_PGDN, NULL },
7	+ { "\033[I", NEWT_KEY_PGUP, NULL },	8	+ { "\033[I", NEWT_KEY_PGUP, NULL },
8	{ "\026", NEWT_KEY_PGDN, NULL },	9	{ "\026", NEWT_KEY_PGDN, NULL },
9		10
		11	{ "\033[[A", NEWT_KEY_F1, NULL },




--- whiptcl.c.orig	2014-10-23 08:34:37 UTC
+++ whiptcl.c
@@ -137,45 +137,45 @@ static int wtCmd(ClientData clientData, 
     
     if (arg < -1) {
 	/* this could buffer oveflow, bug we're not setuid so I don't care */

 	return TCL_ERROR;
     }
 
@@ -196,33 +196,30 @@ static int wtCmd(ClientData clientData, 
       case MODE_YESNO:
 	rc = messageBox(text, height, width, MSGBOX_YESNO, flags);
 	if (rc == DLG_OKAY)

 
 	    free(selections);
 	}
@@ -247,7 +244,7 @@ static int wtCmd(ClientData clientData, 
     newtPopWindow();
 
     if (rc == DLG_ERROR) {

Lines 4-9 Link Here

(-)devel/newt/pkg-plist (+2 lines)
4	lib/libnewt.so	4	lib/libnewt.so
5	lib/libnewt.so.%%SOVERSION%%	5	lib/libnewt.so.%%SOVERSION%%
6	lib/libnewt.so.%%VERSION%%	6	lib/libnewt.so.%%VERSION%%
		7	%%PYTHON%%%%PYTHON_SITELIBDIR%%/_snack.so
		8	%%PYTHON%%%%PYTHON_SITELIBDIR%%/snack.py
7	%%TCL%%lib/whip%%VERSION%%/pkgIndex.tcl	9	%%TCL%%lib/whip%%VERSION%%/pkgIndex.tcl
8	%%TCL%%lib/whip%%VERSION%%/whiptcl.so	10	%%TCL%%lib/whip%%VERSION%%/whiptcl.so
9	libdata/pkgconfig/libnewt.pc	11	libdata/pkgconfig/libnewt.pc

Return to bug 206245

Lines 1-13 Link Here

(-)devel/newt/Makefile (-11 / +21 lines)
1	# $FreeBSD: head/devel/newt/Makefile 379211 2015-02-18 15:16:43Z amdmi3 $	1	# $FreeBSD: head/devel/newt/Makefile 379211 2015-02-18 15:16:43Z amdmi3 $
2		2
3	PORTNAME= newt	3	PORTNAME= newt
4	PORTVERSION= 0.52.17	4	PORTVERSION= 0.52.18
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= https://fedorahosted.org/releases/n/e/newt/	6	MASTER_SITES= https://fedorahosted.org/releases/n/e/newt/
7		7
8	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= ports@FreeBSD.org
9	COMMENT= Not Eriks Windowing Toolkit: console I/O handling library	9	COMMENT= Not Eriks Windowing Toolkit: console I/O handling library
10		10
		11	LICENSE= GPLv2
		12	LICENSE_FILE= ${WRKSRC}/COPYING
		13
11	LIB_DEPENDS= libslang.so:${PORTSDIR}/devel/libslang2 \	14	LIB_DEPENDS= libslang.so:${PORTSDIR}/devel/libslang2 \
12	libpopt.so:${PORTSDIR}/devel/popt	15	libpopt.so:${PORTSDIR}/devel/popt
13		16
Lines 26-36 Link Here
26	SUB_FILES= pkgIndex.tcl	29	SUB_FILES= pkgIndex.tcl
27	SUB_LIST= VERSION="${PORTVERSION}"	30	SUB_LIST= VERSION="${PORTVERSION}"
28		31
29	OPTIONS_DEFINE= NLS TCL	32	OPTIONS_DEFINE= NLS PYTHON TCL
		33	OPTIONS_DEFAULT= PYTHON
30	OPTIONS_SUB= yes	34	OPTIONS_SUB= yes
31		35
32	NLS_USES= gettext	36	NLS_USES= gettext
33	NLS_CONFIGURE_ENABLE= nls	37	NLS_CONFIGURE_ENABLE= nls
		38	PYTHON_USES= python
		39	PYTHON_CONFIGURE_WITH= python
34	TCL_USES= tcl	40	TCL_USES= tcl
35	TCL_CONFIGURE_ENV= ac_cv_c_tclconfig=${TCL_LIBDIR:Q}	41	TCL_CONFIGURE_ENV= ac_cv_c_tclconfig=${TCL_LIBDIR:Q}
36	TCL_CONFIGURE_WITH= tcl	42	TCL_CONFIGURE_WITH= tcl
Lines 38-45 Link Here
38		44
39	SOVERSION= ${PORTVERSION:R:E}	45	SOVERSION= ${PORTVERSION:R:E}
40		46
41	.include <bsd.port.options.mk>
42
43	post-patch:	47	post-patch:
44	@${REINPLACE_CMD} -e \	48	@${REINPLACE_CMD} -e \
45	'/^SONAME/s\|=.*\|=${SOVERSION}\| ; \	49	'/^SONAME/s\|=.*\|=${SOVERSION}\| ; \
Lines 52-71 Link Here
52	/make -C/s\|^\|#\| ; \	56	/make -C/s\|^\|#\| ; \
53	/whiptcl.$$(SOEXT)/s\|install\|${TRUE}\|' ${WRKSRC}/Makefile.in	57	/whiptcl.$$(SOEXT)/s\|install\|${TRUE}\|' ${WRKSRC}/Makefile.in
54		58
		59	post-patch-PYTHON-on:
		60	@${REINPLACE_CMD} -e \
		61	'/PYTHONVERS/s\|=.*\|=${PYTHON_VERSION}\|' ${WRKSRC}/configure
		62
55	post-install:	63	post-install:
56	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/whiptail	64	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/whiptail
57	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnewt.so	65	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnewt.so
58	.if ${PORT_OPTIONS:MNLS}	66
59	@(cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \	67	post-install-NLS-on:
60	${MAKEFILE} ${MAKE_ARGS} datadir=${STAGEDIR}${PREFIX}/share \	68	@(cd ${WRKSRC}/po && ${DO_MAKE_BUILD} ${MAKE_ARGS} \
61	${INSTALL_TARGET})	69	datadir=${STAGEDIR}${PREFIX}/share ${INSTALL_TARGET})
62	.endif	70
63	.if ${PORT_OPTIONS:MTCL}	71	post-install-PYTHON-on:
		72	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_snack.so
		73
		74	post-install-TCL-on:
64	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION}	75	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION}
65	(cd ${WRKSRC} && ${INSTALL_LIB} whiptcl.so \	76	(cd ${WRKSRC} && ${INSTALL_LIB} whiptcl.so \
66	${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION})	77	${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION})
67	(cd ${WRKDIR} && ${INSTALL_DATA} pkgIndex.tcl \	78	(cd ${WRKDIR} && ${INSTALL_DATA} pkgIndex.tcl \
68	${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION})	79	${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION})
69	.endif
70		80
71	.include <bsd.port.mk>	81	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)devel/newt/files/patch-whiptcl.c (-4 / +4 lines)
1	--- whiptcl.c.orig	1	--- whiptcl.c.orig 2014-10-23 08:34:37 UTC
2	+++ whiptcl.c	2	+++ whiptcl.c
3	@@ -137,45 +137,45 @@	3	@@ -137,45 +137,45 @@ static int wtCmd(ClientData clientData,
4		4
5	if (arg < -1) {	5	if (arg < -1) {
6	/* this could buffer oveflow, bug we're not setuid so I don't care */	6	/* this could buffer oveflow, bug we're not setuid so I don't care */
Lines 56-62 Link Here
56	return TCL_ERROR;	56	return TCL_ERROR;
57	}	57	}
58		58
59	@@ -196,33 +196,30 @@	59	@@ -196,33 +196,30 @@ static int wtCmd(ClientData clientData,
60	case MODE_YESNO:	60	case MODE_YESNO:
61	rc = messageBox(text, height, width, MSGBOX_YESNO, flags);	61	rc = messageBox(text, height, width, MSGBOX_YESNO, flags);
62	if (rc == DLG_OKAY)	62	if (rc == DLG_OKAY)
Lines 95-101 Link Here
95		95
96	free(selections);	96	free(selections);
97	}	97	}
98	@@ -247,7 +244,7 @@	98	@@ -247,7 +244,7 @@ static int wtCmd(ClientData clientData,
99	newtPopWindow();	99	newtPopWindow();
100		100
101	if (rc == DLG_ERROR) {	101	if (rc == DLG_ERROR) {