CVS commit: pkgsrc/devel/picasm

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Wed Mar 18 17:52:39 UTC 2020

Modified Files:
        pkgsrc/devel/picasm: Makefile distinfo
        pkgsrc/devel/picasm/patches: patch-picasm.c

Log Message:
Fix obvious code bug. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/picasm/Makefile \
    pkgsrc/devel/picasm/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/picasm/patches/patch-picasm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/picasm/Makefile
diff -u pkgsrc/devel/picasm/Makefile:1.1 pkgsrc/devel/picasm/Makefile:1.2
--- pkgsrc/devel/picasm/Makefile:1.1    Sun Jun 12 20:03:45 2016
+++ pkgsrc/devel/picasm/Makefile        Wed Mar 18 17:52:39 2020
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2016/06/12 20:03:45 kamil Exp $
+# $NetBSD: Makefile,v 1.2 2020/03/18 17:52:39 joerg Exp $
 #
 
 DISTNAME=      picasm114
 PKGNAME=       ${DISTNAME:S/picasm/picasm-/}
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  http://nsa.kpu-m.ac.jp/gijutu/kousaku/man-pic/
 EXTRACT_SUFX=  .tar.bz2
Index: pkgsrc/devel/picasm/distinfo
diff -u pkgsrc/devel/picasm/distinfo:1.1 pkgsrc/devel/picasm/distinfo:1.2
--- pkgsrc/devel/picasm/distinfo:1.1    Sun Jun 12 20:03:45 2016
+++ pkgsrc/devel/picasm/distinfo        Wed Mar 18 17:52:39 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2016/06/12 20:03:45 kamil Exp $
+$NetBSD: distinfo,v 1.2 2020/03/18 17:52:39 joerg Exp $
 
 SHA1 (picasm114.tar.bz2) = 137689c08ebc8e8842aa62521c47f7c88f70d239
 RMD160 (picasm114.tar.bz2) = b4ed44b64b256b973814848fd7201d01f1beed72
 SHA512 (picasm114.tar.bz2) = a6a8490156afe8af1fc85700890570c745c076396890491f4efe004d7dd701a324f9c7e764fcc710c8954c761f3abb4ed8e97c72ce098100192ead334b335fb7
 Size (picasm114.tar.bz2) = 35429 bytes
-SHA1 (patch-picasm.c) = 5bdc64c5798e0ac100435403e5e1f16a808759e5
+SHA1 (patch-picasm.c) = 1d14ab94f988b35b14cbf05476eab9e14337ef18

Index: pkgsrc/devel/picasm/patches/patch-picasm.c
diff -u pkgsrc/devel/picasm/patches/patch-picasm.c:1.1 pkgsrc/devel/picasm/patches/patch-picasm.c:1.2
--- pkgsrc/devel/picasm/patches/patch-picasm.c:1.1      Sun Jun 12 20:03:45 2016
+++ pkgsrc/devel/picasm/patches/patch-picasm.c  Wed Mar 18 17:52:39 2020
@@ -1,9 +1,19 @@
-$NetBSD: patch-picasm.c,v 1.1 2016/06/12 20:03:45 kamil Exp $
+$NetBSD: patch-picasm.c,v 1.2 2020/03/18 17:52:39 joerg Exp $
 
+Fix tautological check.
 Remove unused variable.
 
 --- picasm.c.orig      2005-06-29 07:05:34.000000000 +0000
 +++ picasm.c
+@@ -895,7 +895,7 @@ gen_byte_c(int instr_code)
+       sym = lookup_symbol(token_string, symtype);
+       if(sym != NULL && sym->type != SYM_FORWARD)
+       {
+-          if(sym->type != SYM_SET || sym->type != SYM_DEFINED)
++          if(sym->type != SYM_SET && sym->type != SYM_DEFINED)
+           {
+               error(1, "Invalid symbol type");
+               return FAIL;
 @@ -1866,7 +1866,7 @@ int
  main(int argc, char *argv[])
  {