Date: Sun, 16 Jun 2013 02:56:09 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/179584: graphics/xtexcad: Fix build on -current Message-ID: <20130616025609.50cceeb71c8fc64f67a407d0@yahoo.com> Resent-Message-ID: <201306151810.r5FIA2gK033862@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179584
>Category: ports
>Synopsis: graphics/xtexcad: Fix build on -current
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 15 18:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build on -current
- Support PLIST_FILES
New file:
files/patch-FileNom.c
files/patch-match.c
files/patch-oberfl.c
files/patch-yyscan.l
Remove file:
pkg-plist
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/xtexcad/Makefile graphics/xtexcad/Makefile
--- /usr/ports/graphics/xtexcad/Makefile 2012-11-08 09:29:35.000000000 +0900
+++ graphics/xtexcad/Makefile 2013-06-16 00:00:00.000000000 +0900
@@ -1,24 +1,19 @@
-# ex:ts=8
-# Ports collection makefile for: xtexcad
-# Date created: May 20, 2003
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD: head/graphics/xtexcad/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
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 -urN /usr/ports/graphics/xtexcad/files/patch-FileNom.c graphics/xtexcad/files/patch-FileNom.c
--- /usr/ports/graphics/xtexcad/files/patch-FileNom.c 1970-01-01 09:00:00.000000000 +0900
+++ graphics/xtexcad/files/patch-FileNom.c 2013-06-16 00:00:00.000000000 +0900
@@ -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 -urN /usr/ports/graphics/xtexcad/files/patch-match.c graphics/xtexcad/files/patch-match.c
--- /usr/ports/graphics/xtexcad/files/patch-match.c 1970-01-01 09:00:00.000000000 +0900
+++ graphics/xtexcad/files/patch-match.c 2013-06-16 00:00:00.000000000 +0900
@@ -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 -urN /usr/ports/graphics/xtexcad/files/patch-oberfl.c graphics/xtexcad/files/patch-oberfl.c
--- /usr/ports/graphics/xtexcad/files/patch-oberfl.c 1970-01-01 09:00:00.000000000 +0900
+++ graphics/xtexcad/files/patch-oberfl.c 2013-06-16 00:00:00.000000000 +0900
@@ -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 -urN /usr/ports/graphics/xtexcad/files/patch-yyscan.l graphics/xtexcad/files/patch-yyscan.l
--- /usr/ports/graphics/xtexcad/files/patch-yyscan.l 1970-01-01 09:00:00.000000000 +0900
+++ graphics/xtexcad/files/patch-yyscan.l 2013-06-16 00:00:00.000000000 +0900
@@ -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 -urN /usr/ports/graphics/xtexcad/pkg-plist graphics/xtexcad/pkg-plist
--- /usr/ports/graphics/xtexcad/pkg-plist 2012-11-08 09:29:35.000000000 +0900
+++ graphics/xtexcad/pkg-plist 1970-01-01 09:00:00.000000000 +0900
@@ -1,2 +0,0 @@
-bin/xtexcad
-lib/X11/app-defaults/XTeXcad
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130616025609.50cceeb71c8fc64f67a407d0>