gsrc-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gsrc-commit] trunk r10059: gnome and other stuff


From: Carl Hansen
Subject: [Gsrc-commit] trunk r10059: gnome and other stuff
Date: Mon, 18 Mar 2024 00:43:53 -0400 (EDT)
User-agent: Bazaar (2.7.0dev1)

------------------------------------------------------------
revno: 10059
revision-id: carlhansen@gnu.org-20240318044343-oezalm5pl2cxqx7m
parent: carlhansen@gnu.org-20240318020234-j5hrwlb77mlixmux
committer: carlhansen@gnu.org
branch nick: trunk
timestamp: Mon 2024-03-18 04:43:43 +0000
message:
  gnome and other stuff
removed:
  pkg/gnu/userv/files/           files-20160617014725-uokjfnggs70iry9h-1947
  pkg/gnu/userv/files/userv-1.0.5-fix-install.diff 
userv1.0.5fixinstall-20160617014725-uokjfnggs70iry9h-2243
modified:
  gar/gar.lib.mk                 gar.lib.mk-20160617013741-ul4q527k85thcz4p-1
  gar/gar.lib/mesonninja.mk      mesonninja.mk-20171030065946-2eocvxzl13nbloqy-1
  pkg/gnome/evince/Makefile      makefile-20160617013746-7ygosxqw3lxxvo7f-429
  pkg/gnome/evince/sha256sums    sha256sums-20160617013746-7ygosxqw3lxxvo7f-433
  pkg/gnome/gnome-music/Makefile makefile-20160617013746-7ygosxqw3lxxvo7f-712
  pkg/gnome/gnome-music/sha256sums 
sha256sums-20160617013746-7ygosxqw3lxxvo7f-716
  pkg/gnome/gnome-settings-daemon/Makefile 
makefile-20160617013746-7ygosxqw3lxxvo7f-757
  pkg/gnome/gnome-settings-daemon/sha256sums 
sha256sums-20160617013746-7ygosxqw3lxxvo7f-761
  pkg/gnome/gnome-tweaks/Makefile makefile-20180806221833-495qgk0vqnvmrghx-3
  pkg/gnome/gnome-tweaks/sha256sums sha256sums-20180806221833-495qgk0vqnvmrghx-4
  pkg/gnome/gnome-user-docs/Makefile 
makefile-20160617013746-7ygosxqw3lxxvo7f-822
  pkg/gnome/gnome-user-docs/sha256sums 
sha256sums-20160617013746-7ygosxqw3lxxvo7f-826
  pkg/gnome/gsettings-desktop-schemas/Makefile 
makefile-20160617013746-7ygosxqw3lxxvo7f-877
  pkg/gnome/gsettings-desktop-schemas/sha256sums 
sha256sums-20160617013746-7ygosxqw3lxxvo7f-881
  pkg/gnome/gtk/Makefile         makefile-20201216222440-dedqtlivmsoq83tk-3
  pkg/gnome/gtk/sha256sums       sha256sums-20201216222440-dedqtlivmsoq83tk-4
  pkg/gnome/gtkmm/Makefile       makefile-20160617013746-7ygosxqw3lxxvo7f-937
  pkg/gnome/gtkmm/sha256sums     sha256sums-20160617013746-7ygosxqw3lxxvo7f-941
  pkg/gnome/librsvg/Makefile     makefile-20160617013746-7ygosxqw3lxxvo7f-1174
  pkg/gnome/librsvg/sha256sums   sha256sums-20160617013746-7ygosxqw3lxxvo7f-1178
  pkg/gnome/tecla/Makefile       makefile-20230924005433-9fk3a2nllk1f5iq7-3
  pkg/gnome/tecla/sha256sums     sha256sums-20230924005433-9fk3a2nllk1f5iq7-4
  pkg/gnu/gcc14snapshot/Makefile makefile-20230508001224-jov11dcplqva52ce-3
  pkg/gnu/gnugo/Makefile         makefile-20160617014725-uokjfnggs70iry9h-819
  pkg/gnu/userv/Makefile         makefile-20160617014725-uokjfnggs70iry9h-1943
=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk    2024-01-22 03:28:18 +0000
+++ b/gar/gar.lib.mk    2024-03-18 04:43:43 +0000
@@ -795,17 +795,18 @@
            rmdir -v $(packagedotgardir)/$$1 $(OUTPUT) || true; \
            shift; shift; \
         done $(OUTPUT)
-       @echo making $(packagedir)
+       @echo making directory $(packagedir)
        mkdir -p $(packagedir) $(OUTPUT)
        @echo  $(packageDESTDIR)$(prefix)
        touch  $(packageDESTDIR)$(prefix)/test1
-       if { cp -a $(packageDESTDIR)$(prefix)/* $(packagedir)  ; } ; then \
+       cp -a $(packageDESTDIR)$(prefix)/* $(packagedir)  
+       if [ -d $(packagedir)  ]    ; then \
            rm -rf $(packageDESTDIR) $(OUTPUT); \
-           else echo "some problem in finish-patkage-install"; \
+           else echo "not erasing DESTDIR for now"; \
        fi ;
        @echo end of finish-package-install
 
- 
+# FIXME test1 
 
 
 GNU_INSTALL_ARGS = \

=== modified file 'gar/gar.lib/mesonninja.mk'
--- a/gar/gar.lib/mesonninja.mk 2023-05-23 05:32:42 +0000
+++ b/gar/gar.lib/mesonninja.mk 2024-03-18 04:43:43 +0000
@@ -73,7 +73,7 @@
        @echo start build-nin--------------------------------------------
        @echo ----------------------------------------------
        @echo LC_ALL==$(LC_ALL) WORKSRC==$(WORKSRC)  WORKOBJ==$(WORKOBJ)
-       cd $(WORKOBJ)  &&  pwd && ninja  -v -C .  
+       cd $(WORKOBJ)  &&  pwd && ninja -k 0  -v -C .  
        @echo ----------------------------------------------
        @echo ----------------------------------------------
        @echo end build-nin--------------------------------------------

=== modified file 'pkg/gnome/evince/Makefile'
--- a/pkg/gnome/evince/Makefile 2023-09-24 06:00:15 +0000
+++ b/pkg/gnome/evince/Makefile 2024-03-18 04:43:43 +0000
@@ -20,7 +20,7 @@
 
 NAME =    evince
 GARNAME = evince
-GARVERSION = 45.0
+GARVERSION = 46.0
 HOME_URL = https://wiki.gnome.org/Apps/Evince 
 DESCRIPTION = View multipage documents, ps pdf etc
 define BLURB

=== modified file 'pkg/gnome/evince/sha256sums'
--- a/pkg/gnome/evince/sha256sums       2023-09-24 06:00:15 +0000
+++ b/pkg/gnome/evince/sha256sums       2024-03-18 04:43:43 +0000
@@ -1,2 +1,2 @@
-d18647d4275cbddf0d32817b1d04e307342a85be914ec4dad2d8082aaf8aa4a8  
download/evince-45.0.tar.xz
-e22a41674e766ca2b3dd1f556c582bcbb587bdeb40c05f72e99760050139b824  
download/evince-45.0.sha256sum
+aff6af69392c04956bfad976dec5d1583b41d5a334e937995f7c3ca0740de221  
download/evince-46.0.tar.xz
+22781c66258b11ab35bfbb9c971a8aee41d0921857bc269b57d11e55a980db9d  
download/evince-46.0.sha256sum

=== modified file 'pkg/gnome/gnome-music/Makefile'
--- a/pkg/gnome/gnome-music/Makefile    2023-09-18 06:27:54 +0000
+++ b/pkg/gnome/gnome-music/Makefile    2024-03-18 04:43:43 +0000
@@ -19,7 +19,7 @@
 
 NAME =    gnome-music
 GARNAME = gnome-music
-GARVERSION = 45.0
+GARVERSION = 46.0
 HOME_URL = http://www.gnome.org/
 DESCRIPTION = Music player and management application
 define BLURB

=== modified file 'pkg/gnome/gnome-music/sha256sums'
--- a/pkg/gnome/gnome-music/sha256sums  2023-09-18 06:27:54 +0000
+++ b/pkg/gnome/gnome-music/sha256sums  2024-03-18 04:43:43 +0000
@@ -1,2 +1,2 @@
-33e770166226a74537d4c10b1538efa8842494ffe9bf2c90a16cab98ab997bdf  
download/gnome-music-45.0.tar.xz
-7845981d5040272630eb8aea99868f8b01e23d999436e38b2ed596f0c4deeace  
download/gnome-music-45.0.sha256sum
+a450d5ce016892f6af2f8ab71fc7c394382e22c7b620ba92a6e15cf66bc5ec5f  
download/gnome-music-46.0.tar.xz
+2b81bb57e0631c195b5c01373ce9876841255812dc9ddf946150e6e04772c30f  
download/gnome-music-46.0.sha256sum

=== modified file 'pkg/gnome/gnome-settings-daemon/Makefile'
--- a/pkg/gnome/gnome-settings-daemon/Makefile  2023-12-23 22:21:39 +0000
+++ b/pkg/gnome/gnome-settings-daemon/Makefile  2024-03-18 04:43:43 +0000
@@ -20,7 +20,7 @@
 
 NAME =    gnome-settings-daemon
 GARNAME = gnome-settings-daemon
-GARVERSION = 45.1
+GARVERSION = 46.0
 HOME_URL = http://www.gnome.org/
 DESCRIPTION = GNOME Settings Daemon
 define BLURB

=== modified file 'pkg/gnome/gnome-settings-daemon/sha256sums'
--- a/pkg/gnome/gnome-settings-daemon/sha256sums        2023-12-23 22:21:39 
+0000
+++ b/pkg/gnome/gnome-settings-daemon/sha256sums        2024-03-18 04:43:43 
+0000
@@ -1,2 +1,2 @@
-c62bfec9817eee5b83ebe901a9286189a67eb5ff033c5dd41506574f822bf090  
download/gnome-settings-daemon-45.1.tar.xz
-a372eb089fce3848d92ed7d708a6926a308a6154323fae6a22f440d75859fe44  
download/gnome-settings-daemon-45.1.sha256sum
+0b9a0f64fa18a8e7e09b4c95a3f754fa033c2cdbd2dc35701f0618572c1cb3d7  
download/gnome-settings-daemon-46.0.tar.xz
+812dfd730eded069580df5de181df2e0b4edafcfda45ba588228d60652426d44  
download/gnome-settings-daemon-46.0.sha256sum

=== modified file 'pkg/gnome/gnome-tweaks/Makefile'
--- a/pkg/gnome/gnome-tweaks/Makefile   2024-02-11 19:16:58 +0000
+++ b/pkg/gnome/gnome-tweaks/Makefile   2024-03-18 04:43:43 +0000
@@ -19,7 +19,7 @@
 
 NAME =    gnome-tweaks
 GARNAME = gnome-tweaks
-GARVERSION = 45.0
+GARVERSION = 46.0
 HOME_URL = http://www.gnome.org/
 DESCRIPTION = Customize advanced GNOME  options
 define BLURB

=== modified file 'pkg/gnome/gnome-tweaks/sha256sums'
--- a/pkg/gnome/gnome-tweaks/sha256sums 2023-09-24 06:00:15 +0000
+++ b/pkg/gnome/gnome-tweaks/sha256sums 2024-03-18 04:43:43 +0000
@@ -1,3 +1,2 @@
-253994658ae861794d0c6e0e0f475dfe1caf277e3674b8792790238f34cfd6ee  
download/gnome-tweaks-45.0.tar.xz
-a34761e93ec4f5f18af9bb08802b279790ec0645b3440987b6255f75a88185f1  
download/gnome-tweaks-45.0.sha256sum
-f0e6e1d8fb549e8de8adc0c1e9c40d829f9ac82ad15b9f31eeb2313b56a75de2  
download/gnome-tweaks.patch
+1678786341f664ac4580784222a16409fa9bf5cc7a5f1b46dcefd2aa13ddba31  
download/gnome-tweaks-46.0.tar.xz
+8966978925c5207448b73c95b1bf9c08532feb631869b9e9f81b2473de1a11e7  
download/gnome-tweaks-46.0.sha256sum

=== modified file 'pkg/gnome/gnome-user-docs/Makefile'
--- a/pkg/gnome/gnome-user-docs/Makefile        2023-11-02 04:58:40 +0000
+++ b/pkg/gnome/gnome-user-docs/Makefile        2024-03-18 04:43:43 +0000
@@ -19,7 +19,7 @@
 
 NAME =    gnome-user-docs
 GARNAME = gnome-user-docs
-GARVERSION = 45.1
+GARVERSION = 46.0
 HOME_URL = http://www.gnome.org/
 DESCRIPTION = User and system administration help
 define BLURB

=== modified file 'pkg/gnome/gnome-user-docs/sha256sums'
--- a/pkg/gnome/gnome-user-docs/sha256sums      2023-10-22 20:00:58 +0000
+++ b/pkg/gnome/gnome-user-docs/sha256sums      2024-03-18 04:43:43 +0000
@@ -1,2 +1,2 @@
-2f90c6827b5f1605df2edfbea2b342870300a9a981bc392dc96214d967f3adf1  
download/gnome-user-docs-45.1.tar.xz
-9be3a9232d96c92ba5210b9ee346a23794d9b21cd9b1a48bb09a6aed4896a1c1  
download/gnome-user-docs-45.1.sha256sum
+8c18ae0c4a0c142e193111b713c959813441bb5d9df25977b13818f6e4ae6291  
download/gnome-user-docs-46.0.tar.xz
+c21fcd21dd58925c7b051beb3d254cc5948871cf19c4a718661c3e6ccb873a52  
download/gnome-user-docs-46.0.sha256sum

=== modified file 'pkg/gnome/gsettings-desktop-schemas/Makefile'
--- a/pkg/gnome/gsettings-desktop-schemas/Makefile      2023-09-18 06:27:54 
+0000
+++ b/pkg/gnome/gsettings-desktop-schemas/Makefile      2024-03-18 04:43:43 
+0000
@@ -20,7 +20,7 @@
 
 NAME =    gsettings-desktop-schemas
 GARNAME = gsettings-desktop-schemas
-GARVERSION = 45.0
+GARVERSION = 46.0
 HOME_URL = http://www.gnome.org/
 DESCRIPTION = Shared GSettings schemas for the desktop 
 define BLURB

=== modified file 'pkg/gnome/gsettings-desktop-schemas/sha256sums'
--- a/pkg/gnome/gsettings-desktop-schemas/sha256sums    2023-09-18 06:27:54 
+0000
+++ b/pkg/gnome/gsettings-desktop-schemas/sha256sums    2024-03-18 04:43:43 
+0000
@@ -1,2 +1,2 @@
-365c8d04daf79b38c8b3dc9626349a024f9e4befdd31fede74b42f7a9fbe0ae2  
download/gsettings-desktop-schemas-45.0.tar.xz
-bc8723dea5a4e7c07dfcfce0e46d8c1c4e7e207c099e46cd3ae9bf4e272e0d81  
download/gsettings-desktop-schemas-45.0.sha256sum
+493a46a1161b6388d57aa72f632a79ce96c42d5ffbd1d0b00f496ec5876f8575  
download/gsettings-desktop-schemas-46.0.tar.xz
+08f095d420e8dd864fd29314c11802a11e8a6fffb9429cb90067c87c5aafd43d  
download/gsettings-desktop-schemas-46.0.sha256sum

=== modified file 'pkg/gnome/gtk/Makefile'
--- a/pkg/gnome/gtk/Makefile    2024-03-12 18:52:55 +0000
+++ b/pkg/gnome/gtk/Makefile    2024-03-18 04:43:43 +0000
@@ -21,7 +21,7 @@
 
 NAME =    GTK 4
 GARNAME = gtk
-GARVERSION = 4.14.0
+GARVERSION = 4.14.1
 HOME_URL = http://www.gnome.org/
 DESCRIPTION =  gtk 4 GNOME toolkit to create user interfaces
 define BLURB

=== modified file 'pkg/gnome/gtk/sha256sums'
--- a/pkg/gnome/gtk/sha256sums  2024-03-12 18:52:55 +0000
+++ b/pkg/gnome/gtk/sha256sums  2024-03-18 04:43:43 +0000
@@ -1,2 +1,2 @@
-3821124067258d4a1f0ab581a56df68768036e66f072eec7e12867949ad0f810  
download/gtk-4.14.0.tar.xz
-6dce9824d13b497c48d55ce0304e1d538e2344498fcbca0e42e88279ff5578a6  
download/gtk-4.14.0.sha256sum
+fcefb3f132f8cc4711a9efa5b353c9ae9bb5eeff0246fa74dbc2f2f839b9e308  
download/gtk-4.14.1.tar.xz
+5641ccd61b52e7036959940d318336c719fe75f8a5a13628b35094e3153d1e50  
download/gtk-4.14.1.sha256sum

=== modified file 'pkg/gnome/gtkmm/Makefile'
--- a/pkg/gnome/gtkmm/Makefile  2024-02-05 23:23:26 +0000
+++ b/pkg/gnome/gtkmm/Makefile  2024-03-18 04:43:43 +0000
@@ -20,7 +20,7 @@
 
 NAME =    gtkmm
 GARNAME = gtkmm
-GARVERSION = 4.13.3
+GARVERSION = 4.14.0
 #HOME_URL = http://www.gnome.org/
 HOME_URL = http://www.gtkmm.org/
 DESCRIPTION = C++ bindings for GTK+

=== modified file 'pkg/gnome/gtkmm/sha256sums'
--- a/pkg/gnome/gtkmm/sha256sums        2024-02-05 23:23:26 +0000
+++ b/pkg/gnome/gtkmm/sha256sums        2024-03-18 04:43:43 +0000
@@ -1,2 +1,2 @@
-302e7ef681f818d4cf2a75ac2ef3175683fdebfff4c1dfa974331f73f51a05a9  
download/gtkmm-4.13.3.tar.xz
-69ca1de61632ab0b35350249fd8f3730c5e242b300916e583081c27b1dd85b08  
download/gtkmm-4.13.3.sha256sum
+9350a0444b744ca3dc69586ebd1b6707520922b6d9f4f232103ce603a271ecda  
download/gtkmm-4.14.0.tar.xz
+136e8eb8a3b35965e182c21e28b6aac624e6436312aeae03c59709aadecf2f21  
download/gtkmm-4.14.0.sha256sum

=== modified file 'pkg/gnome/librsvg/Makefile'
--- a/pkg/gnome/librsvg/Makefile        2024-03-12 20:35:19 +0000
+++ b/pkg/gnome/librsvg/Makefile        2024-03-18 04:43:43 +0000
@@ -20,7 +20,7 @@
 
 NAME =    librsvg
 GARNAME = librsvg
-GARVERSION = 2.57.92
+GARVERSION = 2.58.0
 HOME_URL = http://www.gnome.org/
 DESCRIPTION = SVG rendering library
 define BLURB

=== modified file 'pkg/gnome/librsvg/sha256sums'
--- a/pkg/gnome/librsvg/sha256sums      2024-03-12 20:35:19 +0000
+++ b/pkg/gnome/librsvg/sha256sums      2024-03-18 04:43:43 +0000
@@ -1,2 +1,2 @@
-2a2c30beabf3cfdd40a4a6dbed3fb33e677caee5d8f304788249b731e7be3852  
download/librsvg-2.57.92.tar.xz
-7e13c487c5ebd81f71988686d19aa94835feb276088e5a3302b77a6a033c0ed0  
download/librsvg-2.57.92.sha256sum
+d7c444a926406b59790be0deae196e18ed26059da573fa1aa9ec9ca7658a559c  
download/librsvg-2.58.0.tar.xz
+2e4f4557fe910ee355b16a25cbd1e896c49a0b2ce6ddf661ebb1226efe3c8f35  
download/librsvg-2.58.0.sha256sum

=== modified file 'pkg/gnome/tecla/Makefile'
--- a/pkg/gnome/tecla/Makefile  2023-09-24 06:00:15 +0000
+++ b/pkg/gnome/tecla/Makefile  2024-03-18 04:43:43 +0000
@@ -20,7 +20,7 @@
 
 NAME =    tecla
 GARNAME = tecla
-GARVERSION = 45.0
+GARVERSION = 46.0
 HOME_URL = http://www.gnome.org/
 DESCRIPTION =  tecla
 define BLURB

=== modified file 'pkg/gnome/tecla/sha256sums'
--- a/pkg/gnome/tecla/sha256sums        2023-09-24 06:00:15 +0000
+++ b/pkg/gnome/tecla/sha256sums        2024-03-18 04:43:43 +0000
@@ -1,2 +1,2 @@
-5c02bb4019b1cffb5663da6107503eff853836a8783dd4705dd04a49f7adc25b  
download/tecla-45.0.tar.xz
-7a2e68ad36d9f4165917ebe814f2d65a37dbfcf6f76bddc722eac29cfe6610d5  
download/tecla-45.0.sha256sum
+4a081eab867a5a8b09758991cad7645920f323aabca954408290fb6f44591b0f  
download/tecla-46.0.tar.xz
+cd2ca45f08bc922364357c264766f467c4d6eb104ffa24a8b6b16f28aadd861e  
download/tecla-46.0.sha256sum

=== modified file 'pkg/gnu/gcc14snapshot/Makefile'
--- a/pkg/gnu/gcc14snapshot/Makefile    2024-03-11 23:34:16 +0000
+++ b/pkg/gnu/gcc14snapshot/Makefile    2024-03-18 04:43:43 +0000
@@ -22,7 +22,7 @@
 NAME = The GNU Compiler Collection version 14 development version
 GARNAME = gcc14snapshot
 UPSTREAMNAME = gcc
-GARVERSION = 14-20240310
+GARVERSION = 14-20240317
 HOME_URL = https://www.gnu.org/software/gcc
 DESCRIPTION = GNU Compiler Collection 14 snapshot
 define BLURB

=== modified file 'pkg/gnu/gnugo/Makefile'
--- a/pkg/gnu/gnugo/Makefile    2022-03-28 20:35:08 +0000
+++ b/pkg/gnu/gnugo/Makefile    2024-03-18 04:43:43 +0000
@@ -44,6 +44,6 @@
 
 ######################################################################
 
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
 include ../../../gar/gar.lib/info.mk
 include config.mk

=== modified file 'pkg/gnu/userv/Makefile'
--- a/pkg/gnu/userv/Makefile    2022-10-09 23:40:07 +0000
+++ b/pkg/gnu/userv/Makefile    2024-03-18 04:43:43 +0000
@@ -18,7 +18,7 @@
 # along with GSRC.  If not, see <http://www.gnu.org/licenses/>.
 
 # Send bug reports and comments about GSRC problems to bug-gsrc@gnu.org
-#
+
 NAME = userv
 GARNAME = userv
 GARVERSION = 1.2.0
@@ -33,23 +33,17 @@
 
 ######################################################################
 # http://www.chiark.greenend.org.uk/~ian/userv/userv.tar.gz
-#MASTER_SITES = $(MASTER_GNU)
-#MASTER_SUBDIR = $(GARNAME)/
 MASTER_SITES = http://www.chiark.greenend.org.uk/
 MASTER_SUBDIR = ~ian/userv/
 DISTFILES = $(GARNAME).tar.gz
 SIGFILES = 
-#$(GARNAME).tar.gz.sig
-#PATCHFILES = $(DISTNAME)-fix-install.diff
 
 BUILDDEPS = 
 LIBDEPS = 
-#WORKSRC = $(WORKDIR)/$(GARNAME)
-#WORKOBJ = $(WORKDIR)/$(DISTNAME)-build
-
+WORKOBJ = $(WORKSRC)
 ######################################################################
 
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
 include config.mk
 
 #BUILD_ENV += INSTALL_USER=$(INSTALL_USER) INSTALL_GROUP=$(INSTALL_GROUP)

=== removed directory 'pkg/gnu/userv/files'
=== removed file 'pkg/gnu/userv/files/userv-1.0.5-fix-install.diff'
--- a/pkg/gnu/userv/files/userv-1.0.5-fix-install.diff  2016-06-17 19:08:15 
+0000
+++ b/pkg/gnu/userv/files/userv-1.0.5-fix-install.diff  1970-01-01 00:00:00 
+0000
@@ -1,63 +0,0 @@
-diff -x config.log -x config.status -ru tmp/userv-1.0.5/Makefile.in 
work/userv-1.0.5/Makefile.in
---- work/userv-1.0.5/Makefile.in       2006-04-08 14:00:01.000000000 +0200
-+++ work/userv-1.0.5/Makefile.in       2012-11-21 19:45:31.871836621 +0100
-@@ -16,6 +16,8 @@
- #  along with userv; if not, write to the Free Software
- #  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
-+DESTDIR = 
-+
- VERSION=@VERSION@
- VEREXT=std
- 
-@@ -32,7 +34,7 @@
- CWD=$(shell pwd)
- 
- INSTALL_GROUP=0  # root or wheel
--INSTALL_FLAGS=-o root -g $(INSTALL_GROUP)
-+INSTALL_FLAGS=-o $(INSTALL_USER) -g $(INSTALL_GROUP)
- 
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_FLAGS)
-@@ -72,25 +74,27 @@
- docs:         $(TARGETS_DOC)
- 
- install:      all
--              $(INSTALL_PROGRAM) -m 755 daemon $(sbindir)/uservd
--              $(INSTALL_PROGRAM) -m 4755 client $(bindir)/userv
--              $(INSTALL) -d -m 2755 $(etcsubdir) \
--      $(etcsubdir)/default.d $(etcsubdir)/services.d $(etcsubdir)/override.d
--              if test ! -f $(etcsubdir)/system.default; then \
--                      $(INSTALL_DATA) system.default $(etcsubdir); fi
--              if test ! -f $(etcsubdir)/system.override; then \
--                      $(INSTALL_DATA) system.override $(etcsubdir); fi
-+              $(INSTALL) -d $(DESTDIR)$(sbindir)
-+              $(INSTALL) -d $(DESTDIR)$(bindir)
-+              $(INSTALL_PROGRAM) -m 755 daemon $(DESTDIR)$(sbindir)/uservd
-+              $(INSTALL_PROGRAM) -m 4755 client $(DESTDIR)$(bindir)/userv
-+              $(INSTALL) -d -m 2755 $(DESTDIR)$(etcsubdir) \
-+      $(DESTDIR)$(etcsubdir)/default.d $(DESTDIR)$(etcsubdir)/services.d 
$(DESTDIR)$(etcsubdir)/override.d
-+              if test ! -f $(DESTDIR)$(etcsubdir)/system.default; then \
-+                      $(INSTALL_DATA) system.default $(DESTDIR)$(etcsubdir); 
fi
-+              if test ! -f $(DESTDIR)$(etcsubdir)/system.override; then \
-+                      $(INSTALL_DATA) system.override $(DESTDIR)$(etcsubdir); 
fi
- 
- install-strip:
-               $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
- 
- install-doc:  $(TARGETS_DOC)
--              $(INSTALL) -d -m 2755 $(docdir) $(docdir)/spec.html
--              $(INSTALL) -d -m 2755 $(mandir) $(man1dir) $(man8dir)
--              $(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(docdir)/.
--              $(INSTALL_DATA) -m 644 spec.html/*.html $(docdir)/spec.html/.
--              $(INSTALL_DATA) -m 644 $(MAN1PAGES) $(man1dir)
--              $(INSTALL_DATA) -m 644 $(MAN8PAGES) $(man8dir)
-+              $(INSTALL) -d -m 2755 $(DESTDIR)$(docdir) 
$(DESTDIR)$(docdir)/spec.html
-+              $(INSTALL) -d -m 2755  $(DESTDIR)$(mandir) $(DESTDIR)$(man1dir) 
$(DESTDIR)$(man8dir)
-+              $(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(DESTDIR)$(docdir)/.
-+              $(INSTALL_DATA) -m 644 spec.html/*.html 
$(DESTDIR)$(docdir)/spec.html/.
-+              $(INSTALL_DATA) -m 644 $(MAN1PAGES) $(DESTDIR)$(man1dir)
-+              $(INSTALL_DATA) -m 644 $(MAN8PAGES) $(DESTDIR)$(man8dir)
- 
- uninstall:
-               rm -f $(bindir)/userv $(sbindir)/uservd


reply via email to

[Prev in Thread] Current Thread [Next in Thread]