diff --git a/graphics/xtexcad/Makefile b/graphics/xtexcad/Makefile
index 8e077f6ba5da..5abd87b9d084 100644
--- a/graphics/xtexcad/Makefile
+++ b/graphics/xtexcad/Makefile
@@ -1,24 +1,19 @@
-# ex:ts=8
-# Ports collection makefile for:	xtexcad
-# Date created:			May 20, 2003
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	xtexcad
 PORTVERSION=	2.4.1
 PORTREVISION=	2
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	graphics/xtexcad
+MASTER_SITES=	TEX_CTAN/graphics/xtexcad
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple drawing program enforcing limited slopes and diameters
 
-USE_IMAKE=	yes
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
+USE_IMAKE=	yes
 
-MAN1=	xtexcad.1
+MAN1=		xtexcad.1
+PLIST_FILES=	bin/xtexcad lib/X11/app-defaults/XTeXcad
 
 .include <bsd.port.mk>
diff --git a/graphics/xtexcad/files/patch-FileNom.c b/graphics/xtexcad/files/patch-FileNom.c
new file mode 100644
index 000000000000..e797ce821bbf
--- /dev/null
+++ b/graphics/xtexcad/files/patch-FileNom.c
@@ -0,0 +1,30 @@
+--- FileNom.c.orig
++++ FileNom.c
+@@ -377,6 +377,13 @@ ClassInitialize()
+     CLASS(selectTranslations) = XtParseTranslationTable(selectTranslations);
+ }
+ 
++#if defined(SYSV) || defined(__linux__) || defined(__FreeBSD__)
++    extern char *getcwd();
++#define getwd(buf) getcwd(buf,MAXPATHLEN)
++#else
++    extern char *getwd();
++#endif
++
+ /* ARGSUSED */
+ static void
+ Initialize(req, new, args, num_args)
+@@ -391,13 +398,6 @@ Initialize(req, new, args, num_args)
+     String dir, menuList, p, q;
+     Dimension width, height;
+ 
+-#ifdef SYSV
+-    extern char *getcwd();
+-#define getwd(buf) getcwd(buf,MAXPATHLEN)
+-#else
+-    extern char *getwd();
+-#endif
+-
+     List(new) = NULL;
+     Nomination(new).directoryPart = NULL;
+     Nomination(new).filenamePart = NULL;
diff --git a/graphics/xtexcad/files/patch-match.c b/graphics/xtexcad/files/patch-match.c
new file mode 100644
index 000000000000..754f3c249bca
--- /dev/null
+++ b/graphics/xtexcad/files/patch-match.c
@@ -0,0 +1,11 @@
+--- match.c.orig
++++ match.c
+@@ -34,6 +34,8 @@
+  *    "awf" copyright notice.]
+  */
+ 
++#include <string.h>
++
+ /* match.c: pattern matching routines */
+ 
+ 
diff --git a/graphics/xtexcad/files/patch-oberfl.c b/graphics/xtexcad/files/patch-oberfl.c
new file mode 100644
index 000000000000..9ba9a95f922e
--- /dev/null
+++ b/graphics/xtexcad/files/patch-oberfl.c
@@ -0,0 +1,11 @@
+--- oberfl.c.orig
++++ oberfl.c
+@@ -161,7 +161,7 @@
+ static void SetTitle(void);
+ static void SetNewZoom(void);
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+ 	Widget topForm;
+ 	Pixel background;
diff --git a/graphics/xtexcad/files/patch-yyscan.l b/graphics/xtexcad/files/patch-yyscan.l
new file mode 100644
index 000000000000..d35e9993d60d
--- /dev/null
+++ b/graphics/xtexcad/files/patch-yyscan.l
@@ -0,0 +1,21 @@
+--- yyscan.l.orig
++++ yyscan.l
+@@ -35,8 +35,6 @@
+ #include "objects.h"
+ #include "yyscan.h"
+ 
+-#define yywrap() 1
+-
+ float yyfloatval;		/* value of a TOK_FLOAT */
+ char yystrval[MAX_TEXT_LEN+1];	/* text of a text argument or align argument */
+ Unit yyunit;			/* value of a TOK_UNIT */
+@@ -66,6 +64,9 @@
+ 
+ %}
+ 
++%option nounput
++%option noyywrap
++%option noyymore
+ 
+ %s  inPictEnv  inPut  lookOut
+ 
diff --git a/graphics/xtexcad/pkg-plist b/graphics/xtexcad/pkg-plist
deleted file mode 100644
index 34e47a519561..000000000000
--- a/graphics/xtexcad/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/xtexcad
-lib/X11/app-defaults/XTeXcad