4 files changed, 62 insertions, 39 deletions

diff --git a/devel/cdialog/Makefile b/devel/cdialog/Makefile
index f2ea67aae2d0..b85005567483 100644
--- a/devel/cdialog/Makefile
+++ b/devel/cdialog/Makefile
@@ -2,21 +2,21 @@
 # Date created:		2003-01-11
 # Whom:			AlanE <alane@freebsd.org>
 #
+# $Carpetsmoker: ports/cdialog/Makefile,v 1.1 2007/04/08 17:19:30 carpetsmoker Exp $
 # $FreeBSD$
 #
 
 PORTNAME=	cdialog
-PORTVERSION=	1.0.20060221
+PORTVERSION=	1.1.20070325
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://invisible-island.net/dialog/
 DISTNAME=	${PORTNAME:S|^c||}-${PORTVERSION:R}-${PORTVERSION:E}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	carpetsmoker@xs4all.nl
 COMMENT=	An enhanced version of 'dialog' to work with ncurses
 
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/${PORTNAME}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -26,11 +26,19 @@ MAN1=		cdialog.1
 MAN3=		cdialog.3
 MANCOMPRESSED=	no
 
-INSTALL_TARGET=	install-strip install-lib
+INSTALL_TARGET=	install-strip install-man install-lib
 
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/samples && ${FIND} . | \
 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 700032 || (${OSVERSION} < 700000 && ${OSVERSION} > 602106)
+CONFIGURE_ARGS+=	--with-ncursesw --enable-widec
+.else
+CONFIGURE_ARGS+=	--with-ncurses
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/cdialog/distinfo b/devel/cdialog/distinfo
index 30314eba5926..e424767417ea 100644
--- a/devel/cdialog/distinfo
+++ b/devel/cdialog/distinfo
@@ -1,3 +1,3 @@
-MD5 (dialog-1.0-20060221.tgz) = acfd843163394e8bb17c841fdbe9c4a4
-SHA256 (dialog-1.0-20060221.tgz) = 3eea497cf4547446402980a18ae5303c9d8163bf06e9d7bf095b441bd9db88aa
-SIZE (dialog-1.0-20060221.tgz) = 337415
+MD5 (dialog-1.1-20070325.tgz) = 885a94081bb2630de82d787d0e0a1c4d
+SHA256 (dialog-1.1-20070325.tgz) = 4800009df51a46d15d8d63ee1c7fc9d28d903a82f7ae3cff707336daeef5ebe1
+SIZE (dialog-1.1-20070325.tgz) = 364516
diff --git a/devel/cdialog/files/patch-makefile.in b/devel/cdialog/files/patch-makefile.in
index 55ca1d960649..5b348d032718 100644
--- a/devel/cdialog/files/patch-makefile.in
+++ b/devel/cdialog/files/patch-makefile.in
@@ -1,37 +1,43 @@
---- makefile.in.orig	Wed Jan 18 20:42:18 2006
-+++ makefile.in	Fri May 19 13:08:20 2006
-@@ -135,14 +135,14 @@
- 	$(RM) samples/install/makefile
+--- makefile.in.orig	Sun Mar 25 22:23:30 2007
++++ makefile.in	Sun Apr  8 18:46:09 2007
+@@ -153,7 +153,7 @@
+ 	@echo "made $@"
  
- install :: $(PROG) $(bindir)
--	$(INSTALL_PROGRAM) $(PROG) $(bindir)
-+	$(INSTALL_PROGRAM) $(PROG) $(bindir)/c${PROG}
+ install-strip :: $(PROG) $(BINDIR)
+-	$(INSTALL_PROGRAM) -s $(PROG) $(BINDIR)
++	$(INSTALL_PROGRAM) -s $(PROG) $(BINDIR)/c${PROG}
  
- install-strip :: $(PROG) $(bindir)
--	$(INSTALL_PROGRAM) -s $(PROG) $(bindir)
-+	$(INSTALL_PROGRAM) -s $(PROG) $(bindir)/c${PROG}
+ uninstall :: uninstall-bin uninstall-man
+ 	@echo "made $@"
+@@ -168,7 +168,7 @@
+ 	$(RM) $(BINDIR)/$(PACKAGE)$x
  
- install-strip \
- install :: $(MAN1DIR)
--	$(INSTALL_DATA) $(srcdir)/dialog.1 $(MAN1DIR)
-+	$(INSTALL_DATA) $(srcdir)/dialog.1 $(MAN1DIR)/cdialog.1
+ install-man :: $(MAN1DIR)
+-	$(INSTALL_DATA) $(srcdir)/dialog.1 $(MAN1DIR)/$(PACKAGE).1
++	$(INSTALL_DATA) $(srcdir)/dialog.1 $(MAN1DIR)/c$(PACKAGE).1
  
- uninstall ::
- 	$(RM) $(bindir)/$(PROG)
-@@ -151,14 +151,14 @@
+ uninstall-man ::
+ 	$(RM) $(MAN1DIR)/$(PACKAGE).1
+@@ -176,11 +176,11 @@
  # most users do not want/need the library, so the install rules are distinct.
- install-lib :: $(LIB_DIRS) headers.sed
- 	@ echo "** installing library in $(libdir)"
--	$(LIBTOOL_INSTALL) $(INSTALL_DATA) $(LIB) $(libdir)
-+	$(LIBTOOL_INSTALL) $(INSTALL_DATA) $(LIB) $(libdir)/@LIB_PREFIX@cdialog$a
- 	@ echo "** installing headers in $(includedir)"
- 	@ $(SHELL) $(srcdir)/headers.sh $(INSTALL_DATA) $(includedir) $(srcdir) dialog.h
- 	@ $(SHELL) $(srcdir)/headers.sh $(INSTALL_DATA) $(includedir) $(srcdir) dlg_colors.h
- 	@ $(SHELL) $(srcdir)/headers.sh $(INSTALL_DATA) $(includedir) $(srcdir) dlg_keys.h
- 	@ $(SHELL) $(srcdir)/headers.sh $(INSTALL_DATA) $(includedir) .         dlg_config.h
- 	@ echo "** installing manpage"
--	$(INSTALL_DATA) $(srcdir)/dialog.3 $(MAN3DIR)
-+	$(INSTALL_DATA) $(srcdir)/dialog.3 $(MAN3DIR)/cdialog.3
+ install-lib :: $(BINDIR) dialog-config
+ 	@ echo "** installing config script in $(BINDIR)"
+-	@ $(INSTALL_SCRIPT) dialog-config $(BINDIR)
++	@ $(INSTALL_SCRIPT) dialog-config $(BINDIR)/cdialog-config
  
- uninstall-lib :: $(LIB_DIRS)
- 	- $(LIBTOOL_UNINSTALL) $(RM) $(libdir)/$(LIB)
+ install-lib :: $(LIB_DIRS) $(LIB) headers.sed
+ 	@ echo "** installing library in $(LIBDIR)"
+-	@ $(LIBTOOL_INSTALL) $(INSTALL_DATA) $(LIB) $(LIBDIR)
++	@ $(LIBTOOL_INSTALL) $(INSTALL_DATA) $(LIB) $(LIBDIR)/@LIB_PREFIX@cdialog$a
+ 	@ echo "** installing headers in $(INCLUDEDIR)"
+ 	@ $(SHELL) $(srcdir)/headers.sh $(INSTALL_DATA) $(INCLUDEDIR) $(srcdir) dialog.h
+ 	@ $(SHELL) $(srcdir)/headers.sh $(INSTALL_DATA) $(INCLUDEDIR) $(srcdir) dlg_colors.h
+@@ -198,7 +198,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 26d4367d8193..38c26403949f 100644
--- a/devel/cdialog/pkg-plist
+++ b/devel/cdialog/pkg-plist
@@ -1,4 +1,5 @@
 bin/cdialog
+bin/cdialog-config
 include/cdialog/dialog.h
 include/cdialog/dlg_colors.h
 include/cdialog/dlg_config.h
@@ -45,7 +46,11 @@ lib/libcdialog.a
 %%EXAMPLESDIR%%/copifuncs/ifpatch
 %%EXAMPLESDIR%%/copismall
 %%EXAMPLESDIR%%/debian.rc
+%%EXAMPLESDIR%%/dselect
 %%EXAMPLESDIR%%/dialog.py
+%%EXAMPLESDIR%%/editbox
+%%EXAMPLESDIR%%/editbox-utf8
+%%EXAMPLESDIR%%/editbox2
 %%EXAMPLESDIR%%/form1
 %%EXAMPLESDIR%%/form1-both
 %%EXAMPLESDIR%%/form1-extra
@@ -111,6 +116,9 @@ lib/libcdialog.a
 %%EXAMPLESDIR%%/menubox7
 %%EXAMPLESDIR%%/menubox8
 %%EXAMPLESDIR%%/menubox9
+%%EXAMPLESDIR%%/mixedform
+%%EXAMPLESDIR%%/mixedform2
+%%EXAMPLESDIR%%/mixedgauge
 %%EXAMPLESDIR%%/msgbox
 %%EXAMPLESDIR%%/msgbox-help
 %%EXAMPLESDIR%%/msgbox1
@@ -137,6 +145,7 @@ lib/libcdialog.a
 %%EXAMPLESDIR%%/radiolist4
 %%EXAMPLESDIR%%/rotated-data
 %%EXAMPLESDIR%%/slackware.rc
+%%EXAMPLESDIR%%/suse.rc
 %%EXAMPLESDIR%%/sourcemage.rc
 %%EXAMPLESDIR%%/tailbox
 %%EXAMPLESDIR%%/tailboxbg