From 683cd5896f3becd35bd317bfe35d8ec94486abf2 Mon Sep 17 00:00:00 2001 From: jtb Date: Sat, 24 Feb 2001 15:45:52 +0000 Subject: Adjust for NetBSD --- lang/cu-prolog/Makefile | 37 +++++++++++++++++++------------------ lang/cu-prolog/patches/patch-aa | 10 ++++++---- lang/cu-prolog/patches/patch-ab | 22 ++++++++++++++++------ lang/cu-prolog/patches/patch-ac | 6 ++++-- lang/cu-prolog/patches/patch-ad | 6 ++++-- lang/cu-prolog/patches/patch-ae | 6 ++++-- lang/cu-prolog/pkg/COMMENT | 1 - 7 files changed, 53 insertions(+), 35 deletions(-) delete mode 100644 lang/cu-prolog/pkg/COMMENT diff --git a/lang/cu-prolog/Makefile b/lang/cu-prolog/Makefile index 69e5acb4c01..a6853d83d18 100644 --- a/lang/cu-prolog/Makefile +++ b/lang/cu-prolog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/02/24 15:38:48 jtb Exp $ +# $NetBSD: Makefile,v 1.2 2001/02/24 15:45:52 jtb Exp $ # New ports collection makefile for: cu-Prolog # Date created: 7 July 1999 # Whom: Issei Suzuki @@ -6,31 +6,32 @@ # FreeBSD: ports/lang/cu-prolog/Makefile,v 1.2 2000/04/12 06:18:03 obrien Exp # -PORTNAME= cu-prolog -PORTVERSION= 3.94 +DISTNAME= cu-prolog-3.94 CATEGORIES= lang MASTER_SITES= ftp://ftp.icot.or.jp/ifs/kbms-clp/unix/cuprolog/ -DISTFILES= ${DISTNAME}.tar.gz cupdoc.tar.gz -DISTNAME= cupsrc +DISTFILES= cupsrc.tar.gz cupdoc.tar.gz -MAINTAINER= issei@jp.FreeBSD.ORG +MAINTAINER= jtb@netbsd.org +COMMENT= Experimental constraint logic programming language +DIST_SUBDIR= ${DISTNAME} +NO_WRKSUBDIR= #defined WRKSRC= ${WRKDIR}/src MAKEFILE= makefile ALL_TARGET= cup -PORTDOCS= CHANGES COPYRIGHT COPYRIGHT.j INSTALL INSTALL.j README \ - README.j doc/cu3eman.dvi doc/cu3man.dvi doc/newpred_e.doc \ - doc/newpred_j.doc do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cup3 ${PREFIX}/bin/cuprolog - ${MKDIR} ${PREFIX}/share/examples/cu-prolog - ${INSTALL_DATA} ${WRKDIR}/sample/* ${PREFIX}/share/examples/cu-prolog -.if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/cu-prolog -.for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKDIR}/$i ${PREFIX}/share/doc/cu-prolog -.endfor -.endif + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cu-prolog + @for f in ${WRKDIR}/README* ${WRKDIR}/COPYRIGHT* \ + ${WRKDIR}/CHANGES ${WRKDIR}/doc/*.dvi ${WRKDIR}/doc/*.doc; do \ + i="${INSTALL_DATA} $$f ${PREFIX}/share/doc/cu-prolog/"; \ + ${ECHO} $$i; $$i; \ + done + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cu-prolog + @for f in ${WRKDIR}/sample/*; do \ + i="${INSTALL_DATA} $$f ${PREFIX}/share/examples/cu-prolog/"; \ + ${ECHO} $$i; $$i; \ + done -.include +.include "../../mk/bsd.pkg.mk" diff --git a/lang/cu-prolog/patches/patch-aa b/lang/cu-prolog/patches/patch-aa index 71217e1d412..941610a5da4 100644 --- a/lang/cu-prolog/patches/patch-aa +++ b/lang/cu-prolog/patches/patch-aa @@ -1,16 +1,18 @@ ---- makefile.old Wed Jul 7 02:03:58 1999 -+++ makefile Wed Jul 7 02:04:19 1999 +$NetBSD: patch-aa,v 1.2 2001/02/24 15:45:52 jtb Exp $ + +--- makefile.orig Thu Feb 22 12:21:22 2001 ++++ makefile @@ -6,11 +6,11 @@ refute.o unify.o defsysp.o syspred1.o\ syspred2.o trans.o tr_sub.o tr_split.o #CFLAGS = -g -CFLAGS = -pg -g # for debug -+CFLAGS?= -pg -g # for debug ++#CFLAGS = -pg -g # for debug #CFLAGS = -O2 # for optimization #CFLAGS = -O4 #CC = gcc -CC = cc -+CC?= cc ++#CC = cc FLAGS = -lm cup: $(OBJECTS) diff --git a/lang/cu-prolog/patches/patch-ab b/lang/cu-prolog/patches/patch-ab index 4508cb32b44..2022ba97d90 100644 --- a/lang/cu-prolog/patches/patch-ab +++ b/lang/cu-prolog/patches/patch-ab @@ -1,10 +1,20 @@ ---- include.h.orig Fri Jan 27 16:38:48 1995 -+++ include.h Wed Jul 7 02:25:14 1999 -@@ -28,7 +28,11 @@ +$NetBSD: patch-ab,v 1.2 2001/02/24 15:45:52 jtb Exp $ + +--- include.h.orig Fri Jan 27 07:38:48 1995 ++++ include.h +@@ -21,6 +21,7 @@ + + #include + #include ++#include + + /* CPUTIME : print CPU time for UNIX 4.2 BSD + * if your system has times() function #define CPUTIME 60 +@@ -28,7 +29,11 @@ * else #define CPUTIME 0 */ -+#ifdef __FreeBSD__ ++#if (defined(BSD) && BSD >= 199306) +#define CPUTIME 60 +#else #define SUN4 1 @@ -12,11 +22,11 @@ #define KANJI 1 /* 1: allow EUC Kanji for str functions */ /* Tee print macro */ -@@ -135,8 +139,13 @@ +@@ -135,8 +140,13 @@ #define head_of_list(Term) (((struct clause *)Term)->c_form) #define tail_of_list(Term) ((struct term *)((struct clause *)Term)->c_link) -+#ifdef __FreeBSD__ ++#if (defined(BSD) && BSD >= 199306) +#define is_readable(FP) (FP->_flags & __SRD) +#define is_writable(FP) (FP->_flags & __SWR) +#else diff --git a/lang/cu-prolog/patches/patch-ac b/lang/cu-prolog/patches/patch-ac index d2fb8d0e0d1..cbd682e3630 100644 --- a/lang/cu-prolog/patches/patch-ac +++ b/lang/cu-prolog/patches/patch-ac @@ -1,5 +1,7 @@ ---- defsysp.c.old Wed Jul 7 02:21:11 1999 -+++ defsysp.c Wed Jul 7 02:21:32 1999 +$NetBSD: patch-ac,v 1.2 2001/02/24 15:45:53 jtb Exp $ + +--- defsysp.c.orig Wed Jul 7 02:21:11 1999 ++++ defsysp.c Wed Jul 7 02:21:32 1999 @@ -932,9 +932,9 @@ t1 = t2 = Nnum_val(0.0,TEMPORAL); #else diff --git a/lang/cu-prolog/patches/patch-ad b/lang/cu-prolog/patches/patch-ad index c3e7d500cf9..f896f465448 100644 --- a/lang/cu-prolog/patches/patch-ad +++ b/lang/cu-prolog/patches/patch-ad @@ -1,5 +1,7 @@ ---- mainsub.c.old Wed Jul 7 02:22:15 1999 -+++ mainsub.c Wed Jul 7 02:22:30 1999 +$NetBSD: patch-ad,v 1.2 2001/02/24 15:45:53 jtb Exp $ + +--- mainsub.c.orig Wed Jul 7 02:22:15 1999 ++++ mainsub.c Wed Jul 7 02:22:30 1999 @@ -1238,8 +1238,8 @@ times(&TIMES); /* get time */ ttemp = TIMES.tms_stime + TIMES.tms_utime; diff --git a/lang/cu-prolog/patches/patch-ae b/lang/cu-prolog/patches/patch-ae index 92d9238faa2..68eda71c15c 100644 --- a/lang/cu-prolog/patches/patch-ae +++ b/lang/cu-prolog/patches/patch-ae @@ -1,5 +1,7 @@ ---- main.c.old Wed Jul 7 02:26:00 1999 -+++ main.c Wed Jul 7 02:27:38 1999 +$NetBSD: patch-ae,v 1.2 2001/02/24 15:45:53 jtb Exp $ + +--- main.c.orig Wed Jul 7 02:26:00 1999 ++++ main.c Wed Jul 7 02:27:38 1999 @@ -303,13 +303,16 @@ void heap_realloc() /* reallocate system/user heaps */ diff --git a/lang/cu-prolog/pkg/COMMENT b/lang/cu-prolog/pkg/COMMENT deleted file mode 100644 index 1f2aa9723fe..00000000000 --- a/lang/cu-prolog/pkg/COMMENT +++ /dev/null @@ -1 +0,0 @@ -Experimental constraint logic programming language -- cgit v1.2.3