From owner-svn-ports-head@FreeBSD.ORG Thu Jun 27 06:57:30 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9A6099F3; Thu, 27 Jun 2013 06:57:30 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8D8641D79; Thu, 27 Jun 2013 06:57:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5R6vUhn034316; Thu, 27 Jun 2013 06:57:30 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5R6vTMv034311; Thu, 27 Jun 2013 06:57:29 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201306270657.r5R6vTMv034311@svn.freebsd.org> From: Martin Wilke Date: Thu, 27 Jun 2013 06:57:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321854 - in head/graphics/xtexcad: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jun 2013 06:57:30 -0000 Author: miwi Date: Thu Jun 27 06:57:29 2013 New Revision: 321854 URL: http://svnweb.freebsd.org/changeset/ports/321854 Log: - Unbreak build on current PR: 179584 Submitted by: Ports Fury Added: head/graphics/xtexcad/files/ head/graphics/xtexcad/files/patch-FileNom.c (contents, props changed) head/graphics/xtexcad/files/patch-match.c (contents, props changed) head/graphics/xtexcad/files/patch-oberfl.c (contents, props changed) head/graphics/xtexcad/files/patch-yyscan.l (contents, props changed) Deleted: head/graphics/xtexcad/pkg-plist Modified: head/graphics/xtexcad/Makefile (contents, props changed) Modified: head/graphics/xtexcad/Makefile ============================================================================== --- head/graphics/xtexcad/Makefile Thu Jun 27 06:48:43 2013 (r321853) +++ head/graphics/xtexcad/Makefile Thu Jun 27 06:57:29 2013 (r321854) @@ -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 Added: head/graphics/xtexcad/files/patch-FileNom.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/xtexcad/files/patch-FileNom.c Thu Jun 27 06:57:29 2013 (r321854) @@ -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; Added: head/graphics/xtexcad/files/patch-match.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/xtexcad/files/patch-match.c Thu Jun 27 06:57:29 2013 (r321854) @@ -0,0 +1,11 @@ +--- match.c.orig ++++ match.c +@@ -34,6 +34,8 @@ + * "awf" copyright notice.] + */ + ++#include ++ + /* match.c: pattern matching routines */ + + Added: head/graphics/xtexcad/files/patch-oberfl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/xtexcad/files/patch-oberfl.c Thu Jun 27 06:57:29 2013 (r321854) @@ -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; Added: head/graphics/xtexcad/files/patch-yyscan.l ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/xtexcad/files/patch-yyscan.l Thu Jun 27 06:57:29 2013 (r321854) @@ -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 +