Index: head/devel/newt/Makefile
===================================================================
--- head/devel/newt/Makefile	(revision 104902)
+++ head/devel/newt/Makefile	(revision 104903)
@@ -1,81 +1,81 @@
 # New ports collection makefile for:	newt
 # Date created:		08 Jan 2000
 # Whom:			Will Andrews <andrews@technologist.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	newt
 PORTVERSION=	0.51.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		# ftp://ftp.redhat.com/pub/redhat/linux/rawhide/SRPMS/SRPMS/
 MASTER_SITE_SUBDIR=	perky
 PKGNAMESUFFIX=	${PYTHONSUFFIX}${TCLSUFFIX}${I18NSUFFIX}
 
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	Not Erik's Windowing Toolkit:  console I/O handling library
 
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang \
 		popt.0:${PORTSDIR}/devel/popt
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 SOVERSION=	51
 TCL_VERSION?=	tcl8.3
 TCL_NODOT=	${TCL_VERSION:S/.//}
 MAKE_ENV+=	CC=${CC} PCFLAGS="${CFLAGS}" TCLVERSION="${TCL_VERSION}"
 PLIST_SUB+=	SOVERSION=${SOVERSION} \
 		EXAMPLESDIR="${EXAMPLESDIR:S,${PREFIX}/,,}"
 
 .if defined(WITH_PYTHON)
 PYTHONSUFFIX=	-${PYTHON_PKGNAMEPREFIX:S/-//}
 BUILD_DEPENDS+=	${PYDISTUTILS}
 USE_PYTHON=	yes
 MAKE_ENV+=	WITH_PYTHON=yes
 PLIST_SUB+=	PYTHONOPT=""
 .else
 PLIST_SUB+=	PYTHONOPT="@comment "
 .endif
 
 .if defined(WITH_TCL)
 TCLSUFFIX=	-${TCL_NODOT}
 LIB_DEPENDS+=	${TCL_NODOT}:${PORTSDIR}/lang/${TCL_NODOT}
 MAKE_ENV+=	WITH_TCL=yes
 PLIST_SUB+=	TCLOPT=""
 .else
 PLIST_SUB+=	TCLOPT="@comment "
 .endif
 
 _HAVE_WCHAR_LIB!=	grep wcwidth ${DESTDIR}/usr/lib/libc.so 2>/dev/null \
 			|| true
 .if empty(_HAVE_WCHAR_LIB)
 PATCH_SITES=	${MASTER_SITE_LOCAL} \
 		http://people.freebsd.org/~perky/distfiles/
 PATCH_SITE_SUBDIR=	perky
 PATCHFILES=	newt-${PORTVERSION}-dei18n.diff.gz
 PATCH_DIST_STRIP=	-p1
 I18NSUFFIX=	-noi18n
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's,^\(SONAME=\).*,\1${SOVERSION},g' \
 		${WRKSRC}/configure
 
 .if defined(WITH_PYTHON)
 post-build:
 	@cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${FILESDIR}/setup.py build
 
 post-install:
 	@cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${FILESDIR}/setup.py \
 		install --prefix=${PREFIX}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/peanuts.py ${WRKSRC}/popcorn.py \
 		${EXAMPLESDIR}
 .endif
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/devel/newt/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.23
\ No newline at end of property
+1.24
\ No newline at end of property
Index: head/devel/newt/files/patch-ab
===================================================================
--- head/devel/newt/files/patch-ab	(revision 104902)
+++ head/devel/newt/files/patch-ab	(revision 104903)
@@ -1,143 +1,170 @@
---- Makefile.in.orig	Fri Aug 16 05:18:11 2002
-+++ Makefile.in	Sun Oct 13 15:04:07 2002
-@@ -1,28 +1,31 @@
+--- Makefile.in.orig	Thu Aug 15 13:18:11 2002
++++ Makefile.in	Fri Mar 19 03:29:21 2004
+@@ -1,36 +1,43 @@
 -LIBS = -lslang -lm #-lefence
 -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${LOCALBASE}/include -I${PREFIX}/include
 +LDFLAGS += -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 \
-@@ -30,7 +33,7 @@
+ 	  checkboxtree.o
  
- SHCFLAGS = -fPIC
+-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
-@@ -41,41 +44,37 @@
- SOURCES = $(subst .o,.c,$(TESTOBJS) $(NDIALOGOBJS) $(LIBOBJS))
+@@ -38,44 +45,41 @@
  
- SHAREDDIR = shared
+ #--------------------------------------
+ 
+-SOURCES = $(subst .o,.c,$(TESTOBJS) $(NDIALOGOBJS) $(LIBOBJS))
++SOURCES = $(subst .o,.c,$(TESTOBJS) $(NDIALOGOBJS) $(LIBOBJS)) $(subst .So,.c,$(LIBSHOBJS))
+ 
+-SHAREDDIR = shared
 -SHAREDOBJS = $(patsubst %,$(SHAREDDIR)/%, $(LIBOBJS))
-+SHAREDOBJS = ${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)
 -	gcc -g -o test $(TESTOBJS) $(LIBNEWT) $(LIBS) -static
 +	${CC} -g ${LDFLAGS} -o test $(TESTOBJS) $(LIBNEWT) $(LIBS) -static
  
  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)
  
  _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
  	for ver in $(PYTHONVERS) ; do \
  	    if [ ! -f "$$ver/_snackmodule.so" -o $(LIBNEWTSH) -nt "$$ver/_snackmodule.so" ]; then \
  	    	mkdir -p $$ver ;\
 -	        gcc $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/snackmodule.o snackmodule.c ;\
 -		gcc --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . $(LIBNEWTSH) ;\
 +	        ${CC} $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/snackmodule.o snackmodule.c ;\
 +		${CC} --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . $(LIBNEWTSH) ;\
  	    fi ; \
  	done
  
  whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
 -	gcc -g -o whiptail $(NDIALOGOBJS) -L . $(LIBNEWTSH) $(LIBS) -lpopt
 +	${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 ${LDFLAGS} $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . $(LIBNEWTSH) ${LIBS}
  
 -$(LIBNEWT): $(LIBNEWT)($(LIBOBJS))
 +$(LIBNEWT): $(LIBOBJS)
 +	ar q ${LIBNEWT} ${LIBOBJS}
 +	ranlib ${LIBNEWT}
  
  newt.o: newt.c Makefile
  	$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
-@@ -96,7 +95,7 @@
+@@ -90,20 +94,16 @@
+ depend:
+ 	$(CPP) $(CFLAGS) -M $(SOURCES) > .depend
+ 
+-$(SHAREDDIR):
+-	mkdir -p $(SHAREDDIR)
+-
  sharedlib: $(LIBNEWTSH)
  
- $(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
+-$(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
+-$(SHAREDDIR)/%.o : %.c
++.c.So:
  	$(CC) $(SHCFLAGS) -c $(CFLAGS) -o $@ $<
-@@ -113,16 +112,11 @@
+ 
+-$(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)
  	ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/libnewt.so
  	[ -n "$(WHIPTCLSO)" ] && install -s -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 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\
 -	done
  
  configure:  configure.in
  	autoconf
-@@ -140,7 +134,3 @@
+@@ -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

Property changes on: head/devel/newt/files/patch-ab
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/devel/newt/pkg-descr
===================================================================
--- head/devel/newt/pkg-descr	(revision 104902)
+++ head/devel/newt/pkg-descr	(revision 104903)
@@ -1,12 +1,10 @@
 Newt is a windowing toolkit for text mode built from the slang
 library. It allows color text mode applications to easily use
 stackable windows, push buttons, check boxes, radio buttons, lists,   
 entry fields, labels, and displayable text. Scrollbars are supported,
 and forms may be nested to provide extra functionality.
 
-WWW: http://www.msg.com.mx/Newt/
-
 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.

Property changes on: head/devel/newt/pkg-descr
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property