5 files changed, 13 insertions, 100 deletions

diff --git a/converters/vda2fbd/Makefile b/converters/vda2fbd/Makefile
index a347b9640588..28a4704b9030 100644
--- a/converters/vda2fbd/Makefile
+++ b/converters/vda2fbd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vda2fbd
-PORTVERSION=	0.9
+PORTVERSION=	1.0
 CATEGORIES=	converters cad
 MASTER_SITES=	http://www.dhondt.de/
 
@@ -15,12 +15,19 @@ COMMENT=	An add-on converter for CalculiX
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" YACC="${YACC}"
+
+PORTDOCS=	model.ps.gz
+PLIST_FILES=	bin/vda2fbd
+
+post-build:
+	cd ${WRKSRC}/../doc && ${GZIP_CMD} -c model.ps > model.ps.gz
+
 post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/vda2fbd ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/*.ps \
-	  ${DOCSDIR}
-	${GZIP_CMD} ${DOCSDIR}/*.ps
+	${INSTALL_DATA} ${WRKSRC}/../doc/model.ps.gz ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/converters/vda2fbd/distinfo b/converters/vda2fbd/distinfo
index 741d898cc702..d0dd6056ec5a 100644
--- a/converters/vda2fbd/distinfo
+++ b/converters/vda2fbd/distinfo
@@ -1,2 +1,2 @@
-MD5 (vda2fbd-0.9.tar.gz) = 617d026c00b251a9c5576ccf79f2c798
-SIZE (vda2fbd-0.9.tar.gz) = 62545
+MD5 (vda2fbd-1.0.tar.gz) = 111eba2c3b950a8907438d3058659726
+SIZE (vda2fbd-1.0.tar.gz) = 40433
diff --git a/converters/vda2fbd/files/patch-Makefile b/converters/vda2fbd/files/patch-Makefile
deleted file mode 100644
index 73c0ac405bc0..000000000000
--- a/converters/vda2fbd/files/patch-Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.orig	Thu Sep  5 09:14:22 2002
-+++ Makefile	Thu May 15 16:38:06 2003
-@@ -1,15 +1,15 @@
--INST=/usr/local
-+INST=$(PREFIX)
- 
- TARGET=vda2fbd
- 
--CC    = gcc
--YACC  = bison -b y
--#YACC  = yacc
-+CC    ?= gcc
-+#YACC  = bison -b y
-+YACC  = yacc
- 
- LEX   = flex
- 
- YFLAGS = -d
--CFLAGS = -g -O2 # -ansi -Wall
-+CFLAGS += -g -O2 # -ansi -Wall
- LDFLAGS = -lm
- 
- LEX_OBJS = y.tab.o lex.yy.o
diff --git a/converters/vda2fbd/files/patch-vda2fbd-0.9 b/converters/vda2fbd/files/patch-vda2fbd-0.9
deleted file mode 100644
index 3546174604ce..000000000000
--- a/converters/vda2fbd/files/patch-vda2fbd-0.9
+++ /dev/null
@@ -1,68 +0,0 @@
-This patch was submitted to the CalculiX mailing list so hopefully we will 
-not have to include it in future versions of the software. -- pfg 2003
---- enqu_fbd.c.orig	Mon May  5 20:21:49 2003
-+++ enqu_fbd.c	Mon May  5 20:22:08 2003
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-  */
- 
--#include	<malloc.h>
-+#include	<stdlib.h>
- #include	<stdio.h>
- #include	"fbd.h"
- 
---- enqu_vda.c.orig	Mon May  5 20:18:15 2003
-+++ enqu_vda.c	Mon May  5 20:19:05 2003
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-  */
- 
--#include	<malloc.h>
-+#include	<stdlib.h>
- #include	<stdio.h>
- #include	"vda.h"
- 
---- fbd_main.c.orig	Mon May  5 20:19:35 2003
-+++ fbd_main.c	Mon May  5 20:20:00 2003
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-  */
- 
--#include	<malloc.h>
-+#include	<stdlib.h>
- #include	<stdio.h>
- #include	<string.h>
- #include	"vda.h"
---- init_vda.c.orig	Mon May  5 20:17:32 2003
-+++ init_vda.c	Mon May  5 20:17:50 2003
-@@ -19,7 +19,7 @@
- 
- #include	<stdio.h>
- #include	<string.h>
--#include	<malloc.h>
-+#include	<stdlib.h>
- #include	"vda.h"
- 
- extern	int   max_u_order, max_v_order;
---- vda.y.orig	Mon May  5 20:13:57 2003
-+++ vda.y	Mon May  5 20:14:20 2003
-@@ -20,7 +20,7 @@
- %{
- #include	<stdio.h>
- #include	<string.h>
--#include	<malloc.h>
-+#include	<stdlib.h>
- #include	"vda.h"
- #include	"vda_util.h"
- 
---- vda2fbd.c.orig	Mon May  5 20:20:34 2003
-+++ vda2fbd.c	Mon May  5 20:20:57 2003
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-  */
- 
--#include	<malloc.h>
-+#include	<stdlib.h>
- #include	<stdio.h>
- #include	<string.h>
- #include	<math.h>
diff --git a/converters/vda2fbd/pkg-plist b/converters/vda2fbd/pkg-plist
deleted file mode 100644
index 302e921d8ca1..000000000000
--- a/converters/vda2fbd/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/vda2fbd
-%%PORTDOCS%%%%DOCSDIR%%/model.ps.gz
-%%PORTDOCS%%@dirrm %%DOCSDIR%%