Fri Jul 31 17:01:44 2020 UTC ()
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/


(brook)
diff -r1.18 -r1.19 pkgsrc/textproc/openjade/distinfo
diff -r0 -r1.1 pkgsrc/textproc/openjade/patches/patch-Makefile.comm.in
diff -r1.3 -r1.4 pkgsrc/textproc/openjade/patches/patch-aa
diff -r1.4 -r1.5 pkgsrc/textproc/openjade/patches/patch-ab
cvs diff -r1.18 -r1.19 pkgsrc/textproc/openjade/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/openjade/distinfo 2020/04/30 23:46:13 1.18
+++ pkgsrc/textproc/openjade/distinfo 2020/07/31 17:01:44 1.19
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: distinfo,v 1.18 2020/04/30 23:46:13 joerg Exp $ 1$NetBSD: distinfo,v 1.19 2020/07/31 17:01:44 brook Exp $
2 2
3SHA1 (openjade-1.3.2.tar.gz) = 54e1999f41450fbd62c5d466002d79d3efca2321 3SHA1 (openjade-1.3.2.tar.gz) = 54e1999f41450fbd62c5d466002d79d3efca2321
4RMD160 (openjade-1.3.2.tar.gz) = 3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2 4RMD160 (openjade-1.3.2.tar.gz) = 3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2
5SHA512 (openjade-1.3.2.tar.gz) = c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1 5SHA512 (openjade-1.3.2.tar.gz) = c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
6Size (openjade-1.3.2.tar.gz) = 894834 bytes 6Size (openjade-1.3.2.tar.gz) = 894834 bytes
7SHA1 (patch-aa) = 4914f08b6598d25af7b7f99a58e1e6490d292609 7SHA1 (patch-Makefile.comm.in) = 79ece1241a42e99eae8130be30adef42bc7bad84
8SHA1 (patch-ab) = 5e50562cf860c713b581247e223130ee7ef409b9 8SHA1 (patch-aa) = cf55d4812e9bd5592ceb71e972c62c10de1bd02c
 9SHA1 (patch-ab) = 7f54b7b2e52da456b673c9f0f539d03ef0850e81
9SHA1 (patch-ac) = 2492ccb9bd736318ecd5c37f1b2a963f3ff188ab 10SHA1 (patch-ac) = 2492ccb9bd736318ecd5c37f1b2a963f3ff188ab
10SHA1 (patch-ad) = f8c950cc4a0ffb5bdba315a298c14a3e7ebcd637 11SHA1 (patch-ad) = f8c950cc4a0ffb5bdba315a298c14a3e7ebcd637
11SHA1 (patch-ae) = b67fde4062691b2d953cb4cb5b4ebd2428c3c285 12SHA1 (patch-ae) = b67fde4062691b2d953cb4cb5b4ebd2428c3c285
12SHA1 (patch-af) = 1e0db04b5b85ad3b71066e55f94bf3144d69efe5 13SHA1 (patch-af) = 1e0db04b5b85ad3b71066e55f94bf3144d69efe5
13SHA1 (patch-jade_HtmlFOTBuilder.cxx) = 98643b1159b6f22ae8e77ac3e8c5f431c167ce83 14SHA1 (patch-jade_HtmlFOTBuilder.cxx) = 98643b1159b6f22ae8e77ac3e8c5f431c167ce83
14SHA1 (patch-jade_TeXFOTBuilder.cxx) = 037953d73d896afae7531e313821224ccd1e30e4 15SHA1 (patch-jade_TeXFOTBuilder.cxx) = 037953d73d896afae7531e313821224ccd1e30e4
15SHA1 (patch-jade_TransformFOTBuilder.cxx) = cf4c51f05f95e31111a7e48d7984397ba4850e7d 16SHA1 (patch-jade_TransformFOTBuilder.cxx) = cf4c51f05f95e31111a7e48d7984397ba4850e7d
16SHA1 (patch-msggen.pl) = d55befeb6f859c9c3330c2083fce5d5281a496ef 17SHA1 (patch-msggen.pl) = d55befeb6f859c9c3330c2083fce5d5281a496ef
17SHA1 (patch-style_Collector.h) = b07289e9b2011f8059c68794aee803b0f278fd3f 18SHA1 (patch-style_Collector.h) = b07289e9b2011f8059c68794aee803b0f278fd3f
18SHA1 (patch-style_primitive.cxx) = a7f3328c436c9a73805cdd1abb4321f156b94c6e 19SHA1 (patch-style_primitive.cxx) = a7f3328c436c9a73805cdd1abb4321f156b94c6e
File Added: pkgsrc/textproc/openjade/patches/patch-Makefile.comm.in
$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) $<
cvs diff -r1.3 -r1.4 pkgsrc/textproc/openjade/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/openjade/patches/patch-aa 2003/11/16 14:01:20 1.3
+++ pkgsrc/textproc/openjade/patches/patch-aa 2020/07/31 17:01:44 1.4
@@ -1,17 +1,20 @@ @@ -1,17 +1,20 @@
1$NetBSD: patch-aa,v 1.3 2003/11/16 14:01:20 agc Exp $ 1$NetBSD: patch-aa,v 1.4 2020/07/31 17:01:44 brook Exp $
2 2
3--- configure.orig Sun Nov 9 21:44:24 2003 3Explicitly remove all write permissions from files. See
4+++ configure Sun Nov 9 21:45:58 2003 4https://sourceforge.net/p/openjade/patches/49/
 5
 6--- configure.orig 2002-12-01 16:18:40.000000000 +0000
 7+++ configure
5@@ -4899,16 +4899,16 @@ 8@@ -4899,16 +4899,16 @@
6  9
7 fi 10 fi
8  11
9-echo "$as_me:$LINENO: checking for towupper" >&5 12-echo "$as_me:$LINENO: checking for towupper" >&5
10-echo $ECHO_N "checking for towupper... $ECHO_C" >&6 13-echo $ECHO_N "checking for towupper... $ECHO_C" >&6
11-if test "${ac_cv_func_towupper+set}" = set; then 14-if test "${ac_cv_func_towupper+set}" = set; then
12+echo "$as_me:$LINENO: checking for wcsxfrm" >&5 15+echo "$as_me:$LINENO: checking for wcsxfrm" >&5
13+echo $ECHO_N "checking for wcsxfrm... $ECHO_C" >&6 16+echo $ECHO_N "checking for wcsxfrm... $ECHO_C" >&6
14+if test "${ac_cv_func_wcsxfrm+set}" = set; then 17+if test "${ac_cv_func_wcsxfrm+set}" = set; then
15 echo $ECHO_N "(cached) $ECHO_C" >&6 18 echo $ECHO_N "(cached) $ECHO_C" >&6
16 else 19 else
17 cat >conftest.$ac_ext <<_ACEOF 20 cat >conftest.$ac_ext <<_ACEOF
@@ -58,13 +61,22 @@ $NetBSD: patch-aa,v 1.3 2003/11/16 14:01 @@ -58,13 +61,22 @@ $NetBSD: patch-aa,v 1.3 2003/11/16 14:01
58+ac_cv_func_wcsxfrm=no 61+ac_cv_func_wcsxfrm=no
59 fi 62 fi
60 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 63 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
61 fi 64 fi
62-echo "$as_me:$LINENO: result: $ac_cv_func_towupper" >&5 65-echo "$as_me:$LINENO: result: $ac_cv_func_towupper" >&5
63-echo "${ECHO_T}$ac_cv_func_towupper" >&6 66-echo "${ECHO_T}$ac_cv_func_towupper" >&6
64-if test $ac_cv_func_towupper = yes; then 67-if test $ac_cv_func_towupper = yes; then
65+echo "$as_me:$LINENO: result: $ac_cv_func_wcsxfrm" >&5 68+echo "$as_me:$LINENO: result: $ac_cv_func_wcsxfrm" >&5
66+echo "${ECHO_T}$ac_cv_func_wcsxfrm" >&6 69+echo "${ECHO_T}$ac_cv_func_wcsxfrm" >&6
67+if test $ac_cv_func_wcsxfrm = yes; then 70+if test $ac_cv_func_wcsxfrm = yes; then
68 cat >>confdefs.h <<\_ACEOF 71 cat >>confdefs.h <<\_ACEOF
69 #define SP_HAVE_WCHAR 1 72 #define SP_HAVE_WCHAR 1
70 _ACEOF 73 _ACEOF
 74@@ -7358,7 +7358,7 @@
 75 # the output directory. Thus, making CWD read-only will cause this test
 76 # to fail, enabling locking or at least warning the user not to do parallel
 77 # builds.
 78-chmod -w .
 79+chmod a-w .
 80 save_CFLAGS="$CFLAGS"
 81 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 82 compiler_c_o=no
cvs diff -r1.4 -r1.5 pkgsrc/textproc/openjade/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/textproc/openjade/patches/patch-ab 2017/07/15 14:34:15 1.4
+++ pkgsrc/textproc/openjade/patches/patch-ab 2020/07/31 17:01:44 1.5
@@ -1,13 +1,18 @@ @@ -1,13 +1,18 @@
1$NetBSD: patch-ab,v 1.4 2017/07/15 14:34:15 wiz Exp $ 1$NetBSD: patch-ab,v 1.5 2020/07/31 17:01:44 brook Exp $
 2
 3Use --tag explicitly to always detect the correct compiler. See
 4https://sourceforge.net/p/openjade/patches/48/
 5
 6Include $(LDFLAGS) in linker arguments.
2 7
3--- Makefile.lib.in.orig 2002-01-22 11:57:53.000000000 +0000 8--- Makefile.lib.in.orig 2002-01-22 11:57:53.000000000 +0000
4+++ Makefile.lib.in 9+++ Makefile.lib.in
5@@ -23,7 +23,7 @@ Makefile.lt: 10@@ -23,7 +23,7 @@ Makefile.lt:
6 echo 'LT_OBJS='`echo $(OBJS)|sed 's/\.o/.lo/g'` >Makefile.lt 11 echo 'LT_OBJS='`echo $(OBJS)|sed 's/\.o/.lo/g'` >Makefile.lt
7  12
8 lib$(LIB).la: $(LT_OBJS) 13 lib$(LIB).la: $(LT_OBJS)
9- $(LIBTOOL) --mode=link $(CC) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \ 14- $(LIBTOOL) --mode=link $(CC) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
10+ $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(LDFLAGS) -o lib$(LIB).la $(LT_OBJS) \ 15+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LINKFLAGS) $(LDFLAGS) -o lib$(LIB).la $(LT_OBJS) \
11 -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS) 16 -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS)
12  17
13 install: 18 install: