4 files changed, 148 insertions, 20 deletions

diff --git a/devel/cdialog/Makefile b/devel/cdialog/Makefile
index 0a8087329d7f..65a792b56948 100644
--- a/devel/cdialog/Makefile
+++ b/devel/cdialog/Makefile
@@ -9,12 +9,11 @@
 #
 
 PORTNAME=	cdialog
-PORTVERSION=	0.9b.20030308
-PORTREVISION=	2
+PORTVERSION=	0.9b.20040316
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://invisible-island.net/dialog/
-DISTNAME=	${PORTNAME:S|^c||}-${PORTVERSION:S|.200|-200|}
+DISTNAME=	${PORTNAME:S|^c||}-${PORTVERSION:R}-${PORTVERSION:E}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -22,21 +21,25 @@ COMMENT=	An enhanced version of 'dialog' to work with ncurses
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAKEFILE=	makefile
 
-BINDIR?=	${PREFIX}/bin
-INCLUDEDIR?=	${PREFIX}/include/cdialog
-LIBDIR?=	${PREFIX}/lib
-MAN1DIR?=	${MANPREFIX}/man/man1
+MAN1=		cdialog.1
+MAN3=		cdialog.3
 
 do-install:
-	cd ${WRKSRC};\
-	${MKDIR} ${BINDIR} ${INCLUDEDIR} ${LIBDIR}; \
-	${INSTALL_PROGRAM} dialog ${BINDIR}/cdialog;\
-	${INSTALL_DATA} dialog.h colors.h ${INCLUDEDIR}; \
-	$(INSTALL_DATA) libdialog.a $(LIBDIR)/libcdialog.a;\
-	${INSTALL_DATA} dialog.1 ${MAN1DIR}/cdialog.1
+	${INSTALL_PROGRAM} ${WRKSRC}/dialog ${PREFIX}/bin/cdialog
+	@${MKDIR} ${PREFIX}/include/cdialog
+	${INSTALL_DATA} ${WRKSRC}/dialog.h ${PREFIX}/include/cdialog/dialog.h
+	${INSTALL_DATA} ${WRKSRC}/dlg_colors.h ${PREFIX}/include/cdialog/dlg_colors.h
+	${INSTALL_DATA} ${WRKSRC}/dlg_config.h ${PREFIX}/include/cdialog/dlg_config.h
+	${INSTALL_DATA} ${WRKSRC}/libdialog.a ${PREFIX}/lib/libcdialog.a
+	${INSTALL_MAN} ${WRKSRC}/dialog.1 ${MAN1PREFIX}/man/man1/cdialog.1
+	${INSTALL_MAN} ${WRKSRC}/dialog.3 ${MAN3PREFIX}/man/man3/cdialog.3
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}/samples && ${FIND} . | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+.endif
 
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/cdialog/distinfo b/devel/cdialog/distinfo
index 8930f559ef8d..392114ce3631 100644
--- a/devel/cdialog/distinfo
+++ b/devel/cdialog/distinfo
@@ -1,2 +1,2 @@
-MD5 (dialog-0.9b-20030308.tgz) = de491252e0329e67aed27d1d01eed120
-SIZE (dialog-0.9b-20030308.tgz) = 215806
+MD5 (dialog-0.9b-20040316.tgz) = a03b7c0fb716b9f1d8acd21088db4dbf
+SIZE (dialog-0.9b-20040316.tgz) = 273719
diff --git a/devel/cdialog/files/manpages.mk b/devel/cdialog/files/manpages.mk
deleted file mode 100644
index e5330b58d693..000000000000
--- a/devel/cdialog/files/manpages.mk
+++ /dev/null
@@ -1 +0,0 @@
-MAN1+=		cdialog.1
diff --git a/devel/cdialog/pkg-plist b/devel/cdialog/pkg-plist
index 93600467ab0c..ad6ee16f3cb8 100644
--- a/devel/cdialog/pkg-plist
+++ b/devel/cdialog/pkg-plist
@@ -1,5 +1,131 @@
 bin/cdialog
-include/cdialog/colors.h
 include/cdialog/dialog.h
+include/cdialog/dlg_colors.h
+include/cdialog/dlg_config.h
 lib/libcdialog.a
+%%PORTDOCS%%%%EXAMPLESDIR%%/listing
+%%PORTDOCS%%%%EXAMPLESDIR%%/install/FDISK.TEST
+%%PORTDOCS%%%%EXAMPLESDIR%%/install/setup.help
+%%PORTDOCS%%%%EXAMPLESDIR%%/install/makefile.in
+%%PORTDOCS%%%%EXAMPLESDIR%%/install/setup.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/install/makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/common.funcs
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/copi.ifman1
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/copi.ifman2
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/copi.ifmcfg2
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/copi.ifmcfg4
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/copi.ifmcfg5
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/copi.ifpoll1
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/copi.ifpoll2
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/copi.ifreq1
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/copi.ifreq2
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/copi.rcnews
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/copi.sendifm1
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/copi.sendifm2
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/copi.trnrc
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/ifpatch
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/admin.funcs
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/copi.wheel
+%%PORTDOCS%%%%EXAMPLESDIR%%/copifuncs/copi.funcs
+%%PORTDOCS%%%%EXAMPLESDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/yesno
+%%PORTDOCS%%%%EXAMPLESDIR%%/textbox
+%%PORTDOCS%%%%EXAMPLESDIR%%/radiolist
+%%PORTDOCS%%%%EXAMPLESDIR%%/msgbox
+%%PORTDOCS%%%%EXAMPLESDIR%%/inputbox2
+%%PORTDOCS%%%%EXAMPLESDIR%%/inputbox3
+%%PORTDOCS%%%%EXAMPLESDIR%%/inputbox
+%%PORTDOCS%%%%EXAMPLESDIR%%/menubox2
+%%PORTDOCS%%%%EXAMPLESDIR%%/killall
+%%PORTDOCS%%%%EXAMPLESDIR%%/menubox1
+%%PORTDOCS%%%%EXAMPLESDIR%%/infobox
+%%PORTDOCS%%%%EXAMPLESDIR%%/inputbox7
+%%PORTDOCS%%%%EXAMPLESDIR%%/yesno2
+%%PORTDOCS%%%%EXAMPLESDIR%%/textbox2
+%%PORTDOCS%%%%EXAMPLESDIR%%/gauge
+%%PORTDOCS%%%%EXAMPLESDIR%%/menubox3
+%%PORTDOCS%%%%EXAMPLESDIR%%/infobox2
+%%PORTDOCS%%%%EXAMPLESDIR%%/wheel
+%%PORTDOCS%%%%EXAMPLESDIR%%/infobox3
+%%PORTDOCS%%%%EXAMPLESDIR%%/infobox4
+%%PORTDOCS%%%%EXAMPLESDIR%%/timebox2
+%%PORTDOCS%%%%EXAMPLESDIR%%/fselect2
+%%PORTDOCS%%%%EXAMPLESDIR%%/msgbox1
+%%PORTDOCS%%%%EXAMPLESDIR%%/inputbox1
+%%PORTDOCS%%%%EXAMPLESDIR%%/tailboxbg
+%%PORTDOCS%%%%EXAMPLESDIR%%/tailboxbg2
+%%PORTDOCS%%%%EXAMPLESDIR%%/tailboxbg1
+%%PORTDOCS%%%%EXAMPLESDIR%%/tailbox
+%%PORTDOCS%%%%EXAMPLESDIR%%/checklist2
+%%PORTDOCS%%%%EXAMPLESDIR%%/msgbox2
+%%PORTDOCS%%%%EXAMPLESDIR%%/password
+%%PORTDOCS%%%%EXAMPLESDIR%%/radiolist2
+%%PORTDOCS%%%%EXAMPLESDIR%%/menubox4
+%%PORTDOCS%%%%EXAMPLESDIR%%/menubox
+%%PORTDOCS%%%%EXAMPLESDIR%%/yesno3
+%%PORTDOCS%%%%EXAMPLESDIR%%/checklist4
+%%PORTDOCS%%%%EXAMPLESDIR%%/radiolist3
+%%PORTDOCS%%%%EXAMPLESDIR%%/radiolist4
+%%PORTDOCS%%%%EXAMPLESDIR%%/checklist1
+%%PORTDOCS%%%%EXAMPLESDIR%%/checklist5
+%%PORTDOCS%%%%EXAMPLESDIR%%/checklist
+%%PORTDOCS%%%%EXAMPLESDIR%%/fselect1
+%%PORTDOCS%%%%EXAMPLESDIR%%/msgbox3
+%%PORTDOCS%%%%EXAMPLESDIR%%/timebox
+%%PORTDOCS%%%%EXAMPLESDIR%%/menubox6
+%%PORTDOCS%%%%EXAMPLESDIR%%/inputbox4
+%%PORTDOCS%%%%EXAMPLESDIR%%/inputbox5
+%%PORTDOCS%%%%EXAMPLESDIR%%/menubox7
+%%PORTDOCS%%%%EXAMPLESDIR%%/checklist6
+%%PORTDOCS%%%%EXAMPLESDIR%%/inputmenu1
+%%PORTDOCS%%%%EXAMPLESDIR%%/inputmenu
+%%PORTDOCS%%%%EXAMPLESDIR%%/infobox5
+%%PORTDOCS%%%%EXAMPLESDIR%%/infobox6
+%%PORTDOCS%%%%EXAMPLESDIR%%/inputmenu2
+%%PORTDOCS%%%%EXAMPLESDIR%%/inputmenu3
+%%PORTDOCS%%%%EXAMPLESDIR%%/inputmenu4
+%%PORTDOCS%%%%EXAMPLESDIR%%/checklist7
+%%PORTDOCS%%%%EXAMPLESDIR%%/menubox8
+%%PORTDOCS%%%%EXAMPLESDIR%%/gauge3
+%%PORTDOCS%%%%EXAMPLESDIR%%/menubox5
+%%PORTDOCS%%%%EXAMPLESDIR%%/msgbox4-utf8
+%%PORTDOCS%%%%EXAMPLESDIR%%/msgbox4-eucjp
+%%PORTDOCS%%%%EXAMPLESDIR%%/fselect
+%%PORTDOCS%%%%EXAMPLESDIR%%/copismall
+%%PORTDOCS%%%%EXAMPLESDIR%%/gauge0
+%%PORTDOCS%%%%EXAMPLESDIR%%/calendar
+%%PORTDOCS%%%%EXAMPLESDIR%%/calendar2
+%%PORTDOCS%%%%EXAMPLESDIR%%/checklist3
+%%PORTDOCS%%%%EXAMPLESDIR%%/inputbox6-utf8
+%%PORTDOCS%%%%EXAMPLESDIR%%/menubox-utf8
+%%PORTDOCS%%%%EXAMPLESDIR%%/checklist-utf8
+%%PORTDOCS%%%%EXAMPLESDIR%%/slackware.rc
+%%PORTDOCS%%%%EXAMPLESDIR%%/form3
+%%PORTDOCS%%%%EXAMPLESDIR%%/debian.rc
+%%PORTDOCS%%%%EXAMPLESDIR%%/menubox9
+%%PORTDOCS%%%%EXAMPLESDIR%%/calendar-stdout
+%%PORTDOCS%%%%EXAMPLESDIR%%/gauge0-input-fd
+%%PORTDOCS%%%%EXAMPLESDIR%%/gauge2
+%%PORTDOCS%%%%EXAMPLESDIR%%/calendar2-stdout
+%%PORTDOCS%%%%EXAMPLESDIR%%/calendar3-stdout
+%%PORTDOCS%%%%EXAMPLESDIR%%/fselect-stdout
+%%PORTDOCS%%%%EXAMPLESDIR%%/fselect1-stdout
+%%PORTDOCS%%%%EXAMPLESDIR%%/fselect2-stdout
+%%PORTDOCS%%%%EXAMPLESDIR%%/inputmenu-stdout
+%%PORTDOCS%%%%EXAMPLESDIR%%/timebox-stdout
+%%PORTDOCS%%%%EXAMPLESDIR%%/timebox2-stdout
+%%PORTDOCS%%%%EXAMPLESDIR%%/calendar3
+%%PORTDOCS%%%%EXAMPLESDIR%%/sourcemage.rc
+%%PORTDOCS%%%%EXAMPLESDIR%%/password2
+%%PORTDOCS%%%%EXAMPLESDIR%%/password1
+%%PORTDOCS%%%%EXAMPLESDIR%%/form4
+%%PORTDOCS%%%%EXAMPLESDIR%%/checklist8
+%%PORTDOCS%%%%EXAMPLESDIR%%/form5
+%%PORTDOCS%%%%EXAMPLESDIR%%/form2
+%%PORTDOCS%%%%EXAMPLESDIR%%/form1
+%%PORTDOCS%%%%EXAMPLESDIR%%/checklist9
+%%PORTDOCS%%%%EXAMPLESDIR%%/checklist9.txt
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/install
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/copifuncs
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm include/cdialog