Date: Fri, 27 Oct 2000 15:48:41 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/22365: Update port: games/xoj Message-ID: <20001027224841.0F95737B479@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 22365
>Category: ports
>Synopsis: Update port: games/xoj
>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 27 15:50:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.1.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix Imakefile breakage under XFree86 4.x
New file:
patches/patch-ab
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/xoj/Makefile games/xoj/Makefile
--- /usr/ports/games/xoj/Makefile Sat Apr 15 00:24:30 2000
+++ games/xoj/Makefile Fri Oct 13 22:41:18 2000
@@ -5,18 +5,17 @@
# $FreeBSD: ports/games/xoj/Makefile,v 1.5 2000/04/14 12:27:53 asami Exp $
#
-PORTNAME= xoj
-PORTVERSION= 1.0
-CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
+PORTNAME= xoj
+PORTVERSION= 1.0
+CATEGORIES= games
+MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/demos
-EXTRACT_SUFX= .tgz
+EXTRACT_SUFX= .tgz
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
-USE_IMAKE= yes
-
-do-install:
- @ ${INSTALL_PROGRAM} ${WRKSRC}/xoj ${PREFIX}/bin
+USE_XPM= yes
+USE_IMAKE= yes
+NO_INSTALL_MANPAGES= yes
.include <bsd.port.mk>
diff -urN /usr/ports/games/xoj/files/patch-aa games/xoj/files/patch-aa
--- /usr/ports/games/xoj/files/patch-aa Mon Jan 3 18:45:36 2000
+++ games/xoj/files/patch-aa Fri Oct 13 22:37:55 2000
@@ -1,6 +1,16 @@
---- xoj.c.orig Tue Jul 26 09:10:19 1994
-+++ xoj.c Sun Dec 19 22:32:12 1999
-@@ -106,7 +106,9 @@
+--- xoj.c.orig Tue Jul 26 23:10:19 1994
++++ xoj.c Fri Oct 13 22:37:45 2000
+@@ -33,7 +33,9 @@
+
+ #include <stdio.h>
+ #include <math.h>
++#ifndef __STDC__
+ #include <malloc.h>
++#endif
+ #include <signal.h>
+ #include <limits.h>
+
+@@ -106,7 +108,9 @@
void UpdateCop();
void DrawCop();
void EraseCop();
@@ -10,7 +20,7 @@
Pixel AllocNamedColor();
void
-@@ -584,6 +586,7 @@
+@@ -584,6 +588,7 @@
/*
* sleep for a number of micro-seconds
*/
@@ -18,7 +28,7 @@
void usleep(usec)
unsigned long usec;
{
-@@ -596,6 +599,7 @@
+@@ -596,6 +601,7 @@
select(0, (void *)0, (void *)0, (void *)0, &t);
#endif
}
diff -urN /usr/ports/games/xoj/files/patch-ab games/xoj/files/patch-ab
--- /usr/ports/games/xoj/files/patch-ab Thu Jan 1 09:00:00 1970
+++ games/xoj/files/patch-ab Fri Oct 13 22:42:17 2000
@@ -0,0 +1,12 @@
+--- Imakefile.orig Tue Jul 26 23:10:17 1994
++++ Imakefile Fri Oct 13 22:40:03 2000
+@@ -1,5 +1,8 @@
+ LOCAL_LIBRARIES = XawClientLibs -lm
+ DEPLIBS = XawClientDepLibs
+
+-SimpleProgramTarget(xoj)
++SRCS = xoj.c
++OBJS = xoj.o
++
++ComplexProgramTargetNoMan(xoj)
+
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001027224841.0F95737B479>