- Update to 0.5.11 [1]

- sort pkg-plist
- bump PORTREVISION for SHLIB bump

Submitted by:   mi (via e-mail) [1] with minor changes

comms/hf/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	hf
 PORTVERSION=	0.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}term/${PORTNAME}/${PORTVERSION}
 

devel/newt/Makefile

@@ -6,70 +6,95 @@
 #
 
 PORTNAME=	newt
-PORTVERSION=	0.51.0
+PORTVERSION=	0.52.11
-PORTREVISION=	8
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
+MASTER_SITES=	https://fedorahosted.org/releases/n/e/newt/
-		# ftp://ftp.redhat.com/pub/redhat/linux/rawhide/SRPMS/SRPMS/
-MASTER_SITE_SUBDIR=	perky
 PKGNAMESUFFIX=	${PYTHONSUFFIX}${TCLSUFFIX}
 
 MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	Not Erik's Windowing Toolkit:  console I/O handling library#'
 
-LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2 \
+LIB_DEPENDS=	slang:${PORTSDIR}/devel/libslang2 \
-		popt.0:${PORTSDIR}/devel/popt
+		popt:${PORTSDIR}/devel/popt
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-SOVERSION=	51
+SOVERSION=	${PORTVERSION:R:E}
-TCL_VERSION?=	tcl8.3
+TCL_NODOT=	tcl${TCL_VER:S/.//}
-TCL_NODOT=	${TCL_VERSION:S/.//}
+CFLAGS+=	-Werror
-MAKE_ENV+=	PCFLAGS="${CFLAGS}" TCLVERSION="${TCL_VERSION}"
+MAKE_ENV+=	PCFLAGS="${CFLAGS}" TCLVERSION="tcl${TCL_VER}"
 PLIST_SUB+=	SOVERSION=${SOVERSION} \
+		VERSION=${PORTVERSION}	\
 		EXAMPLESDIR="${EXAMPLESDIR:S,${PREFIX}/,,}"
+SUB_LIST=	VERSION=${PORTVERSION}
 
+USE_GMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+.else
+USE_GETTEXT=	yes
+.endif
 .if defined(WITH_PYTHON)
 PYTHONSUFFIX=	-${PYTHON_PKGNAMEPREFIX:S/-//}
 BUILD_DEPENDS+=	${PYDISTUTILS}
 USE_PYTHON=	yes
 MAKE_ENV+=	WITH_PYTHON=yes
-PLIST_SUB+=	PYTHONOPT=""
+PLIST_SUB+=	PYTHONOPT=""	\
+		PYNUM=${PYTHON_VERSION:S/python//}
+SUB_FILES+=	setup.py
 .else
 PLIST_SUB+=	PYTHONOPT="@comment "
 .endif
 
 .if defined(WITH_TCL)
+USE_TCL=	84+
 TCLSUFFIX=	-${TCL_NODOT}
-LIB_DEPENDS+=	${TCL_NODOT}:${PORTSDIR}/lang/${TCL_NODOT}
+MAKE_ENV+=	WITH_TCL=yes TCL_LIBDIR=${TCL_LIBDIR:Q}
+PLIST_SUB+=	TCLOPT="" TCL_VER=${TCL_VER}${_TCL_THREADS_SUFFIX}
+CONFIGURE_ENV+=	CPPFLAGS=-I${TCL_INCLUDEDIR:Q}
+SUB_FILES+=	pkgIndex.tcl
+
+pre-su-install:
+	${MKDIR} ${TCL_LIBDIR}/whip
 
-MAKE_JOBS_SAFE=  yes
-MAKE_ENV+=	WITH_TCL=yes
-PLIST_SUB+=	TCLOPT=""
 .else
 PLIST_SUB+=	TCLOPT="@comment "
+CONFIGURE_ARGS+=--without-tcl
 .endif
 
+MAN1=	whiptail.1
+
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's,^\(SONAME=\).*,\1${SOVERSION},g' \
 		${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|/usr/include/slang|${LOCALBASE:Q}/include|' \
+		-e 's|-lslang|-lcurses -L${LOCALBASE:Q}/lib -lslang|'	\
+		-e 's|-ltcl8.4||'	\
+		-e 's|^pkgconfigdir.*|pkgconfigdir=${LOCALBASE:Q}/libdata/pkgconfig|'	\
+		-e 's,PYTHONVERS =.*,PYTHONVERS=${PYTHON_VER},' \
+		${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's,PyMem_DEL,PyObject_DEL,g' \
 		${WRKSRC}/snackmodule.c
 
 .if defined(WITH_PYTHON)
-post-build:
+pre-install:
 	@${LN} -sf ${WRKSRC}/libnewt.so.${SOVERSION} ${WRKSRC}/libnewt.so
-	@cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${FILESDIR}/setup.py build
+	@cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${WRKDIR}/setup.py build
+.endif
 
 post-install:
-	@cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${FILESDIR}/setup.py \
+.if defined(WITH_TCL)
-		install --prefix=${PREFIX}
+	${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${TCL_LIBDIR}/whip/
-.if !defined(NOPORTDOCS)
+.endif
-	${MKDIR} ${EXAMPLESDIR}
+.if defined(WITH_PYTHON)
-	${INSTALL_SCRIPT} ${WRKSRC}/peanuts.py ${WRKSRC}/popcorn.py \
+	@cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${WRKDIR}/setup.py install --prefix=${PREFIX}
-		${EXAMPLESDIR}
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}/
+	${INSTALL_SCRIPT} ${WRKSRC}/peanuts.py ${WRKSRC}/popcorn.py ${EXAMPLESDIR}/
 .endif
 .endif
 

devel/newt/distinfo

@@ -1,3 +1,3 @@
-MD5 (newt-0.51.0.tar.gz) = 33e9bbf29126dfdc0bd4b6bd1509b62d
+MD5 (newt-0.52.11.tar.gz) = 4b9a0685ecd180c42d2c4a5806e3fc52
-SHA256 (newt-0.51.0.tar.gz) = 45c617654c466eeb56cf62eb45a66acea0e84039c7b16ce7172fb5567001642f
+SHA256 (newt-0.52.11.tar.gz) = 8bac17b4272475f5e172b9894b8c062a6e5ab0689a736d9dbbcc1695604fb8d7
-SIZE (newt-0.51.0.tar.gz) = 108158
+SIZE (newt-0.52.11.tar.gz) = 175596

devel/newt/files/patch-ab

@@ -1,170 +1,62 @@
---- Makefile.in.orig	Thu Aug 15 13:18:11 2002
+--- Makefile.in	2009-09-24 11:03:09.000000000 -0400
-+++ Makefile.in	Fri Mar 19 03:29:21 2004
++++ Makefile.in	2010-01-06 01:33:55.000000000 -0500
-@@ -1,36 +1,43 @@
+@@ -51,5 +51,5 @@
--LIBS = -lslang -lm #-lefence
+ endif
--SHLIBS = -lslang -lm -lc
-+LIBS = -lslang -lm -lpopt -lncurses #-lefence
-+SHLIBS = -lslang -lm -lc -lpopt -lncurses
- 
- GPM_SUPPORT=@gpm_support@
- 
--CFLAGS = $(RPM_OPT_FLAGS) -Wall -I/usr/include/slang -D_GNU_SOURCE
--ifeq ($(RPM_OPT_FLAGS),)
--CFLAGS += -g 
--endif
-+CFLAGS += -I/usr/include -I${LOCALBASE}/include -I${PREFIX}/include
-+LDFLAGS += -L/usr/lib -L${LOCALBASE}/lib -L${PREFIX}/lib
- 
- VERSION = @VERSION@
- CVSTAG = r$(subst .,-,$(VERSION))
- SONAME = @SONAME@
- 
--PYTHONVERS = $(shell ls -d /usr/include/python* | sed "s|/usr/include/||g")
-+#PYTHONVERS = $(shell ls -d /usr/include/python* | sed "s|/usr/include/||g")
- 
--WHIPTCLSO=
--#WHIPTCLSO=whiptcl.so
-+.if defined(WITH_TCL)
-+WHIPTCLSO=whiptcl.so
-+CFLAGS += -I${LOCALBASE}/include/${TCLVERSION}
-+LDFLAGS += -L${LOCALBASE}/lib/${TCLVERSION}
-+SHLIBS += -l${TCLVERSION:S,.,,}
-+.endif
-+TARGET=${LIBNEWT} ${PROGS} ${WHIPTCLSO}
- 
--PROGS = test whiptail $(WHIPTCLSO) testgrid testtree
-+PROGS = test whiptail testgrid testtree
- TESTOBJS = test.o
- NDIALOGOBJS = whiptail.o dialogboxes.o
- WHIPTCLOBJS = whiptcl.o dialogboxes.o
- LIBNEWT = libnewt.a
--LIBNEWTSH = libnewt.so.$(VERSION)
-+LIBNEWTSH = libnewt.so.$(SONAME)
- LIBNEWTSONAME = libnewt.so.$(SONAME)
- LIBOBJS = newt.o button.o form.o checkbox.o entry.o label.o listbox.o \
-           scrollbar.o textbox.o scale.o grid.o windows.o buttonbar.o \
- 	  checkboxtree.o
- 
--SHCFLAGS = -fPIC
-+LIBSHOBJS = newt.So button.So form.So checkbox.So entry.So label.So listbox.So \
-+          scrollbar.So textbox.So scale.So grid.So windows.So buttonbar.So \
-+	  checkboxtree.So
- 
--prefix = /usr
-+SHCFLAGS = ${CFLAGS} -fPIC
-+
-+prefix = ${PREFIX}
- includedir = $(prefix)/include
- libdir = $(prefix)/lib
- bindir = $(prefix)/bin
-@@ -38,44 +45,41 @@
- 
- #--------------------------------------
- 
--SOURCES = $(subst .o,.c,$(TESTOBJS) $(NDIALOGOBJS) $(LIBOBJS))
-+SOURCES = $(subst .o,.c,$(TESTOBJS) $(NDIALOGOBJS) $(LIBOBJS)) $(subst .So,.c,$(LIBSHOBJS))
- 
--SHAREDDIR = shared
--SHAREDOBJS = $(patsubst %,$(SHAREDDIR)/%, $(LIBOBJS))
-+.SUFFIXES: .o .So
- 
--ifeq (.depend,$(wildcard .depend))
--TARGET=$(PROGS)
--else
--TARGET=depend $(PROGS)
--endif
-+SHAREDOBJS = ${LIBSHOBJS}
  
 -all:	$(TARGET) _snackmodule.so
 +all:	$(TARGET)
  
- test:	$(TESTOBJS) $(LIBNEWT)
+ test:	test.o $(LIBNEWT)
--	gcc -g -o test $(TESTOBJS) $(LIBNEWT) $(LIBS) -static
+@@ -68,11 +68,11 @@
-+	${CC} -g ${LDFLAGS} -o test $(TESTOBJS) $(LIBNEWT) $(LIBS) -static
+ 	$(CC) -g -o showkey showkey.o $(LIBNEWT) $(LIBS)
- 
- testgrid:	testgrid.o $(LIBNEWT)
--	gcc -g -o testgrid testgrid.o $(LIBNEWT) $(LIBS)
-+	${CC} -g ${LDFLAGS} -o testgrid testgrid.o $(LIBNEWT) $(LIBS)
- 
- testtree:	testtree.o $(LIBNEWT)
--	gcc -g -o testtree testtree.o $(LIBNEWT) $(LIBS)
-+	${CC} -g ${LDFLAGS} -o testtree testtree.o $(LIBNEWT) $(LIBS)
  
++ifdef PYTHONVERS
++install-sh:	_snackmodule.so
++all:	_snackmodule.so
  _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
- 	for ver in $(PYTHONVERS) ; do \
+-	for ver in $(PYTHONVERS) ; do \
- 	    if [ ! -f "$$ver/_snackmodule.so" -o $(LIBNEWTSH) -nt "$$ver/_snackmodule.so" ]; then \
+-	    	mkdir -p $$ver ;\
- 	    	mkdir -p $$ver ;\
+-	        $(CC) $(CFLAGS) -I/usr/include/$$ver $(SHCFLAGS) -c -o $$ver/snackmodule.o snackmodule.c ;\
--	        gcc $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/snackmodule.o snackmodule.c ;\
+-		$(CC) --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L .  -lnewt ;\
--		gcc --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . $(LIBNEWTSH) ;\
+-	done
-+	        ${CC} $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/snackmodule.o snackmodule.c ;\
+-	touch $@
-+		${CC} --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . $(LIBNEWTSH) ;\
++	$(CC) $(CFLAGS) $(CPPFLAGS) -I${LOCALBASE}/include/python${PYTHONVERS} $(SHCFLAGS) -c -o snackmodule.o snackmodule.c
- 	    fi ; \
++	$(CC) --shared $(SHCFLAGS) -o _snackmodule.so snackmodule.o -L .  -lnewt
- 	done
++endif
  
  whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
--	gcc -g -o whiptail $(NDIALOGOBJS) -L . $(LIBNEWTSH) $(LIBS) -lpopt
+@@ -80,5 +80,5 @@
-+	${CC} -g ${LDFLAGS} -o whiptail $(NDIALOGOBJS) -L . $(LIBNEWTSH) $(LIBS) -lpopt
  
  whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
--	gcc -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . $(LIBNEWTSH) -ltcl -lslang -lpopt -lm
+-	$(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt  $(LIBTCL) -lpopt
-+	${CC} -shared ${LDFLAGS} $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . $(LIBNEWTSH) ${LIBS}
++	$(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt  $(LIBTCL) $(LIBS) -lpopt
  
--$(LIBNEWT): $(LIBNEWT)($(LIBOBJS))
+ $(LIBNEWT): $(LIBOBJS)
-+$(LIBNEWT): $(LIBOBJS)
+@@ -119,18 +119,18 @@
-+	ar q ${LIBNEWT} ${LIBOBJS}
+ 	install -m 755 whiptail $(instroot)/$(bindir)
-+	ranlib ${LIBNEWT}
+ 	install -m 644 whiptail.1 $(instroot)/$(man1dir)
- 
+-	make -C po datadir=$(instroot)/$(datadir) install
- newt.o: newt.c Makefile
+-	install -m 644 -D libnewt.pc $(instroot)/$(pkgconfigdir)/libnewt.pc
- 	$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
++	${MAKE} -C po datadir=$(instroot)/$(datadir) install
-@@ -90,20 +94,16 @@
++	install -m 644 libnewt.pc $(instroot)/$(pkgconfigdir)/libnewt.pc
- depend:
- 	$(CPP) $(CFLAGS) -M $(SOURCES) > .depend
- 
--$(SHAREDDIR):
--	mkdir -p $(SHAREDDIR)
--
- sharedlib: $(LIBNEWTSH)
- 
--$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
--	gcc -shared -o $(LIBNEWTSH) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
-+$(LIBNEWTSH): $(SHAREDOBJS)
-+	${CC} -shared ${LDFLAGS} -o $(LIBNEWTSH) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
- 
--$(SHAREDDIR)/%.o : %.c
-+.c.So:
- 	$(CC) $(SHCFLAGS) -c $(CFLAGS) -o $@ $<
- 
--$(SHAREDDIR)/newt.o: newt.c Makefile
--	$(CC) $(SHCFLAGS) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
--
-+newt.So: newt.c Makefile
-+	$(CC) $(SHCFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
- 
- install: $(LIBNEWT) install-sh whiptail
- 	[ -d $(instroot)/$(bindir) ] || install -m 755 -d $(instroot)/$(bindir)
-@@ -113,16 +113,11 @@
- 	install -m 644 $(LIBNEWT) $(instroot)/$(libdir)
- 	install -s -m 755 whiptail $(instroot)/$(bindir)
  
 -install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so
 +install-sh: sharedlib $(WHIPTCLSO)
  	[ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
- 	install -s -m 755 $(LIBNEWTSH) $(instroot)/$(libdir)
+ 	install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir)
- 	ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/libnewt.so
+ 	ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so
- 	[ -n "$(WHIPTCLSO)" ] && install -s -m 755 whiptcl.so $(instroot)/$(libdir) || :
+ 	ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME)
+-	[ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so $(instroot)/$(libdir) || :
 -	for ver in $(PYTHONVERS) ; do \
 -	   [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\
--	   install -s -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\
+-	   install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\
--	   install -m 755 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\
+-	   install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\
 -	done
++	[ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so ${TCL_LIBDIR}/whip || :
++ifdef PYTHONVERS
++	[ -d $(instroot)/$(libdir)/python${PYTHONVERS}/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/python${PYTHONVERS}/site-packages
++	install -m 755 _snackmodule.so $(instroot)/$(libdir)/python${PYTHONVERS}/site-packages
++	install -m 644 snack.py $(instroot)/$(libdir)/python${PYTHONVERS}/site-packages
++endif
  
- configure:  configure.in
+ Makefile: newt.spec
- 	autoconf
-@@ -140,7 +135,3 @@
- 	@rm -f /tmp/newt-$(VERSION).tar.gz
- 	@echo " "
- 	@echo "The final archive is ./newt-$(VERSION).tar.gz."
--
--ifeq (.depend,$(wildcard .depend))
--include .depend
--endif

devel/newt/files/patch-newt.c

@@ -1,15 +1,12 @@
 
 $FreeBSD$
 
---- newt.c
+--- newt.c	2009-09-24 11:03:09.000000000 -0400
-+++ newt.c
++++ newt.c	2010-01-06 01:04:01.000000000 -0500
-@@ -94,6 +94,9 @@
+@@ -99,4 +99,6 @@
- 	{ "\033[6~",		NEWT_KEY_PGDN,		NULL },
+ 	{ "\033V",		NEWT_KEY_PGUP, 		NULL },
- 	{ "\033V",		NEWT_KEY_PGUP, 		"kH" },
+ 	{ "\033v",		NEWT_KEY_PGUP, 		NULL },
- 	{ "\033v",		NEWT_KEY_PGUP, 		"kH" },
++	{ "\033[G",             NEWT_KEY_PGDN,          NULL },
-+
++	{ "\033[I",             NEWT_KEY_PGUP,          NULL },
-+	{ "\033[G",		NEWT_KEY_PGDN,		NULL },
+         { "\026",		NEWT_KEY_PGDN,		NULL },
-+	{ "\033[I",		NEWT_KEY_PGUP,		NULL },
  
- 	{ "\033[[A",		NEWT_KEY_F1,		NULL },
- 	{ "\033[[B",		NEWT_KEY_F2,		NULL },

devel/newt/files/patch-whiptail

@@ -0,0 +1,8 @@
+--- whiptail.c	2009-09-24 11:03:09.000000000 -0400
++++ whiptail.c	2010-01-06 01:17:31.000000000 -0500
+@@ -9,4 +9,5 @@
+ #include <wchar.h>
+ #include <slang.h>
++#include <sys/stat.h>
+ 
+ #include "nls.h"

devel/newt/files/patch-whiptcl

@@ -0,0 +1,74 @@
+--- whiptcl.c	2009-09-24 11:03:09.000000000 -0400
++++ whiptcl.c	2010-01-06 02:44:52.000000000 -0500
+@@ -6,6 +6,6 @@
+ #include "dialogboxes.h"
+ #include "newt.h"
+-#include "popt.h"
+-#include "tcl.h"
++#include <popt.h>
++#include <tcl.h>
+ 
+ enum mode { MODE_NONE, MODE_MSGBOX, MODE_YESNO, MODE_CHECKLIST, MODE_INPUTBOX,
+@@ -20,12 +20,12 @@
+ 
+ static char * setBacktext(ClientData data, Tcl_Interp * interp, 
+-			  char * name1, char * name2, int flags);
++			  const char * name1, const char * name2, int flags);
+ static char * setHelptext(ClientData data, Tcl_Interp * interp,
+-			  char * name1, char * name2, int flags);
++			  const char * name1, const char * name2, int flags);
+ static char * setFullButtons(ClientData data, Tcl_Interp * interp, 
+-			     char * name1, char * name2, int flags);
++			     const char * name1, const char * name2, int flags);
+ 
+ static int wtFinish(ClientData clientData, Tcl_Interp * interp, int argc,
+-                  char ** argv) {
++                  const char ** argv) {
+     newtFinished();
+ 
+@@ -34,5 +34,5 @@
+ 
+ static int wtInit(ClientData clientData, Tcl_Interp * interp, int argc,
+-                  char ** argv) {
++                  const char ** argv) {
+     newtInit();
+     newtCls();
+@@ -239,5 +239,5 @@
+ 
+       case MODE_NONE:
+-	/* this can't happen */
++	; /* this can't happen */
+         break;
+     }
+@@ -259,5 +259,5 @@
+ 
+ static char * setBacktext(ClientData data, Tcl_Interp * interp, 
+-			  char * name1, char * name2, int flags) {
++			  const char * name1, const char * name2, int flags) {
+     static char blankLine[81] = "                                        "
+                          "                                        ";
+@@ -271,6 +271,6 @@
+ 
+ static char * setHelptext(ClientData data, Tcl_Interp * interp, 
+-			  char * name1, char * name2, int flags) {
+-    char * text = Tcl_GetVar(interp, "whiptcl_helpline", TCL_GLOBAL_ONLY);
++			  const char * name1, const char * name2, int flags) {
++    const char * text = Tcl_GetVar(interp, "whiptcl_helpline", TCL_GLOBAL_ONLY);
+ 
+     if (!text)
+@@ -286,6 +286,6 @@
+ 
+ static char * setFullButtons(ClientData data, Tcl_Interp * interp, 
+-			     char * name1, char * name2, int flags) {
+-    char * val = Tcl_GetVar(interp, "whiptcl_fullbuttons", TCL_GLOBAL_ONLY);
++			     const char * name1, const char * name2, int flags) {
++    const char * val = Tcl_GetVar(interp, "whiptcl_fullbuttons", TCL_GLOBAL_ONLY);
+     int rc;
+     int state;
+@@ -306,4 +306,6 @@
+     Tcl_CreateCommand(interp, "whiptcl_cmd", (Tcl_CmdProc *) wtCmd, NULL, NULL);
+ 
++    Tcl_PkgProvide(interp, "Whip", VERSION);
++
+     return TCL_OK;
+ }

devel/newt/files/pkgIndex.tcl.in

@@ -0,0 +1,2 @@
+package ifneeded Whip %%VERSION%% [list load [file join $dir whiptcl.so]]
+package ifneeded Whip %%VERSION%% [list load [file join $dir whiptcl.so]]

devel/newt/files/setup.py

@@ -1,18 +0,0 @@
-# $FreeBSD$
-import os
-from distutils.core import setup, Extension
-
-LOCALBASE = os.environ['LOCALBASE']
-PREFIX = os.environ['PREFIX']
-
-setup ( name = 'newt',
-	version = '0.50.33',
-	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']
-	)])

devel/newt/files/setup.py.in

@@ -0,0 +1,30 @@
+# $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']
+	)])

devel/newt/pkg-descr

@@ -8,3 +8,5 @@ Besides the newt library, this port provides whiptail, which may
 be used from shell scripts similarly to Savio Lam's "dialog". Newt
 provides the textual interface for the Red Hat and Debian boot
 disks.
+
+WWW:	https://fedorahosted.org/newt/

devel/newt/pkg-plist

@@ -1,12 +1,167 @@
+%%PORTEXAMPLES%%%%PYTHONOPT%%%%EXAMPLESDIR%%/peanuts.py
+%%PORTEXAMPLES%%%%PYTHONOPT%%%%EXAMPLESDIR%%/popcorn.py
+%%PYTHONOPT%%%%PYTHON_SITELIBDIR%%/_snack.so
+%%PYTHONOPT%%%%PYTHON_SITELIBDIR%%/_snackmodule.so
+%%PYTHONOPT%%%%PYTHON_SITELIBDIR%%/newt-%%VERSION%%-py%%PYNUM%%.egg-info
+%%PYTHONOPT%%%%PYTHON_SITELIBDIR%%/snack.py
+%%PYTHONOPT%%%%PYTHON_SITELIBDIR%%/snack.pyc
+%%TCLOPT%%lib/tcl%%TCL_VER%%/whip/pkgIndex.tcl
+%%TCLOPT%%lib/tcl%%TCL_VER%%/whip/whiptcl.so
 bin/whiptail
-%%PYTHONOPT%%lib/%%PYTHON_VERSION%%/site-packages/_snack.so
+include/newt.h
-%%PYTHONOPT%%lib/%%PYTHON_VERSION%%/site-packages/snack.py
-%%PYTHONOPT%%lib/%%PYTHON_VERSION%%/site-packages/snack.pyc
-%%TCLOPT%%lib/whiptcl.so
 lib/libnewt.a
 lib/libnewt.so
 lib/libnewt.so.%%SOVERSION%%
-include/newt.h
+lib/libnewt.so.%%VERSION%%
-%%PORTDOCS%%%%PYTHONOPT%%%%EXAMPLESDIR%%/peanuts.py
+libdata/pkgconfig/libnewt.pc
-%%PORTDOCS%%%%PYTHONOPT%%%%EXAMPLESDIR%%/popcorn.py
+share/locale/ar/LC_MESSAGES/newt.mo
-%%PORTDOCS%%%%PYTHONOPT%%@dirrm %%EXAMPLESDIR%%
+share/locale/as/LC_MESSAGES/newt.mo
+share/locale/ast/LC_MESSAGES/newt.mo
+share/locale/bal/LC_MESSAGES/newt.mo
+share/locale/bg/LC_MESSAGES/newt.mo
+share/locale/bn/LC_MESSAGES/newt.mo
+share/locale/bn_IN/LC_MESSAGES/newt.mo
+share/locale/bs/LC_MESSAGES/newt.mo
+share/locale/ca/LC_MESSAGES/newt.mo
+share/locale/cs/LC_MESSAGES/newt.mo
+share/locale/cy/LC_MESSAGES/newt.mo
+share/locale/da/LC_MESSAGES/newt.mo
+share/locale/de/LC_MESSAGES/newt.mo
+share/locale/dz/LC_MESSAGES/newt.mo
+share/locale/el/LC_MESSAGES/newt.mo
+share/locale/eo/LC_MESSAGES/newt.mo
+share/locale/es/LC_MESSAGES/newt.mo
+share/locale/et/LC_MESSAGES/newt.mo
+share/locale/eu/LC_MESSAGES/newt.mo
+share/locale/fi/LC_MESSAGES/newt.mo
+share/locale/fr/LC_MESSAGES/newt.mo
+share/locale/ga/LC_MESSAGES/newt.mo
+share/locale/gl/LC_MESSAGES/newt.mo
+share/locale/gu/LC_MESSAGES/newt.mo
+share/locale/he/LC_MESSAGES/newt.mo
+share/locale/hi/LC_MESSAGES/newt.mo
+share/locale/hr/LC_MESSAGES/newt.mo
+share/locale/hu/LC_MESSAGES/newt.mo
+share/locale/id/LC_MESSAGES/newt.mo
+share/locale/it/LC_MESSAGES/newt.mo
+share/locale/ja/LC_MESSAGES/newt.mo
+share/locale/km/LC_MESSAGES/newt.mo
+share/locale/kn/LC_MESSAGES/newt.mo
+share/locale/ko/LC_MESSAGES/newt.mo
+share/locale/ku/LC_MESSAGES/newt.mo
+share/locale/lt/LC_MESSAGES/newt.mo
+share/locale/mg/LC_MESSAGES/newt.mo
+share/locale/mk/LC_MESSAGES/newt.mo
+share/locale/ml/LC_MESSAGES/newt.mo
+share/locale/mr/LC_MESSAGES/newt.mo
+share/locale/ms/LC_MESSAGES/newt.mo
+share/locale/nb/LC_MESSAGES/newt.mo
+share/locale/ne/LC_MESSAGES/newt.mo
+share/locale/nl/LC_MESSAGES/newt.mo
+share/locale/nn/LC_MESSAGES/newt.mo
+share/locale/pa/LC_MESSAGES/newt.mo
+share/locale/pl/LC_MESSAGES/newt.mo
+share/locale/pt/LC_MESSAGES/newt.mo
+share/locale/pt_BR/LC_MESSAGES/newt.mo
+share/locale/ro/LC_MESSAGES/newt.mo
+share/locale/ru/LC_MESSAGES/newt.mo
+share/locale/sk/LC_MESSAGES/newt.mo
+share/locale/sl/LC_MESSAGES/newt.mo
+share/locale/sq/LC_MESSAGES/newt.mo
+share/locale/sr/LC_MESSAGES/newt.mo
+share/locale/sr@latin/LC_MESSAGES/newt.mo
+share/locale/sv/LC_MESSAGES/newt.mo
+share/locale/ta/LC_MESSAGES/newt.mo
+share/locale/te/LC_MESSAGES/newt.mo
+share/locale/th/LC_MESSAGES/newt.mo
+share/locale/tl/LC_MESSAGES/newt.mo
+share/locale/tr/LC_MESSAGES/newt.mo
+share/locale/uk/LC_MESSAGES/newt.mo
+share/locale/vi/LC_MESSAGES/newt.mo
+share/locale/wo/LC_MESSAGES/newt.mo
+share/locale/xh/LC_MESSAGES/newt.mo
+share/locale/zh_CN/LC_MESSAGES/newt.mo
+share/locale/zh_TW/LC_MESSAGES/newt.mo
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/wo/LC_MESSAGES
+@dirrmtry share/locale/wo
+@dirrmtry share/locale/vi
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tr
+@dirrmtry share/locale/tl/LC_MESSAGES
+@dirrmtry share/locale/tl
+@dirrmtry share/locale/th
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/ta
+@dirrmtry share/locale/sv
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sq
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ru
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt_BR
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/pa
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/nl
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/nb
+@dirrmtry share/locale/ms
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ml
+@dirrmtry share/locale/mk
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/lt
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/kn
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
+@dirrmtry share/locale/ja
+@dirrmtry share/locale/it
+@dirrmtry share/locale/id
+@dirrmtry share/locale/hu
+@dirrmtry share/locale/hr
+@dirrmtry share/locale/hi
+@dirrmtry share/locale/he
+@dirrmtry share/locale/gu
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/ga
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/eu
+@dirrmtry share/locale/et
+@dirrmtry share/locale/es
+@dirrmtry share/locale/eo
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/de
+@dirrmtry share/locale/da
+@dirrmtry share/locale/cy
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bs
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/bn
+@dirrmtry share/locale/bg
+@dirrmtry share/locale/bal/LC_MESSAGES
+@dirrmtry share/locale/bal
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrmtry share/locale/ar
+%%PORTEXAMPLES%%%%PYTHONOPT%%@dirrm %%EXAMPLESDIR%%

devel/pecl-newt/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	newt
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	devel www
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-

japanese/asterisk-sound/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk-sounds
 PORTVERSION=	1.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese net
 MASTER_SITES=	ftp://ftp.voip-info.jp/asterisk/sounds/
 DISTNAME=	${PORTVERSION:S|.|_|}/${PORTNAME:S|sounds|sound|}-jp_${PORTVERSION:S|.||}_beta

japanese/asterisk-sounds/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk-sounds
 PORTVERSION=	1.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese net
 MASTER_SITES=	ftp://ftp.voip-info.jp/asterisk/sounds/
 DISTNAME=	${PORTVERSION:S|.|_|}/${PORTNAME:S|sounds|sound|}-jp_${PORTVERSION:S|.||}_beta

japanese/asterisk14-sounds/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk-sounds
 PORTVERSION=	1.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese net
 MASTER_SITES=	ftp://ftp.voip-info.jp/asterisk/sounds/
 DISTNAME=	${PORTVERSION:S|.|_|}/${PORTNAME:S|sounds|sound|}-jp_${PORTVERSION:S|.||}_beta

misc/zaptel/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	zaptel
 PORTVERSION=	1.4.11.2
+PORTREVISION=	1
 CATEGORIES=	misc kld
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	fjoe

net/asterisk-addons/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk-addons
 PORTVERSION=	1.4.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/

net/asterisk-app-notify/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	app_notify
 DISTVERSION=	2.0rc1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://www.mezzo.net/asterisk/ \
 		http://static.oyam.ca/freebsd/ports/

net/asterisk-bristuff/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.4.26.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/

net/asterisk/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.4.26.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/

net/asterisk10/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.4.26.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/

net/asterisk12/Makefile

@@ -8,6 +8,7 @@
 PORTNAME=	asterisk
 PORTVERSION=	1.2.32
 PKGNAMESUFFIX=	12
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/

net/asterisk14-addons/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk-addons
 PORTVERSION=	1.4.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/

net/asterisk14/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.4.26.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/

net/asterisk16-addons/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	asterisk16-addons
 PORTVERSION=	1.6.0.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/

net/asterisk16/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.6.0.18
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	16
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \

net/astfax/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	astfax
 PORTVERSION=	1.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	http://www.inter7.com/astfax/
 

net/astmanproxy/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	astmanproxy
 PORTVERSION=	1.21
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	http://www.popvox.com/
 DISTFILES=	astmanproxy-latest.tgz

net/freeswitch/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	freeswitch
 PORTVERSION=	1.0.4.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://files.freeswitch.org/:source1 \
 		http://dl.getdropbox.com/u/152504/:source2 \

net/yate-devel/Makefile

@@ -8,7 +8,7 @@
 PORTNAME=	yate
 PORTVERSION=	1.3.0.p2
 DISTVERSION=	${PORTVERSION:S/.p/-/}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net comms
 MASTER_SITES=	http://cto.homelinux.net/pub/FreeBSD/ports/distfiles/ \
 		${MASTER_SITE_LOCAL}

www/asterisk-gui/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk-gui
 PORTVERSION=	2.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk-gui/releases/
 

www/asterisk-stat/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk-stat
 PORTVERSION=	2.0.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	http://www.areski.net/${SITE_SUBDIR}/
 DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}