From owner-freebsd-ports  Fri Oct 13 18:20:28 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 8FCDB37B678
	for <freebsd-ports@FreeBSD.org>; Fri, 13 Oct 2000 18:20:01 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id SAA69537;
	Fri, 13 Oct 2000 18:20:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F25EE37B66E; Fri, 13 Oct 2000 18:13:07 -0700 (PDT)
Message-Id: <20001014011307.F25EE37B66E@hub.freebsd.org>
Date: Fri, 13 Oct 2000 18:13:07 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/21976: Update port: games/xoids
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         21976
>Category:       ports
>Synopsis:       Update port: games/xoids
>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 Oct 13 18:20:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support CFLAGS properly
- Fix Imakefile breakage under XFree86 4.x

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/games/xoids/Makefile games/xoids/Makefile
--- /usr/ports/games/xoids/Makefile	Thu Aug  3 21:14:05 2000
+++ games/xoids/Makefile	Sat Oct 14 00:57:46 2000
@@ -5,25 +5,25 @@
 # $FreeBSD: ports/games/xoids/Makefile,v 1.9 2000/08/03 09:24:15 asami Exp $
 #
 
-PORTNAME=		xoids
-PORTVERSION=		1.5
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_XCONTRIB}
+PORTNAME=	xoids
+PORTVERSION=	1.5
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-USE_IMAKE=		yes
-USE_XPM=		yes
-MAN6=			xoids.6
-MANCOMPRESSED=		no
+USE_IMAKE=	yes
+USE_XPM=	yes
+MAN6=		xoids.6
 
-do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/xoids ${PREFIX}/bin
-	@ ${INSTALL_DATA} ${WRKSRC}/xoids.1x ${PREFIX}/man/man6/xoids.6
+post-extract:
+	@${CP} ${WRKSRC}/xoids.1x ${WRKSRC}/xoids.man
+
+post-install:
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/xoids
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xoids
+	@${MKDIR} ${PREFIX}/share/doc/xoids
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xoids
 .endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/games/xoids/files/patch-aa games/xoids/files/patch-aa
--- /usr/ports/games/xoids/files/patch-aa	Wed Jun 23 02:44:08 1999
+++ games/xoids/files/patch-aa	Sat Oct 14 00:59:29 2000
@@ -1,6 +1,20 @@
---- Imakefile.orig	Tue Jun 25 01:42:14 1996
-+++ Imakefile	Sun Jun 20 19:18:26 1999
-@@ -19,11 +19,13 @@
+--- Imakefile.orig	Tue Jun 25 15:42:14 1996
++++ Imakefile	Sat Oct 14 00:59:00 2000
+@@ -6,11 +6,12 @@
+ XPM_INC_FLAGS = -I/usr/local/xpm/include
+ XPM_LIB_FLAGS = -L/usr/local/xpm/lib -lXpm
+ 
++MANSUFFIX = 6
++
+ XCOMM You shouldn't have to change anything below unless you need to
+ XCOMM add a new architecture.
+ #define MyNull
+ 
+-CDEBUGFLAGS = -O
+ OS_C_FLAGS =
+ OS_LIB_FLAGS =
+ OS_DEFINES =
+@@ -19,25 +20,23 @@
  #if defined(SunArchitecture)
  #endif
  
@@ -10,8 +24,23 @@
  #endif
  
  #if defined(FreeBSDArchitecture)
-+XPM_INC_FLAGS = -I$(X11BASE)/include/X11
++XPM_INC_FLAGS = -I$(INCROOT)/X11
 +XPM_LIB_FLAGS = -lXpm
  #endif
  
  SRCS = init.c oids.c oids_x.c
+ OBJS = init.o oids.o oids_x.o
+ 
+ INCLUDES = $(XPM_INC_FLAGS)
+-CCOPTIONS = $(OS_C_FLAGS)
+ DEFINES = $(OS_DEFINES)
+ EXTRA_LIBRARIES  = $(XPM_LIB_FLAGS) -lX11 -lm $(OS_LIB_FLAGS)
+ 
+-AllTarget(xoids)
+-NormalProgramTarget(xoids, $(OBJS), MyNull, MyNull, MyNull)
+-InstallProgram(xoids,$(BINDIR))
+-DependTarget()
++ComplexProgramTarget(xoids)
+ 
+ XCOMM End of Imakefile
+ 


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


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