Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Jun 2013 02:56:39 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/179578: x11/xdtm: Fix build on -current
Message-ID:  <20130616025639.050c8f45e1d2d745433981b1@yahoo.com>
Resent-Message-ID: <201306151810.r5FIA0Io033740@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         179578
>Category:       ports
>Synopsis:       x11/xdtm: 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:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build on -current
- Add MAKE_JOBS_UNSAFE

New file:
files/patch-lexical.l

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11/xdtm/Makefile x11/xdtm/Makefile
--- /usr/ports/x11/xdtm/Makefile	2012-11-08 10:08:59.000000000 +0900
+++ x11/xdtm/Makefile	2013-06-16 00:00:00.000000000 +0900
@@ -1,23 +1,21 @@
-# New ports collection makefile for:    xdtm
-# Date created:         		26th April 1995
-# Whom:                 		gpalmer
-#
+# Created by: gpalmer
 # $FreeBSD: head/x11/xdtm/Makefile 300897 2012-07-14 14:29:18Z beat $
-#
 
-PORTNAME=		xdtm
-PORTVERSION=		2.5.8
-PORTREVISION=		2
-CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	applications
-
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=	A graphical shell for the X Window System
-
-USE_IMAKE=		yes
-USE_XORG=		xaw
-WRKSRC=			${WRKDIR}/xdtm
-MAN1=			xdtm.1
+PORTNAME=	xdtm
+PORTVERSION=	2.5.8
+PORTREVISION=	2
+CATEGORIES=	x11
+MASTER_SITES=	XCONTRIB/applications
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Graphical shell for the X Window System
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+USE_XORG=	xaw
+USE_IMAKE=	yes
+MAKE_JOBS_UNSAFE=	yes
+
+MAN1=		xdtm.1
 
 .include <bsd.port.mk>
diff -urN /usr/ports/x11/xdtm/files/patch-lexical.l x11/xdtm/files/patch-lexical.l
--- /usr/ports/x11/xdtm/files/patch-lexical.l	1970-01-01 09:00:00.000000000 +0900
+++ x11/xdtm/files/patch-lexical.l	2013-06-16 00:00:00.000000000 +0900
@@ -0,0 +1,21 @@
+--- lexical.l.orig
++++ lexical.l
+@@ -1,3 +1,4 @@
++%option yylineno
+ %{ /*-*- Mode: C -*-*/
+ /**************************************************************************
+  ** File     :       lexical.l                                           **
+@@ -171,13 +172,6 @@ static int numkeywords = (sizeof(keywordtable)/sizeof(
+ 
+ int parseerror=0;                   /* Number of parse errors */
+ char errormessage[255];             /* used for error messsages */
+-
+-/*
+- * ``yylineno'' not POSIX standard, so have to simulate it when using flex.
+- */
+-#ifdef FLEX_SCANNER
+-int yylineno=0;
+-#endif
+ 
+ %}
+ %%
diff -urN /usr/ports/x11/xdtm/pkg-descr x11/xdtm/pkg-descr
--- /usr/ports/x11/xdtm/pkg-descr	2012-11-08 10:08:59.000000000 +0900
+++ x11/xdtm/pkg-descr	2013-06-16 00:00:00.000000000 +0900
@@ -1,4 +1,4 @@
-     The X Desktop Manager is a graphical shell for the X Window System,
-     it provides mechanisms for all the usual shell activities and is
-     intended to reduce the training necessary for UNIX novice to become
-     productive on your system.
+The X Desktop Manager is a graphical shell for the X Window System, it
+provides mechanisms for all the usual shell activities and is intended
+to reduce the training necessary for UNIX novice to become productive
+on your system.
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130616025639.050c8f45e1d2d745433981b1>