4 files changed, 48 insertions, 70 deletions

diff --git a/devel/cdialog/Makefile b/devel/cdialog/Makefile
index b6b3afcaec6d..2aac5ef07e34 100644
--- a/devel/cdialog/Makefile
+++ b/devel/cdialog/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	cdialog
-PORTVERSION=	1.1.20100428
+PORTVERSION=	1.1.20111020
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://invisible-island.net/${PORTNAME:S|^c||}/
@@ -22,7 +22,11 @@ LICENSE=	LGPL21
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--includedir=${PREFIX}/include/${PORTNAME} --with-libtool
+CONFIGURE_ARGS=	--enable-widec \
+		--includedir=${PREFIX}/include/${PORTNAME} \
+		--with-libtool \
+		--with-ncursesw \
+		--with-package=${PORTNAME}
 MAKEFILE=	makefile
 
 MAN1=		cdialog.1
@@ -39,12 +43,4 @@ post-install:
 	cd ${WRKSRC}/samples && ${FIND} . | \
 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 700032
-CONFIGURE_ARGS+=	--with-ncursesw --enable-widec
-.else
-CONFIGURE_ARGS+=	--with-ncurses
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/cdialog/distinfo b/devel/cdialog/distinfo
index e248e37269eb..68c986f07b2b 100644
--- a/devel/cdialog/distinfo
+++ b/devel/cdialog/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dialog-1.1-20100428.tgz) = 3205574d988f600e8b5bf0a8833748fa26b76ec51bc9aa0a2a340067b51c7d01
-SIZE (dialog-1.1-20100428.tgz) = 400036
+SHA256 (dialog-1.1-20111020.tgz) = 746bf18b8414985864835b61536cee826ac916e6827fbcad9faffb496cae8a7a
+SIZE (dialog-1.1-20111020.tgz) = 439031
diff --git a/devel/cdialog/files/patch-makefile.in b/devel/cdialog/files/patch-makefile.in
index 26b9882cd77e..4df571327090 100644
--- a/devel/cdialog/files/patch-makefile.in
+++ b/devel/cdialog/files/patch-makefile.in
@@ -1,56 +1,28 @@
---- makefile.in	2008-03-15 19:55:17.680943499 -0500
-+++ makefile.in	2008-03-15 19:55:36.656135598 -0500
-@@ -102,7 +102,7 @@
- 	dlg_config.h \
- 	dlg_keys.h
- 
--LIB	= @LIB_PREFIX@dialog$a
-+LIB	= @LIB_PREFIX@cdialog$a
- PROG	= dialog$x
- ALL	= $(LIB) $(PROG)
- 
-@@ -126,7 +126,7 @@
+--- makefile.in.orig	2011-10-21 05:03:37.000000000 +0800
++++ makefile.in	2011-12-25 02:59:10.781638649 +0800
+@@ -85,6 +85,7 @@
+ LIBTOOL_LINK	= @LIB_LINK@
+ LIBTOOL_INSTALL	= @LIB_INSTALL@
+ LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
++LIBTOOL_VERSION = @LIBTOOL_VERSION@
+ 
+ INSTALL		= @INSTALL@
+ INSTALL_PROGRAM	= $(LIBTOOL_INSTALL) @INSTALL_PROGRAM@
+@@ -102,7 +103,7 @@
+ # The library name $(LIB) is set at configure/make time, since it is used as a
+ # makefile target.  Ditto for $(PROG).
+ LIB		= @LIB_PREFIX@@PACKAGE@$a
+-PROG		= dialog$x
++PROG		= @PACKAGE@$x
+ #
+ # Standard .c to .o compile line.
+ #
+@@ -180,7 +181,7 @@
+ 	$(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT)
  	$(RANLIB) $@
  
- dialog$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
--	$(LINK) -o $@ dialog$o -L. -ldialog $(LDFLAGS) $(LIBS)
-+	$(LINK) -o $@ dialog$o -L. -lcdialog $(LDFLAGS) $(LIBS)
+-dialog$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
++$(PROG)$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
+ 	$(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(LDFLAGS) $(LIBS)
  
  clean	\
- distclean \
-@@ -159,7 +159,7 @@
- 	@echo "made $@"
- 
- install-strip :: $(PROG) $(BINDIR)
--	$(INSTALL_PROGRAM) -s $(PROG) $(BINDIR)
-+	$(INSTALL_PROGRAM) -s $(PROG) $(BINDIR)/c${PROG}
- 
- uninstall :: uninstall-bin uninstall-man
- 	@echo "made $@"
-@@ -174,7 +174,7 @@
- 	$(RM) $(BINDIR)/$(PACKAGE)$x
- 
- install-man :: $(MAN1DIR)
--	$(INSTALL_DATA) $(srcdir)/dialog.1 $(MAN1DIR)/$(PACKAGE).1
-+	$(INSTALL_DATA) $(srcdir)/dialog.1 $(MAN1DIR)/c$(PACKAGE).1
- 
- uninstall-man ::
- 	$(RM) $(MAN1DIR)/$(PACKAGE).1
-@@ -182,7 +182,7 @@
- # most users do not want/need the library, so the install rules are distinct.
- install-lib :: $(BINDIR) dialog-config
- 	@ echo "** installing config script in $(BINDIR)"
--	@ $(INSTALL_SCRIPT) dialog-config $(BINDIR)
-+	@ $(INSTALL_SCRIPT) dialog-config $(BINDIR)/cdialog-config
- 
- install-lib :: $(LIB_DIRS) $(LIB) headers.sed
- 	@ echo "** installing library in $(LIBDIR)"
-@@ -204,7 +204,7 @@
- 	$(RM) $(INCLUDEDIR)/dlg_config.h
- 
- install-lib :: $(MAN3DIR)
--	$(INSTALL_DATA) $(srcdir)/dialog.3 $(MAN3DIR)/$(PACKAGE).3
-+	$(INSTALL_DATA) $(srcdir)/dialog.3 $(MAN3DIR)/c$(PACKAGE).3
- 
- uninstall-lib ::
- 	$(RM) $(MAN3DIR)/$(PACKAGE).3
diff --git a/devel/cdialog/pkg-plist b/devel/cdialog/pkg-plist
index 6a5babfaf8a4..700bcb7b538d 100644
--- a/devel/cdialog/pkg-plist
+++ b/devel/cdialog/pkg-plist
@@ -7,7 +7,7 @@ include/cdialog/dlg_keys.h
 lib/libcdialog.a
 lib/libcdialog.la
 lib/libcdialog.so
-lib/libcdialog.so.7
+lib/libcdialog.so.10
 %%EXAMPLESDIR%%/README
 %%EXAMPLESDIR%%/calendar
 %%EXAMPLESDIR%%/calendar-stdout
@@ -50,7 +50,6 @@ lib/libcdialog.so.7
 %%EXAMPLESDIR%%/copifuncs/ifpatch
 %%EXAMPLESDIR%%/copismall
 %%EXAMPLESDIR%%/debian.rc
-%%EXAMPLESDIR%%/dselect
 %%EXAMPLESDIR%%/dialog.py
 %%EXAMPLESDIR%%/editbox
 %%EXAMPLESDIR%%/editbox-utf8
@@ -69,6 +68,7 @@ lib/libcdialog.so.7
 %%EXAMPLESDIR%%/form6
 %%EXAMPLESDIR%%/fselect
 %%EXAMPLESDIR%%/fselect-stdout
+%%EXAMPLESDIR%%/fselect0
 %%EXAMPLESDIR%%/fselect1
 %%EXAMPLESDIR%%/fselect1-stdout
 %%EXAMPLESDIR%%/fselect2
@@ -127,6 +127,7 @@ lib/libcdialog.so.7
 %%EXAMPLESDIR%%/mixedgauge
 %%EXAMPLESDIR%%/msgbox
 %%EXAMPLESDIR%%/msgbox-help
+%%EXAMPLESDIR%%/msgbox-utf8
 %%EXAMPLESDIR%%/msgbox1
 %%EXAMPLESDIR%%/msgbox2
 %%EXAMPLESDIR%%/msgbox3
@@ -142,34 +143,43 @@ lib/libcdialog.so.7
 %%EXAMPLESDIR%%/passwordform1
 %%EXAMPLESDIR%%/passwordform1-utf8
 %%EXAMPLESDIR%%/pause
+%%EXAMPLESDIR%%/pause-both
+%%EXAMPLESDIR%%/pause-extra
 %%EXAMPLESDIR%%/pause-help
+%%EXAMPLESDIR%%/prgbox
+%%EXAMPLESDIR%%/prgbox2
+%%EXAMPLESDIR%%/programbox
+%%EXAMPLESDIR%%/programbox2
 %%EXAMPLESDIR%%/progress
 %%EXAMPLESDIR%%/progress2
 %%EXAMPLESDIR%%/radiolist
-%%EXAMPLESDIR%%/radiolist10
 %%EXAMPLESDIR%%/radiolist1
+%%EXAMPLESDIR%%/radiolist10
 %%EXAMPLESDIR%%/radiolist2
 %%EXAMPLESDIR%%/radiolist3
 %%EXAMPLESDIR%%/radiolist4
 %%EXAMPLESDIR%%/report-button
 %%EXAMPLESDIR%%/report-edit
-%%EXAMPLESDIR%%/report-tempfile
 %%EXAMPLESDIR%%/report-string
+%%EXAMPLESDIR%%/report-tempfile
 %%EXAMPLESDIR%%/report-yesno
 %%EXAMPLESDIR%%/rotated-data
 %%EXAMPLESDIR%%/setup-edit
 %%EXAMPLESDIR%%/setup-tempfile
 %%EXAMPLESDIR%%/setup-utf8
 %%EXAMPLESDIR%%/setup-vars
+%%EXAMPLESDIR%%/shortlist
 %%EXAMPLESDIR%%/slackware.rc
-%%EXAMPLESDIR%%/suse.rc
 %%EXAMPLESDIR%%/sourcemage.rc
+%%EXAMPLESDIR%%/suse.rc
 %%EXAMPLESDIR%%/tailbox
 %%EXAMPLESDIR%%/tailboxbg
 %%EXAMPLESDIR%%/tailboxbg1
 %%EXAMPLESDIR%%/tailboxbg2
 %%EXAMPLESDIR%%/testdata-8bit
 %%EXAMPLESDIR%%/textbox
+%%EXAMPLESDIR%%/textbox-both
+%%EXAMPLESDIR%%/textbox-help
 %%EXAMPLESDIR%%/textbox.txt
 %%EXAMPLESDIR%%/textbox2
 %%EXAMPLESDIR%%/textbox3