Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Jan 2018 08:49:35 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r457835 - in head/lang: . cim cim/files
Message-ID:  <201801020849.w028nZdZ042895@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Tue Jan  2 08:49:35 2018
New Revision: 457835
URL: https://svnweb.freebsd.org/changeset/ports/457835

Log:
  - Resurrect `lang/cim', upstream is alive now
  - Update MASTER_SITES and WWW: line accordingly
  - Define LICENSE (GPLv2)
  - Convert USE_AUTOTOOLS=libtool -> USES=libtool
  - Remove USE_PERL5: while configure script checks
    for it, it is never actually used anywhere
  - Utilize INSTALL_TARGET=install-strip
  - Hook provided tests to the test framework
  - TIMESTAMP (cim-3.37.tar.gz) = 1125726905
  
  Tested on:	i386, amd64, powerpc, sparc64

Added:
  head/lang/cim/
     - copied from r273478, head/lang/cim/
  head/lang/cim/files/
  head/lang/cim/files/patch-missing-void   (contents, props changed)
  head/lang/cim/files/patch-src_mapline.c   (contents, props changed)
Modified:
  head/lang/Makefile
  head/lang/cim/Makefile   (contents, props changed)
  head/lang/cim/distinfo   (contents, props changed)
  head/lang/cim/pkg-descr   (contents, props changed)
  head/lang/cim/pkg-plist   (contents, props changed)

Modified: head/lang/Makefile
==============================================================================
--- head/lang/Makefile	Tue Jan  2 07:26:29 2018	(r457834)
+++ head/lang/Makefile	Tue Jan  2 08:49:35 2018	(r457835)
@@ -30,6 +30,7 @@
     SUBDIR += chibi-scheme
     SUBDIR += chicken
     SUBDIR += cilkplus
+    SUBDIR += cim
     SUBDIR += cint
     SUBDIR += cjs
     SUBDIR += clang-devel

Modified: head/lang/cim/Makefile
==============================================================================
--- head/lang/cim/Makefile	Mon May  2 14:05:45 2011	(r273478)
+++ head/lang/cim/Makefile	Tue Jan  2 08:49:35 2018	(r457835)
@@ -1,28 +1,23 @@
-# New ports collection makefile for:	cim
-# Date created:			21 Sept 1996
-# Whom:				giffunip
-#
 # $FreeBSD$
-#
 
 PORTNAME=	cim
 PORTVERSION=	3.37
 PORTREVISION=	1
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.ifi.uio.no/pub/cim/
+MASTER_SITES=	http://simula67.at.ifi.uio.no/Cim/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compiler for the SIMULA programming language
 
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
+LICENSE=	GPLv2
 
-USE_AUTOTOOLS=	libtool
-USE_PERL5=	yes
+USES=		libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
+TEST_TARGET=	check-TESTS
+TEST_WRKSRC=	${WRKSRC}/test
 
-MAN1=		cim.1
 INFO=		cim
 
 .include <bsd.port.mk>

Modified: head/lang/cim/distinfo
==============================================================================
--- head/lang/cim/distinfo	Mon May  2 14:05:45 2011	(r273478)
+++ head/lang/cim/distinfo	Tue Jan  2 08:49:35 2018	(r457835)
@@ -1,3 +1,3 @@
-MD5 (cim-3.37.tar.gz) = b51068ab30f54aefeb86fc4a6289cc77
+TIMESTAMP = 1125726905
 SHA256 (cim-3.37.tar.gz) = 6bdebc2de4ff40409eb813b12666bd2c4465ec1a3690a53861f11899793c9349
 SIZE (cim-3.37.tar.gz) = 712263

Added: head/lang/cim/files/patch-missing-void
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/cim/files/patch-missing-void	Tue Jan  2 08:49:35 2018	(r457835)
@@ -0,0 +1,188 @@
+--- src/dekl.c.orig	2005-09-03 04:14:27 UTC
++++ src/dekl.c
+@@ -526,6 +526,7 @@ subordinate (rda, rdb)
+ 
+ /* Kalles fra  syntakssjekkeren hver gang en ny blokk entres */
+ 
++void
+ beginBlock (kind)
+      char kind;
+ {
+@@ -654,6 +655,7 @@ beginBlock (kind)
+ /* Kalles  fra  syntakssjekkeren hver gang en blokk terminerer */
+ 
+ /*VARARGS0 */
++void
+ endBlock (rtname, codeclass)
+      char *rtname;
+      char codeclass;
+@@ -692,6 +694,7 @@ endBlock (rtname, codeclass)
+ /* RegDecl kalles fra syntakssjekkeren
+  * hver gang  vi leser  en deklarasjon */
+ 
++void
+ regDecl (ident, type, kind, categ)
+      char *ident, type, kind, categ;
+ {
+@@ -1263,6 +1266,7 @@ setqualprefchain (rd, param)
+  * Prefikskjeden og kvalifikasjoner settes ved kall på setqualprefchain 
+  * den sjekker også konsistensen for type kind og categ */
+ 
++void
+ static sjekkdekl (rb)
+      struct BLOCK *rb;
+ {
+--- src/dekl.h.orig	1999-12-05 14:16:13 UTC
++++ src/dekl.h
+@@ -189,9 +189,9 @@ struct BLOCK
+ #define CCCPROC      8		/* Ekstern C-prosedyre */
+ 
+ 
+-extern beginBlock ();
+-extern endBlock ();
+-extern regDecl ();
++extern void beginBlock ();
++extern void endBlock ();
++extern void regDecl ();
+ extern regInner ();
+ extern struct DECL *newDecl ();
+ extern struct BLOCK *firstclass ();
+--- src/error.c.orig	1998-12-08 11:41:38 UTC
++++ src/error.c
+@@ -42,6 +42,7 @@ int anterror;
+ 
+ /******************************************************************************
+                                                                   STARTERROR */
++void
+ static starterror (line)
+      long line;
+ {
+@@ -57,6 +58,7 @@ static starterror (line)
+ 
+ /* Feil som oppdages av LEX */
+ 
++void
+ lerror (errcode)
+      int errcode;
+ {
+@@ -460,6 +462,7 @@ textnumber (i)
+ /* Feil som oppdages av SJEKKEREN */
+ 
+ /*VARARGS1 */
++void
+ serror (errcode, name, ant)
+      int errcode,
+        ant;
+@@ -684,6 +687,7 @@ gerror (errcode, name)
+ /* Feil som oppdages under innlesing av eksterne moduler */
+ 
+ /*VARARGS1 */
++void
+ merror (errcode, name)
+      int errcode;
+      char *name;
+--- src/expbuilder.c.orig	2005-09-03 04:14:39 UTC
++++ src/expbuilder.c
+@@ -199,6 +199,7 @@ struct EXP *elook()
+ 
+ /* Bygger opp et uttrykstree, Alle operatorene leses postfix */
+ 
++void
+ ebuild ()
+ {
+   struct EXP *re;
+--- src/expchecker.c.orig	2000-08-27 01:36:20 UTC
++++ src/expchecker.c
+@@ -237,6 +237,7 @@ static sametype (rel, rer)
+ /******************************************************************************
+                                                                ARGUMENTERROR */
+ 
++void
+ static argumenterror (melding, re)
+      int melding;
+      struct EXP *re;
+--- src/extspec.c.orig	2000-05-29 09:51:25 UTC
++++ src/extspec.c
+@@ -476,6 +476,7 @@ found:
+ /******************************************************************************
+                                                         LESINN_EXTERNAL_SPEC */
+ 
++void
+ lesinn_external_spec (ident, filename, kind)
+      char *ident;
+      char *filename;
+@@ -565,6 +566,7 @@ static write_text_mif (f, s) FILE *f; un
+ /******************************************************************************
+                                                               WRITE_DECL_MIF */
+ 
++void
+ static write_decl_mif (f, rd, level)
+        FILE *f; struct DECL *rd; int level;
+ {
+--- src/extspec.h.orig	1998-09-12 14:59:34 UTC
++++ src/extspec.h
+@@ -28,7 +28,7 @@ void gettimestamp ();
+ void initExtspec ();
+ extern char *directive_timestamp;
+ extern char *timestamp;
+-extern lesinn_external_spec ();
++extern void lesinn_external_spec ();
+ extern more_modules ();
+ extern struct stamp *first_stamp;
+ extern skrivut_external_spec ();
+--- src/gen.h.orig	1998-10-19 14:18:17 UTC
++++ src/gen.h
+@@ -68,11 +68,11 @@ extern gentype ();
+ extern genmodulemark();
+ extern gen_adr_prot();
+ 
+-extern genvalue();
++extern void genvalue();
+ 
+ /* genpar.c */
+ extern genprocparam ();
+-extern genpredefproccall ();
++extern void genpredefproccall ();
+ extern gencproccall ();
+ extern gen_thunk_simple_address ();
+ extern gen_thunk_simple_value ();
+--- src/genexp.c.orig	2000-05-29 09:22:29 UTC
++++ src/genexp.c
+@@ -196,6 +196,7 @@ genmodulemark(maintimestamp) char *maint
+ /******************************************************************************
+                                                                 GENVALUE     */
+ 
++void
+ genvalue (re)
+      struct EXP *re;
+ {
+--- src/genpar.c.orig	1999-12-09 17:55:29 UTC
++++ src/genpar.c
+@@ -1112,6 +1112,7 @@ genprocparam (re)
+ /******************************************************************************
+                                                       GENPREDEFPROCCALL      */
+ 
++void
+ genpredefproccall (re)
+      struct EXP *re;
+ {
+--- src/genstr.c.orig	2000-02-05 19:16:21 UTC
++++ src/genstr.c
+@@ -258,6 +258,7 @@ static blockmainstructure (rb, output_re
+ /******************************************************************************
+                                                         BLOCKSTRUCTURE       */
+ 
++void
+ static blockstructure (rb)
+      struct BLOCK *rb;
+ {
+--- src/lex.c.orig	2005-09-03 04:56:56 UTC
++++ src/lex.c
+@@ -730,6 +730,7 @@ static scanDirflags ()
+ /******************************************************************************
+                                                                    DIRLINE   */
+ 
++void
+ static scanDirline ()
+ {
+   FILE *file;

Added: head/lang/cim/files/patch-src_mapline.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/cim/files/patch-src_mapline.c	Tue Jan  2 08:49:35 2018	(r457835)
@@ -0,0 +1,11 @@
+--- src/mapline.c.orig	2018-01-02 05:18:40 UTC
++++ src/mapline.c
+@@ -60,6 +60,8 @@ static int antmap = 1;
+ 
+ /******************************************************************************
+                                                                 MAPLINEINIT  */
++char * tag (char []);
++
+ int maplineInit (sourcename, ifdefp) char *sourcename; void *ifdefp;
+ {
+   obstack_init (&osMap);

Modified: head/lang/cim/pkg-descr
==============================================================================
--- head/lang/cim/pkg-descr	Mon May  2 14:05:45 2011	(r273478)
+++ head/lang/cim/pkg-descr	Tue Jan  2 08:49:35 2018	(r457835)
@@ -9,4 +9,4 @@ influential on modern programming methodology. Among o
 introduced important object-oriented programming concepts like classes and
 objects, inheritance, and dynamic binding.
 
-WWW: http://www.ifi.uio.no/~cim/cim.html
+WWW: http://folk.uio.no/simula67/cim.shtml

Modified: head/lang/cim/pkg-plist
==============================================================================
--- head/lang/cim/pkg-plist	Mon May  2 14:05:45 2011	(r273478)
+++ head/lang/cim/pkg-plist	Tue Jan  2 08:49:35 2018	(r457835)
@@ -5,6 +5,7 @@ bin/cimindent
 include/cim.h
 lib/libcim-atr.a
 lib/libcim.a
-lib/libcim.la
 lib/libcim.so
 lib/libcim.so.3
+lib/libcim.so.3.0.0
+man/man1/cim.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801020849.w028nZdZ042895>