From owner-freebsd-ports  Fri Sep  8  8:10:10 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 3810B37B443
	for <freebsd-ports@FreeBSD.org>; Fri,  8 Sep 2000 08:10:01 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id IAA90463;
	Fri, 8 Sep 2000 08:10:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5B73937B43E; Fri,  8 Sep 2000 08:04:27 -0700 (PDT)
Message-Id: <20000908150427.5B73937B43E@hub.freebsd.org>
Date: Fri,  8 Sep 2000 08:04:27 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/21120: Update port: x11-servers/x2x
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         21120
>Category:       ports
>Synopsis:       Update port: x11-servers/x2x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 08 08:10:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support CC/CFLAGS properly
- Fix CATEGORIES
- Remove DISTNAME (which is default)
- Remove USE_GMAKE

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/x11-servers/x2x/Makefile x11-servers/x2x/Makefile
--- /usr/ports/x11-servers/x2x/Makefile	Fri Sep  8 22:15:40 2000
+++ x11-servers/x2x/Makefile	Fri Sep  8 22:03:19 2000
@@ -7,15 +7,15 @@
 
 PORTNAME=	x2x
 PORTVERSION= 	1.27
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 MASTER_SITES=	http://gatekeeper.dec.com/pub/DEC/SRC/x2x/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	grog@FreeBSD.org
 
 USE_IMAKE=	yes
-USE_GMAKE=	yes
-MAKE_ENV=	MAKE=${GMAKE}
 MAN1=		x2x.1
+
+post-extract:
+	@${CP} ${WRKSRC}/x2x.1 ${WRKSRC}/x2x.man
 
 .include <bsd.port.mk>
diff -urN /usr/ports/x11-servers/x2x/patches/patch-aa x11-servers/x2x/patches/patch-aa
--- /usr/ports/x11-servers/x2x/patches/patch-aa	Sun Sep  3 17:06:08 2000
+++ x11-servers/x2x/patches/patch-aa	Thu Sep  7 22:16:06 2000
@@ -1,10 +1,10 @@
---- Imakefile~	Thu Aug 21 01:44:52 1997
-+++ Imakefile	Sun Sep  3 16:44:47 2000
-@@ -10,3 +10,7 @@
-     CDEBUGFLAGS = -O
+--- Imakefile.orig	Thu Aug 21 01:14:52 1997
++++ Imakefile	Thu Sep  7 22:15:46 2000
+@@ -6,7 +6,4 @@
+            OBJS = lawyerese.o x2x.o format.o
+   PROTO_DEFINES = 
  
+-             CC = gcc
+-    CDEBUGFLAGS = -O
+-
  ComplexProgramTarget(x2x)
-+# Added by Greg Lehey <grog@FreeBSD.org> for FreeBSD port
-+x2x.man:	x2x.1
-+	rm -f x2x.man
-+	ln x2x.1 x2x.man


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message