CVS commit: pkgsrc/textproc/openjade

["Brook Milligan" <brook%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   brook
Date:           Fri Jul 31 17:01:44 UTC 2020

Modified Files:
        pkgsrc/textproc/openjade: distinfo
        pkgsrc/textproc/openjade/patches: patch-aa patch-ab
Added Files:
        pkgsrc/textproc/openjade/patches: patch-Makefile.comm.in

Log Message:
Fix issues with a nonstandard compiler and umask.

If the compiler is in a nonstandard location, libtool may choose the
incorrect mode.  This is described in libtool documentation:
     https://www.gnu.org/software/libtool/manual/html_node/Tags.html
The correct fix is to use --tag to explicitly set the mode.  See
https://sourceforge.net/p/openjade/patches/48/

Write permissions are removed when the package is built.  However, the
command chmod -w does not affect bits set in umask.  The correct usage
is to explicitly identify the users to which the command applies.  See
https://sourceforge.net/p/openjade/patches/49/


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/openjade/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/openjade/patches/patch-Makefile.comm.in
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/openjade/patches/patch-aa
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/openjade/patches/patch-ab

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

Modified files:

Index: pkgsrc/textproc/openjade/distinfo
diff -u pkgsrc/textproc/openjade/distinfo:1.18 pkgsrc/textproc/openjade/distinfo:1.19
--- pkgsrc/textproc/openjade/distinfo:1.18      Thu Apr 30 23:46:13 2020
+++ pkgsrc/textproc/openjade/distinfo   Fri Jul 31 17:01:44 2020
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.18 2020/04/30 23:46:13 joerg Exp $
+$NetBSD: distinfo,v 1.19 2020/07/31 17:01:44 brook Exp $
 
 SHA1 (openjade-1.3.2.tar.gz) = 54e1999f41450fbd62c5d466002d79d3efca2321
 RMD160 (openjade-1.3.2.tar.gz) = 3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2
 SHA512 (openjade-1.3.2.tar.gz) = c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
 Size (openjade-1.3.2.tar.gz) = 894834 bytes
-SHA1 (patch-aa) = 4914f08b6598d25af7b7f99a58e1e6490d292609
-SHA1 (patch-ab) = 5e50562cf860c713b581247e223130ee7ef409b9
+SHA1 (patch-Makefile.comm.in) = 79ece1241a42e99eae8130be30adef42bc7bad84
+SHA1 (patch-aa) = cf55d4812e9bd5592ceb71e972c62c10de1bd02c
+SHA1 (patch-ab) = 7f54b7b2e52da456b673c9f0f539d03ef0850e81
 SHA1 (patch-ac) = 2492ccb9bd736318ecd5c37f1b2a963f3ff188ab
 SHA1 (patch-ad) = f8c950cc4a0ffb5bdba315a298c14a3e7ebcd637
 SHA1 (patch-ae) = b67fde4062691b2d953cb4cb5b4ebd2428c3c285

Index: pkgsrc/textproc/openjade/patches/patch-aa
diff -u pkgsrc/textproc/openjade/patches/patch-aa:1.3 pkgsrc/textproc/openjade/patches/patch-aa:1.4
--- pkgsrc/textproc/openjade/patches/patch-aa:1.3       Sun Nov 16 14:01:20 2003
+++ pkgsrc/textproc/openjade/patches/patch-aa   Fri Jul 31 17:01:44 2020
@@ -1,7 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2003/11/16 14:01:20 agc Exp $
+$NetBSD: patch-aa,v 1.4 2020/07/31 17:01:44 brook Exp $
 
---- configure.orig     Sun Nov  9 21:44:24 2003
-+++ configure  Sun Nov  9 21:45:58 2003
+Explicitly remove all write permissions from files.  See
+https://sourceforge.net/p/openjade/patches/49/
+
+--- configure.orig     2002-12-01 16:18:40.000000000 +0000
++++ configure
 @@ -4899,16 +4899,16 @@
  
  fi
@@ -68,3 +71,12 @@ $NetBSD: patch-aa,v 1.3 2003/11/16 14:01
    cat >>confdefs.h <<\_ACEOF
  #define SP_HAVE_WCHAR 1
  _ACEOF
+@@ -7358,7 +7358,7 @@
+ # the output directory.  Thus, making CWD read-only will cause this test
+ # to fail, enabling locking or at least warning the user not to do parallel
+ # builds.
+-chmod -w .
++chmod a-w .
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
+ compiler_c_o=no

Index: pkgsrc/textproc/openjade/patches/patch-ab
diff -u pkgsrc/textproc/openjade/patches/patch-ab:1.4 pkgsrc/textproc/openjade/patches/patch-ab:1.5
--- pkgsrc/textproc/openjade/patches/patch-ab:1.4       Sat Jul 15 14:34:15 2017
+++ pkgsrc/textproc/openjade/patches/patch-ab   Fri Jul 31 17:01:44 2020
@@ -1,4 +1,9 @@
-$NetBSD: patch-ab,v 1.4 2017/07/15 14:34:15 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2020/07/31 17:01:44 brook Exp $
+
+Use --tag explicitly to always detect the correct compiler.  See
+https://sourceforge.net/p/openjade/patches/48/
+
+Include $(LDFLAGS) in linker arguments.
 
 --- Makefile.lib.in.orig       2002-01-22 11:57:53.000000000 +0000
 +++ Makefile.lib.in
@@ -7,7 +12,7 @@ $NetBSD: patch-ab,v 1.4 2017/07/15 14:34
  
  lib$(LIB).la: $(LT_OBJS)
 -      $(LIBTOOL) --mode=link $(CC) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
-+      $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(LDFLAGS) -o lib$(LIB).la $(LT_OBJS) \
++      $(LIBTOOL) --mode=link --tag=CC $(CC) $(LINKFLAGS) $(LDFLAGS) -o lib$(LIB).la $(LT_OBJS) \
            -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS)
  
  install:

Added files:

Index: pkgsrc/textproc/openjade/patches/patch-Makefile.comm.in
diff -u /dev/null pkgsrc/textproc/openjade/patches/patch-Makefile.comm.in:1.1
--- /dev/null   Fri Jul 31 17:01:44 2020
+++ pkgsrc/textproc/openjade/patches/patch-Makefile.comm.in     Fri Jul 31 17:01:44 2020
@@ -0,0 +1,32 @@
+$NetBSD: patch-Makefile.comm.in,v 1.1 2020/07/31 17:01:44 brook Exp $
+
+Use --tag explicitly to always detect the correct compiler.  See
+https://sourceforge.net/p/openjade/patches/48/
+
+Explicitly remove all write permissions from files.  See
+https://sourceforge.net/p/openjade/patches/49/
+
+--- Makefile.comm.in.orig      2002-12-01 11:56:47.000000000 +0000
++++ Makefile.comm.in
+@@ -42,18 +42,18 @@ CXXDEPGENFLAGS=-MM
+       $(CXX) $(CXXFLAGS) -c $<
+ 
+ .cxx.lo:
+-      @$(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) -c $<
++      @$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CXXFLAGS) -c $<
+ 
+ .c.o:
+       $(CC) $(CFLAGS) -c $<
+ 
+ .c.lo:
+-      @$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
++      @$(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) -c $<
+ 
+ .m4.cxx:
+       rm -f $@
+       $(PERL) $(srcdir)/../instmac.pl $< >$@
+-      chmod -w $@
++      chmod a-w $@
+ 
+ %.h %.cxx %.rc: %.msg
+       $(PERL) -w $(srcdir)/../msggen.pl $(MSGGENFLAGS) $<