Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Mar 2020 03:09:07 +0000 (UTC)
From:      Mikhail Teterin <mi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r528556 - in head/textproc/wordnet: . files
Message-ID:  <202003170309.02H397q3090986@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mi
Date: Tue Mar 17 03:09:07 2020
New Revision: 528556
URL: https://svnweb.freebsd.org/changeset/ports/528556

Log:
  Fix a couple of warnings, one of them an actual ancient bug
  uncovered by clang10's new -Wmisleading-indentation.
  
  Bump PORTREVISION.
  
  Reported by:	pkg-fallout

Modified:
  head/textproc/wordnet/Makefile
  head/textproc/wordnet/files/patch-lib__wnutil.c
  head/textproc/wordnet/files/patch-src__wn.c

Modified: head/textproc/wordnet/Makefile
==============================================================================
--- head/textproc/wordnet/Makefile	Tue Mar 17 02:46:39 2020	(r528555)
+++ head/textproc/wordnet/Makefile	Tue Mar 17 03:09:07 2020	(r528556)
@@ -3,7 +3,7 @@
 
 PORTNAME=	WordNet
 PORTVERSION=	3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://wordnetcode.princeton.edu/${PORTVERSION}/:code \
 		http://wordnetcode.princeton.edu/:dict

Modified: head/textproc/wordnet/files/patch-lib__wnutil.c
==============================================================================
--- head/textproc/wordnet/files/patch-lib__wnutil.c	Tue Mar 17 02:46:39 2020	(r528555)
+++ head/textproc/wordnet/files/patch-lib__wnutil.c	Tue Mar 17 03:09:07 2020	(r528556)
@@ -1,5 +1,5 @@
 --- lib/wnutil.c	Fri May  6 13:17:39 2005
-+++ lib/wnutil.c	Wed Dec 21 16:04:36 2005
++++ lib/wnutil.c	Mon Mar 16 22:52:04 2020
 @@ -15,5 +15,6 @@
  #ifdef __unix__
  #ifndef __MACH__
@@ -40,8 +40,25 @@
 -	assert(wnrelease);
 +    if ((env = getenv("WNDBVERSION"))) {
 +	wnrelease = env;	/* set release */
-     }
      openerr = do_init();
+
+@@ -90,8 +89,12 @@
+     if (OpenDB) {
+ 	for (i = 1; i < NUMPARTS + 1; i++) {
+-	    if (datafps[i] != NULL)
+-		fclose(datafps[i]); datafps[i] = NULL;
+-	    if (indexfps[i] != NULL)
+-		fclose(indexfps[i]); indexfps[i] = NULL;
++	    if (datafps[i] != NULL) {
++		fclose(datafps[i]);
++		datafps[i] = NULL;
++	    }
++	    if (indexfps[i] != NULL) {
++		fclose(indexfps[i]);
++		indexfps[i] = NULL;
++	    }
+ 	}
+ 	if (sensefp != NULL) {
 @@ -248,4 +246,20 @@
  }
  

Modified: head/textproc/wordnet/files/patch-src__wn.c
==============================================================================
--- head/textproc/wordnet/files/patch-src__wn.c	Tue Mar 17 02:46:39 2020	(r528555)
+++ head/textproc/wordnet/files/patch-src__wn.c	Tue Mar 17 03:09:07 2020	(r528556)
@@ -1,5 +1,5 @@
 --- src/wn.c	Fri May  6 13:29:09 2005
-+++ src/wn.c	Wed Dec 21 01:41:13 2005
++++ src/wn.c	Mon Mar 16 23:04:47 2020
 @@ -8,14 +8,14 @@
  #include <string.h>
  #include <stdlib.h>
@@ -29,7 +29,7 @@
 +    const char *helpstr;	
  } searchstr[] = {		/* index by search type type */
      { NULL, NULL, NULL },
-@@ -122,11 +123,11 @@
+@@ -122,11 +123,12 @@
  };
  
 -static int getoptidx(char *), cmdopt(char *);
@@ -44,6 +44,7 @@
 +       printsearches(const char *, int, unsigned long);
 +static int error_message(const char *);
  
++int
  main(int argc,char *argv[])
 @@ -214,9 +215,10 @@
  }
@@ -74,6 +75,14 @@
 +printsearches(const char *word, int dbase, unsigned long search)
  {
      int j;
+@@ -284,6 +286,5 @@
+ 	    printf(searchstr[j].template,
+ 		   partchars[dbase], partchars[dbase]);
+-	    printf(searchstr[j].helpstr);
+-	    printf("\n");
++	    puts(searchstr[j].helpstr);
+ 	}
+ }
 @@ -316,5 +319,6 @@
  }
  
@@ -97,4 +106,5 @@
 +static int
 +error_message(const char *msg)
  {
-     fprintf(stderr, msg);
+-    fprintf(stderr, msg);
++    fputs(msg, stderr);



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