[Gsrc-commit] trunk r8409: unifont 14.9.4

[Carl Hansen]

------------------------------------------------------------
revno: 8409
revision-id: carlhansen1234@gmail.com-20220607062855-uk1oe10x7ms4vuug
parent: carlhansen1234@gmail.com-20220606230541-i6a7x2nvg2st1dc4
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Mon 2022-06-06 23:28:55 -0700
message:
  unifont 14.9.4
added:
  pkg/gnu/unifont/files/         files-20220607062719-3ar7y5lc0sd01zdj-1
  pkg/gnu/unifont/files/unifont.14.0.4.diff 
unifont.14.0.4.diff-20220607062719-3ar7y5lc0sd01zdj-2
modified:
  pkg/gnu/unifont/Makefile       makefile-20161021200207-w6apucnpk66hw5ah-3

=== modified file 'pkg/gnu/unifont/Makefile'
--- a/pkg/gnu/unifont/Makefile  2022-06-05 02:09:39 +0000
+++ b/pkg/gnu/unifont/Makefile  2022-06-07 06:28:55 +0000
@@ -18,10 +18,6 @@
 #
 # Send bug reports and comments about GSRC problems to bug-gsrc@gnu.org
 #
-# Note: Version 10.0.0x June 30, 2017, info files not installed in regular 
place, this
-# is being worked on ... or send solution to  bug-gsrc@gnu.org
-# It's in share/unifont/
-#
 # also in work/unifont-xx.xx.xx/Makefile, edit 
 #  USRDIR = usr
 #  to be 
@@ -41,12 +37,12 @@
 utilities to ease adding new glyphs to the font. Includes APL font.
 endef
 ######################################################################
-
+# https://ftp.gnu.org/gnu/unifont/unifont-14.0.04/unifont-14.0.04.tar.gz
 MASTER_SITES = $(MASTER_GNU)
 MASTER_SUBDIR = $(GARNAME)/$(DISTNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-
+PATCHFILES = unifont.14.0.4.diff
 BUILDDEPS =
 LIBDEPS =
 
@@ -63,14 +59,14 @@
 #include ../../../gar/gar.lib/info.mk
 include config.mk
 
-USRDIR:=$(prefix)
-CURDIR := $(WORKSRC)
-DESTDIR := $(prefix)
+#USRDIR:=$(prefix)
+#CURDIR := $(WORKSRC)
+#DESTDIR := $(prefix)
 
-.PHONY: myinstall build-maximally
+.PHONY: install-myinstall build-maximally foo
 
 build-maximally:
-       echo
+       @echo
        cd $(WORKSRC) && $(MAKE) bindir
        cd $(WORKSRC) && $(MAKE) libdir   
        cd $(WORKSRC) && $(MAKE) docdir  
@@ -79,15 +75,17 @@
 
 
 install-myinstall:  
-       echo USRDIR is $(USRDIR)
-       mkdir -p $(prefix)/fonts
-       cd $(WORKSRC) && $(MAKE) install
+       $(MAKE)  -C $(WORKSRC)  V=1  DESTDIR=$(packageprefix) USRDIR="" 
PKGDEST="share" \
+               PREFIX=$(packageprefix)   install
 
-.PHONY: foo
 
 foo:
-       echo ${MAKEFILE_LIST}
-       echo $(prefix) 
-       echo
-       #echo $(.VARIABLES)
+       @echo ${MAKEFILE_LIST}
+       @echo $(prefix) 
+       @echo $(packageDESTDIR) 
+       @echo $(DESTDIR) 
+       @echo
+
+
+#echo $(.VARIABLES)
 

=== added directory 'pkg/gnu/unifont/files'
=== added file 'pkg/gnu/unifont/files/unifont.14.0.4.diff'
--- a/pkg/gnu/unifont/files/unifont.14.0.4.diff 1970-01-01 00:00:00 +0000
+++ b/pkg/gnu/unifont/files/unifont.14.0.4.diff 2022-06-07 06:28:55 +0000
@@ -0,0 +1,45 @@
+diff -x config.log -x config.status -ru tmp/unifont-14.0.04/Makefile 
work/unifont-14.0.04/Makefile
+--- tmp/unifont-14.0.04/Makefile       2022-04-18 14:53:03.000000000 -0700
++++ work/unifont-14.0.04/Makefile      2022-06-06 19:15:46.284896471 -0700
+@@ -18,10 +18,10 @@
+ # in /usr/local.  To install in a different location, modify USRDIR to
+ # your liking.
+ #
+-USRDIR = usr
++#USRDIR = usr
+ # USRDIR = usr/local
+-PREFIX = $(DESTDIR)/$(USRDIR)
+-PKGDEST = $(PREFIX)/share/unifont
++#PREFIX = $(DESTDIR)/$(USRDIR)
++#PKGDEST = $(PREFIX)/share/unifont
+ 
+ VPATH = lib font/plane00 font/ttfsrc
+ 
+diff -x config.log -x config.status -ru tmp/unifont-14.0.04/font/Makefile 
work/unifont-14.0.04/font/Makefile
+--- tmp/unifont-14.0.04/font/Makefile  2022-04-18 14:53:03.000000000 -0700
++++ work/unifont-14.0.04/font/Makefile 2022-06-06 22:44:28.075653873 -0700
+@@ -37,8 +37,8 @@
+ # The top-level directory for installing fonts on the system,
+ # and the installation directories for PCF and TrueType fonts.
+ #
+-CONSOLEDEST = $(DESTDIR)/usr/share/consolefonts
+-FONTDEST    = $(DESTDIR)/usr/share/fonts
++CONSOLEDEST = $(DESTDIR)/share/consolefonts
++FONTDEST    = $(DESTDIR)/share/fonts
+ PCFDEST     = $(FONTDEST)/X11/misc
+ TTFDEST     = $(FONTDEST)/truetype/unifont
+ #
+diff -x config.log -x config.status -ru tmp/unifont-14.0.04/src/Makefile 
work/unifont-14.0.04/src/Makefile
+--- tmp/unifont-14.0.04/src/Makefile   2022-04-16 20:29:15.000000000 -0700
++++ work/unifont-14.0.04/src/Makefile  2022-06-06 22:07:03.281612414 -0700
+@@ -69,8 +69,8 @@
+ install:
+       if [ x$(PREFIX) = x ] ; \
+       then \
+-         @echo "Fatal error: PREFIX directory is not defined." && \
+-         @echo "Run 'make install' from top-level directory" && \
++         echo "Fatal error: PREFIX directory is not defined." && \
++         echo "Run 'make install' from top-level directory" && \
+          exit 1 ; \
+       fi
+       install -m0755 -d $(INSTALLDIR)