From 617281488c9e1ce691aad25cb9f9ce07eeb356f0 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Mon, 17 Jun 2013 14:58:48 +0000
Subject: - Fix build on -current - Add MAKE_JOBS_UNSAFE - Trim header
PR: 179578
Submitted by: ports fury
---
x11/xdtm/Makefile | 32 +++++++++++++++-----------------
x11/xdtm/files/patch-lexical.l | 21 +++++++++++++++++++++
x11/xdtm/pkg-descr | 8 ++++----
3 files changed, 40 insertions(+), 21 deletions(-)
create mode 100644 x11/xdtm/files/patch-lexical.l
(limited to 'x11')
diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile
index c6b3dd5f37b9..a1f154219d41 100644
--- a/x11/xdtm/Makefile
+++ b/x11/xdtm/Makefile
@@ -1,23 +1,21 @@
-# New ports collection makefile for: xdtm
-# Date created: 26th April 1995
-# Whom: gpalmer
-#
+# Created by: gpalmer
# $FreeBSD$
-#
-PORTNAME= xdtm
-PORTVERSION= 2.5.8
-PORTREVISION= 2
-CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+PORTNAME= xdtm
+PORTVERSION= 2.5.8
+PORTREVISION= 2
+CATEGORIES= x11
+MASTER_SITES= XCONTRIB/applications
-MAINTAINER= ports@FreeBSD.org
-COMMENT= A graphical shell for the X Window System
+MAINTAINER= ports@FreeBSD.org
+COMMENT= Graphical shell for the X Window System
-USE_IMAKE= yes
-USE_XORG= xaw
-WRKSRC= ${WRKDIR}/xdtm
-MAN1= xdtm.1
+WRKSRC= ${WRKDIR}/${PORTNAME}
+
+USE_XORG= xaw
+USE_IMAKE= yes
+MAKE_JOBS_UNSAFE= yes
+
+MAN1= xdtm.1
.include <bsd.port.mk>
diff --git a/x11/xdtm/files/patch-lexical.l b/x11/xdtm/files/patch-lexical.l
new file mode 100644
index 000000000000..53bb2d3be358
--- /dev/null
+++ b/x11/xdtm/files/patch-lexical.l
@@ -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 --git a/x11/xdtm/pkg-descr b/x11/xdtm/pkg-descr
index 7640c713b586..d1c29641ced2 100644
--- a/x11/xdtm/pkg-descr
+++ b/x11/xdtm/pkg-descr
@@ -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.
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0