[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r9268: bunch fo stuff
|
From: |
Carl Hansen |
|
Subject: |
[Gsrc-commit] trunk r9268: bunch fo stuff |
|
Date: |
Tue, 23 May 2023 01:32:49 -0400 (EDT) |
|
User-agent: |
Bazaar (2.7.0dev1) |
------------------------------------------------------------
revno: 9268
revision-id: carlhansen1234@gmail.com-20230523053242-ye5gh2bd9n2j1a06
parent: carlhansen1234@gmail.com-20230523052854-hvylw36d7xrfbo92
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Mon 2023-05-22 22:32:42 -0700
message:
bunch fo stuff
modified:
gar/gar.lib.mk gar.lib.mk-20160617013741-ul4q527k85thcz4p-1
gar/gar.lib/mesonninja.mk mesonninja.mk-20171030065946-2eocvxzl13nbloqy-1
gar/gar.mk gar.mk-20160617013745-r4h3dj0kiuppihsx-1
pkg/gnu/gawk/Makefile makefile-20160617014725-uokjfnggs70iry9h-673
pkg/gnu/gawk/config.mk config.mk-20160617015443-781w7e9ygcdb0fpl-1
pkg/gnu/intlfonts/Makefile makefile-20160617014725-uokjfnggs70iry9h-1092
pkg/gnu/intlfonts/sha256sums sha256sums-20160617014725-uokjfnggs70iry9h-1097
pkg/gnu/lilypond/Makefile makefile-20160617014725-uokjfnggs70iry9h-1261
pkg/gnu/ncurses/Makefile makefile-20160617014725-uokjfnggs70iry9h-1464
pkg/gnu/ncurses/sha256sums sha256sums-20160617014725-uokjfnggs70iry9h-1469
pkg/gnu/parallel/Makefile makefile-20160617014725-uokjfnggs70iry9h-1517
pkg/gnu/parallel/sha256sums sha256sums-20160617014725-uokjfnggs70iry9h-1523
pkg/other/cfitsio/Makefile makefile-20161003020958-ocsyygda37l792uz-2
pkg/other/cfitsio/config.mk config.mk-20161003020958-ocsyygda37l792uz-3
pkg/other/dataexplorer/Makefile makefile-20171105074456-xx3idwc7ck809ch7-3
pkg/other/python/Makefile makefile-20160617200040-lqf8h520dfq0rtk7-67
pkg/other/python/sha256sums sha256sums-20160617200040-lqf8h520dfq0rtk7-69
pkg/other/xforms/Makefile makefile-20180420074016-nivd16bjprux88i8-4
=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk 2023-05-04 16:56:05 +0000
+++ b/gar/gar.lib.mk 2023-05-23 05:32:42 +0000
@@ -757,6 +757,7 @@
mkdir -p $(packageDESTDIR)$(prefix)
rm -rf $(COOKIEDIR)/install* $(COOKIEDIR)/*install*
$(COOKIEDIR)/sysinstall*
@set -e; \
+ echo in prepare-install \
set -- $(CREATED_MERGE_DIRS); \
echo echoing 1 src... $$1 $$src; \
while [ "$$1" != "" ]; do \
@@ -786,19 +787,21 @@
finish-package-install:
@printf "[$(OK)finish-package-install$(OFF)] $(MSG)Moving files from
staging area packageDESTDIR to packagedir$(OFF)\n"
@set -e; \
+ echo in finish-install \
set -- $(CREATED_MERGE_DIRS); \
while [ "$$1" != "" ]; do \
echo echoing .... finish-package-install to packages t 1 $$1 and
2 $$2; \
- rmdir -v $(packagedotgardir)/$$1 $(OUTPUT) || true; \
- shift; shift; \
+ rmdir -v $(packagedotgardir)/$$1 $(OUTPUT) || true; \
+ shift; shift; \
done $(OUTPUT)
@echo packagedir is $(packagedir)
- # carl rm -rvf $(packagedir) $(OUTPUT)
mkdir -p $(packagedir) $(OUTPUT)
cp -a $(packageDESTDIR)$(prefix)/* $(packagedir)
rm -vrf $(packageDESTDIR) $(OUTPUT); # hmm
@echo end finish-package-install
+#
+# rm -rf $(packagedir) $(OUTPUT)
@@ -1156,6 +1159,8 @@
rm -fr $$1; \
fi; \
}; \
+ normalise $(packagedir)/usr $(packagedir); \
+ normalise $(packagedir)/local $(packagedir); \
normalise $(packagedir)/man $(packagedir)/share/man; \
normalise $(packagedir)/info $(packagedir)/share/info; \
normalise $(packagedir)/doc $(packagedir)/share/doc; \
=== modified file 'gar/gar.lib/mesonninja.mk'
--- a/gar/gar.lib/mesonninja.mk 2023-04-29 05:45:48 +0000
+++ b/gar/gar.lib/mesonninja.mk 2023-05-23 05:32:42 +0000
@@ -1,6 +1,6 @@
# mesonninja.mk --- operations for meson and ninja
-# Copyright (C) 2017, 2018, 2019 Carl Hansen <carlhansen@gnu.org>
+# Copyright (C) 2017, 2018, 2019, 2023 Carl Hansen <carlhansen@gnu.org>
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -15,31 +15,40 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
# still being experimented with, nothing's perfect
# why it NEEDS this, I do not know:
#LC_ALL=C.UTF-8
#LOCALLOCALE="C.UTF-8"
-CONFIGURE_SCRIPTS = mes
-BUILD_SCRIPTS = nin
+CONFIGURE_SCRIPTS += mes
+BUILD_SCRIPTS += nin
#INSTALL_SCRIPTS = ninj
#MESON_BUILD_ROOT = $(PWD)/$(WORKOBJ)
+MESON_SOURCE_ROOT = $(WORKSRC)
+MESON_BUILD_ROOT = $(WORKOBJ)
+
include ../../../gar/gar.mk
+#LC_ALL=$(LOCALLOCALE) meson setup --prefix=$(packageprefix) $(WORKSRC)
$(WORKOBJ)
+#cd $(WORKSRC) && meson setup $(WORKOBJ) --prefix=$(prefix)
+#@echo XXXX cd $(WORKSRC) and.... meson setup $(WORKOBJ)
--prefix=$(prefix)
+
+BUILD_SCRIPTS += build-nin
+
configure-mes:
@echo start configure-mes----------------------------------------------
@echo
- @echo LC_ALL==$(LC_ALL) prefix==$(prefix)
packageprefix==$(packageprefix)
- @echo WORKSRC==$(WORKSRC) WORKOBJ==$(WORKOBJ)
mkdir -p $(WORKOBJ)
- @echo
- cd $(WORKSRC) && meson setup --prefix=$(prefix) ../../$(WORKOBJ)
- @echo
- @echo end configure-mes----------------------------------------------
+ @echo WORKSRC==$(WORKSRC)
+ @echo WORKOBJ==$(WORKOBJ)
+ @echo
+ cd $(WORKSRC) && meson setup ../../$(WORKOBJ) --prefix=$(prefix)
+ @echo mbr $(MESON_BUILD_ROOT)
+ @echo msr $(MESON_SOURCE_ROOT)
+ @echo end.configure-meson----------------------------------------------
$(MAKECOOKIE)
#LC_ALL=C.UTF-8 meson setup $(WORKSRC) $(WORKOBJ)
@@ -64,7 +73,7 @@
@echo start build-nin--------------------------------------------
@echo ----------------------------------------------
@echo LC_ALL==$(LC_ALL) WORKSRC==$(WORKSRC) WORKOBJ==$(WORKOBJ)
- cd $(WORKOBJ) && meson compile -v
+ cd $(WORKOBJ) && pwd && ninja -v -C .
@echo ----------------------------------------------
@echo ----------------------------------------------
@echo end build-nin--------------------------------------------
@@ -91,9 +100,9 @@
#LC_ALL=$(LOCALLOCALE) ninja -C $(WORKOBJ) -v install
#DESTDIR=$(prefix)/packages/$(DISTNAME) LC_ALL=$(LOCALLOCALE) ninja -C
$(WORKOBJ) -v install
+#LC_ALL=$(LOCALLOCALE) ninja -C $(WORKOBJ) -v install
+#DESTDIR=$(prefix)/packages/$(DISTNAME) LC_ALL=$(LOCALLOCALE) ninja -C
$(WORKOBJ) -v install
+#LC_ALL=$(LOCALLOCALE) ninja -C $(WORKOBJ) -v install
+#DESTDIR=$(prefix)/packages/$(DISTNAME) LC_ALL=$(LOCALLOCALE) ninja -C
$(WORKOBJ) -v install
#DESTDIR=$(packageprefix) LC_ALL=$(LOCALLOCALE) ninja -C $(WORKOBJ) -v
install
#echo cp -ra $(prefix)/packages/$(DISTNAME)/*
$(prefix)/packages/$(DISTNAME)-DEST/$(prefix)/
-#cp -ra $(prefix)/packages/$(DISTNAME)/*
$(prefix)/packages/$(DISTNAME)-DEST/$(prefix)/
-
-
-
=== modified file 'gar/gar.mk'
--- a/gar/gar.mk 2023-03-23 06:55:01 +0000
+++ b/gar/gar.mk 2023-05-23 05:32:42 +0000
@@ -47,7 +47,20 @@
DISTNAME ?= $(UPSTREAMNAME)-$(strip $(GARVERSION))
COOKIEDIR ?= cookies/$(DISTNAME)$(strip $(GARPROFILE))
WORKDIR ?= work
+#WORKSRC ?= $(BASEDIRABS)/$(WORKDIR)/$(DISTNAME)
+#WORKOBJ ?= $(BASEDIRABS)/$(WORKDIR)/$(DISTNAME)-build
WORKSRC ?= $(WORKDIR)/$(DISTNAME)
+WORKOBJ ?= $(WORKDIR)/$(DISTNAME)-build
+
+# When we use WORKOBJ, we need to know if it's been changed from the default,
+# and know how to get back out of it to the port dir.
+# old WORKOBJ ?= $(WORKSRC)
+# cwh
+WORKOBJ_CHANGED_P = $(filter-out $(WORKSRC),$(WORKOBJ))
+LEAVE_WORKOBJ = $(subst $(strip ) ,/,$(patsubst %,..,$(subst /, ,$(WORKOBJ))))
+# note: do I need this?
+
+
EXTRACTDIR ?= $(WORKDIR)
LOGDIR ?= logs
SCRATCHDIR ?= tmp
@@ -58,16 +71,6 @@
packagesdir ?= $(prefix)/packages
SRCDIR ?= $(prefix)/src
-# When we use WORKOBJ, we need to know if it's been changed from the default,
-# and know how to get back out of it to the port dir.
-# old WORKOBJ ?= $(WORKSRC)
-# cwh
-WORKOBJ ?= $(WORKSRC)-build
-WORKOBJ_CHANGED_P = $(filter-out $(WORKSRC),$(WORKOBJ))
-LEAVE_WORKOBJ = $(subst $(strip ) ,/,$(patsubst %,..,$(subst /, ,$(WORKOBJ))))
-# note: do I need this?
-
-
ALLFILES ?= $(DISTFILES) $(PATCHFILES) $(SIGFILES)
OLDVERSIONS ?= $(subst $(strip $(GARNAME))-,,$(filter-out $(DISTNAME),$(notdir
$(wildcard $(packagesdir)/$(strip $(GARNAME))-*))))
=== modified file 'pkg/gnu/gawk/Makefile'
--- a/pkg/gnu/gawk/Makefile 2023-05-09 06:58:20 +0000
+++ b/pkg/gnu/gawk/Makefile 2023-05-23 05:32:42 +0000
@@ -49,3 +49,6 @@
include ../../../gar/gar.lib/autotools.mk
include ../../../gar/gar.lib/info.mk
include config.mk
+
+BUILD_ARGS = CFLAGS="-g -Wall -Wextra"
+
=== modified file 'pkg/gnu/gawk/config.mk'
--- a/pkg/gnu/gawk/config.mk 2018-02-25 22:28:24 +0000
+++ b/pkg/gnu/gawk/config.mk 2023-05-23 05:32:42 +0000
@@ -1,4 +1,5 @@
## Configuration options for gawk ##
CONFIGURE_OPTS ?=
-BUILD_OPTS ?= CFLAGS+='-Wl,-L$(prefix)/lib -Wl,-rpath=$(prefix)/lib'
+BUILD_OPTS ?=
+#CFLAGS+='-Wl,-L$(prefix)/lib -Wl,-rpath=$(prefix)/lib'
=== modified file 'pkg/gnu/intlfonts/Makefile'
--- a/pkg/gnu/intlfonts/Makefile 2021-03-14 23:05:51 +0000
+++ b/pkg/gnu/intlfonts/Makefile 2023-05-23 05:32:42 +0000
@@ -38,12 +38,16 @@
MASTER_SUBDIR = $(GARNAME)/
DISTFILES = $(DISTNAME).tar.gz
SIGFILES =
-#PATCHFILES = $(DISTNAME)-fix-install.diff
+PATCHFILES = intlfonts-install.patch
BUILDDEPS =
LIBDEPS =
######################################################################
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
include config.mk
+
+CONFIGURE_ARGS = --with-fontdir=$(prefix)/share/fonts \
+--enable-compress=gzip --with-pcf=yes --with-bdf=yes --with-type1=yes
--with-truetype=yes
+
=== modified file 'pkg/gnu/intlfonts/sha256sums'
--- a/pkg/gnu/intlfonts/sha256sums 2021-03-14 23:05:51 +0000
+++ b/pkg/gnu/intlfonts/sha256sums 2023-05-23 05:32:42 +0000
@@ -1,1 +1,2 @@
cd3b3f186a1468de04593ca61a85d6f07782dcde87e1fd3ac1e31b4ce6f32b9d
download/intlfonts-1.4.2.tar.gz
+f4b027fe642114a275467e02a2fc0138be288bc823942c28792c4ad145410836
download/intlfonts-install.patch
=== modified file 'pkg/gnu/lilypond/Makefile'
--- a/pkg/gnu/lilypond/Makefile 2023-02-12 21:10:23 +0000
+++ b/pkg/gnu/lilypond/Makefile 2023-05-23 05:32:42 +0000
@@ -46,7 +46,7 @@
DISTFILES = $(DISTNAME).tar.gz
SIGFILES =
-BUILDDEPS = ghostscript texinfo bison pkg-config
+BUILDDEPS =# ghostscript texinfo bison pkg-config
# freetype2 pango fontconfig help2man texlive texinfo \
# t1utils imagemagick flex perl dblatex netpbm
# fontforge python2
@@ -57,7 +57,7 @@
######################################################################
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
include config.mk
=== modified file 'pkg/gnu/ncurses/Makefile'
--- a/pkg/gnu/ncurses/Makefile 2023-05-16 16:59:31 +0000
+++ b/pkg/gnu/ncurses/Makefile 2023-05-23 05:32:42 +0000
@@ -22,7 +22,7 @@
NAME = ncurses
GARNAME = ncurses
-GARVERSION = 6.4-20230514
+GARVERSION = 6.4-20230520
GARVERSIONMAJOR = 6.4
HOME_URL = http://www.gnu.org/software/ncurses/
=== modified file 'pkg/gnu/ncurses/sha256sums'
--- a/pkg/gnu/ncurses/sha256sums 2023-05-16 16:59:31 +0000
+++ b/pkg/gnu/ncurses/sha256sums 2023-05-23 05:32:42 +0000
@@ -1,2 +1,2 @@
-706b9b80ff5133dbdc5b2cffb3632d846f88599d513cc710e994c502d64cd7a2
download/ncurses-6.4-20230514.tgz
-d45caff64bfd8966325c6492e3c5e88a2ff40732eabc666f6affb3c94460d2d7
download/ncurses-6.4-20230514.tgz.asc
+a04f69bde2f1b1325d1fb460db7cea28b6da97786ead8ce645daacfb0bcbc004
download/ncurses-6.4-20230520.tgz
+9d4311c1ee185968471d08506a02ae24a4256dca259e1a57b876300566e37c0a
download/ncurses-6.4-20230520.tgz.asc
=== modified file 'pkg/gnu/parallel/Makefile'
--- a/pkg/gnu/parallel/Makefile 2023-04-22 20:45:41 +0000
+++ b/pkg/gnu/parallel/Makefile 2023-05-23 05:32:42 +0000
@@ -22,7 +22,7 @@
NAME = Parallel
GARNAME = parallel
-GARVERSION = 20230422
+GARVERSION = 20230522
HOME_URL = http://www.gnu.org/software/parallel/
DESCRIPTION = Build and execute command lines in parallel
define BLURB
=== modified file 'pkg/gnu/parallel/sha256sums'
--- a/pkg/gnu/parallel/sha256sums 2023-04-22 20:45:41 +0000
+++ b/pkg/gnu/parallel/sha256sums 2023-05-23 05:32:42 +0000
@@ -1,2 +1,2 @@
-9106593d09dc4de0e094b7b14390a309d8fcb1d27104a53814d16937dcbae3c2
download/parallel-20230422.tar.bz2
-b883e03ccda1bbfac429ed3425af272ca748d2a23ae58270121eb9d51aa428c4
download/parallel-20230422.tar.bz2.sig
+1af46b7605023b14360bb968845de6413db24bf0f951f5e0208d23803cb64202
download/parallel-20230522.tar.bz2
+f3248c515501c57653c245a89096530293cc5d0b69ad7d928791b6331c220764
download/parallel-20230522.tar.bz2.sig
=== modified file 'pkg/other/cfitsio/Makefile'
--- a/pkg/other/cfitsio/Makefile 2022-12-11 20:28:44 +0000
+++ b/pkg/other/cfitsio/Makefile 2023-05-23 05:32:42 +0000
@@ -37,24 +37,25 @@
######################################################################
# http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz
MASTER_SITES = http://heasarc.gsfc.nasa.gov/
-MASTER_SUBDIR = /FTP/software/fitsio/c/
+MASTER_SUBDIR = FTP/software/fitsio/c/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
SIGFILES =
LICENSE = from U.S.A. government, paid by tax, free to use in USA, see
License.txt
BUILDDEPS =
LIBDEPS =
+# LDFLAGS = -lcurl
+
+WORKOBJ = $(WORKSRC)
+######################################################################
+
+include ../../../gar/gar.lib/autotools.mk
+include config.mk
+
CONFIGURE_ARGS = --enable-reentrant --enable-sse2 --enable-ssse3 \
--with-gsiftp-flavour --with-gsiftp
-with-bzip2
BUILD_ARGS = shared
-# LDFLAGS = -lcurl
-
-WORKOBJ = $(WORKSRC)
-######################################################################
-
-include ../../../gar/gar.lib/auto.mk
-include config.mk
post-build:
cd $(WORKSRC) && make utils
=== modified file 'pkg/other/cfitsio/config.mk'
--- a/pkg/other/cfitsio/config.mk 2022-10-22 17:06:31 +0000
+++ b/pkg/other/cfitsio/config.mk 2023-05-23 05:32:42 +0000
@@ -1,4 +1,5 @@
## Configuration options ##
CONFIGURE_OPTS ?=
-BUILD_OPTS ?= shared
+BUILD_OPTS ?=
+#BUILD_OPTS ?= shared
=== modified file 'pkg/other/dataexplorer/Makefile'
--- a/pkg/other/dataexplorer/Makefile 2023-05-15 00:41:46 +0000
+++ b/pkg/other/dataexplorer/Makefile 2023-05-23 05:32:42 +0000
@@ -46,16 +46,13 @@
######################################################################
include ../../../gar/gar.lib/autotools.mk
+include ../../../gar/varb.mk
include config.mk
pre-build:
ant -Dprefix=$(packageprefix) -f $(WORKSRC)/build/build.xml install
$(MAKECOOKIE)
-inf:
- echo HERE IT GOES $(prefix)/packages/$(DISTNAME)
- mkdir -p $(prefix)/packages/$(DISTNAME)
- echo PREFIX=$(packageprefix)
pre-install: build
mkdir -p $(prefix)/packages/$(DISTNAME)
=== modified file 'pkg/other/python/Makefile'
--- a/pkg/other/python/Makefile 2023-03-07 22:37:12 +0000
+++ b/pkg/other/python/Makefile 2023-05-23 05:32:42 +0000
@@ -1,5 +1,5 @@
# Copyright © 2014, 2015, 2016, 2017 Brandon Invergo <brandon@invergo.net>
-# Copyright ©2017, 2018, 2019, 2020, 2021, 2022 Carl Hansen
<carlhansen@gnu.org>
+# Copyright ©2017-2023 Carl Hansen <carlhansen@gnu.org>
#
# This file is part of BioSRC and GSRC, the GNU Source Release Collection.
# http://www.gnu.org/software/gsrc
@@ -23,7 +23,7 @@
NAME = Python
GARNAME = python
UPSTREAMNAME = Python
-GARVERSION = 3.11.2
+GARVERSION = 3.11.3
BASEVERSION = 3.11
HOME_URL = http://python.org
DESCRIPTION = A general-purpose, high-level programming language
=== modified file 'pkg/other/python/sha256sums'
--- a/pkg/other/python/sha256sums 2023-03-07 22:37:12 +0000
+++ b/pkg/other/python/sha256sums 2023-05-23 05:32:42 +0000
@@ -1,2 +1,2 @@
-29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af
download/Python-3.11.2.tar.xz
-7d86ced5b48710e8c5be4da40484037e8f79b3733d35dd6c7ac08b431e482011
download/Python-3.11.2.tar.xz.sig
+8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e
download/Python-3.11.3.tar.xz
+54ccb5c57ba1a7e7e3d8977986a267f3f8eb334bf82decdbbbfd9a036b9995fc
download/Python-3.11.3.tar.xz.sig
=== modified file 'pkg/other/xforms/Makefile'
--- a/pkg/other/xforms/Makefile 2021-12-02 08:38:12 +0000
+++ b/pkg/other/xforms/Makefile 2023-05-23 05:32:42 +0000
@@ -46,7 +46,7 @@
# todo: get git
######################################################################
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
include config.mk
.PHONY: pre-configure
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r9268: bunch fo stuff,
Carl Hansen <=