libiconv updates

10.9-libcxx/stable/main/finkinfo/devel/gperf.info → 10.9-libcxx/stable/main/finkinfo/base/gperf.info

@@ -1,9 +1,13 @@
 Package: gperf
 Version: 3.1
-Revision: 1
-Maintainer: David Fang <[email protected]>
-#
-Source: gnu
+Revision: 2
+Essential: yes
+Maintainer: Fink Core Group <[email protected]>
+CustomMirror: <<
+	Primary: http://ftpmirror.gnu.org/%n/
+	Secondary: http://downloads.sourceforge.net/fink/
+<<
+Source: mirror:custom:%n-%v.tar.gz
 Source-Checksum: SHA256(588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2)
 ConfigureParams: --docdir=%p/share/doc/%n
 # There are external deps but mis-orders -I flags, so don't bother
@@ -37,15 +41,13 @@ The doc/gperf.html file explains how the program works,
 the form of the input, what options are available, and hints on
 choosing the best options for particular key words set.
 <<
-DescPort: <<
-Needed by all the EDA stuff I have my eye on (such as
-gEDA).
-<<
 DescPackaging: <<
 Test suite is not parallelized because tests clobber each other's
 object files and output files... lame.  
 
 Former maintainer: Chuck Robey <[email protected]>
+
+Former maintainer: David Fang <[email protected]>
 <<
 Homepage: https://www.gnu.org/software/gperf/gperf.html
 License: GPL

10.9-libcxx/stable/main/finkinfo/base/libiconv.info

@@ -5,7 +5,10 @@ Description: Character set conversion library
 License: LGPL
 Maintainer: Fink Core Group <[email protected]>
 Depends: base-files
-BuildDepends: fink (>= 0.30.0)
+BuildDepends: <<
+	fink (>= 0.30.0),
+	gperf (>= 3.1-1)
+<<
 Essential: yes
 CustomMirror: <<
 	Primary: http://ftpmirror.gnu.org/%n/
@@ -16,26 +19,15 @@ Source-MD5: 7d2a800b952942bb2880efb00cfd524c
 Source2: mirror:sourceforge:fink/gettext-0.20.2.tar.gz
 #Source2: mirror:gnu:gettext/gettext-0.20.2.tar.gz
 Source2-MD5: 30fec34a895fab4c02584449c500aac2
-Source3: mirror:sourceforge:fink/gperf-3.1.tar.gz
-#Source3: mirror:gnu:gperf/gperf-3.1.tar.gz
-Source3-MD5: 9e251c0a618ad0824b51117d5d9db87e
 PatchFile: %n.patch
-PatchFile-MD5: 0680e630945155f90310754f063f099e
+PatchFile-MD5: 5e7d6a1b9c563b71d1ac08a6ad2106cf
 PatchScript: <<
 	cd %b/..; patch -p0 < %{PatchFile}
 <<
 NoSetLDFLAGS: true
 NoSetCPPFLAGS: true
-### gperf builds with g++
-GCC: 4.0
 CompileScript: <<
 #! /bin/sh -ex
-### build gperf
-cd %b/../gperf-3.1
-./configure --prefix=%p
-make
-make -j1 check || exit 2
-
 ### Build our local gettext-runtime.
 ### If gettext gets updated, make sure these ./configure parameters 
 ### match the new package parameters (except build static only here).
@@ -65,7 +57,7 @@ make install DESTDIR=%b/../_inst
 
 ### now build iconv
 cd %b/../libiconv-%v
-make -f Makefile.devel GPERF=%b/../gperf-3.1/src/gperf
+make -f Makefile.devel
 am_cv_func_iconv="yes"
 am_cv_proto_iconv=""
 export am_cv_func_iconv am_cv_proto_iconv
@@ -168,5 +160,12 @@ our build system.
 
  https://stackoverflow.com/questions/24288691/
  why-does-hexadecimal-floating-point-need-to-have-a-specified-exponent
+
+2023-01-08 Daniel Macks
+ Patching iconv.1.html as well as iconv.1 so we don't need to run
+ groff for .1 -> .1.html regeneration. Apple seems to be dropping
+ /usr/bin/groff and fink's groff is heavy and gives circular dep.
+
+ Externalize gperf
 <<
 Homepage: http://www.gnu.org/software/libiconv/

10.9-libcxx/stable/main/finkinfo/base/libiconv.patch

@@ -1718,6 +1718,19 @@ diff -ruN libiconv-1.16-orig/man/iconv.1 libiconv-1.16/man/iconv.1
 -.BR iconv_open (3),
 -.BR locale (7)
 +.BR iconv_open (3)
+diff -ruN libiconv-1.16-orig/man/iconv.1.html libiconv-1.16/man/iconv.1.html
+--- libiconv-1.16-orig/man/iconv.1.html	2019-04-26 15:00:05.000000000 -0400
++++ libiconv-1.16/man/iconv.1.html	2023-01-08 22:04:09.000000000 -0500
+@@ -198,8 +198,7 @@
+
+
+
+-<p style="margin-left:11%; margin-top: 1em"><b>iconv_open</b>(3),
+-<b>locale</b>(7)</p>
++<p style="margin-left:11%; margin-top: 1em"><b>iconv_open</b>(3)</p>
+ <hr>
+ </body>
+ </html>
 diff -ruN libiconv-1.16-orig/src/Makefile.in libiconv-1.16/src/Makefile.in
 --- libiconv-1.16-orig/src/Makefile.in	2019-01-27 16:07:13.000000000 -0600
 +++ libiconv-1.16/src/Makefile.in	2019-09-08 18:27:39.000000000 -0500