Update acl from 2.2.52 to 2.3.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Update acl from 2.2.52 to 2.3.1
From: Alexander Schreiber <als%thangorodrim.de@localhost>
Date: Fri, 07 Apr 2023 18:07:15 +0000
Module Name:	pkgsrc-wip
Committed By:	Alexander Schreiber <als%thangorodrim.de@localhost>
Pushed By:	als
Date:		Fri Apr 7 18:07:15 2023 +0000
Changeset:	9c7d33a9a90aa106fd99bad649d109a09c1c6f35

Modified Files:
	acl/Makefile
	acl/PLIST
	acl/buildlink3.mk
	acl/distinfo
Removed Files:
	acl/patches/patch-include_builddefs.in
	acl/patches/patch-include_buildmacros

Log Message:
Update acl from 2.2.52 to 2.3.1

Update package from version 2.2.52 to 2.3.1,m drop patches that
are no longer needed due to upstream build changes and apply
changes needed for the package name change from linux-acl to acl.

Signed-off-by: Alexander Schreiber <als%thangorodrim.de@localhost>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9c7d33a9a90aa106fd99bad649d109a09c1c6f35

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 acl/Makefile                           | 13 +++++------
 acl/PLIST                              |  9 ++++++--
 acl/buildlink3.mk                      | 16 +++++++-------
 acl/distinfo                           |  8 +++----
 acl/patches/patch-include_builddefs.in | 27 -----------------------
 acl/patches/patch-include_buildmacros  | 40 ----------------------------------
 6 files changed, 24 insertions(+), 89 deletions(-)

diffs:
diff --git a/acl/Makefile b/acl/Makefile
index d6554b2dc3..da5979805e 100644
--- a/acl/Makefile
+++ b/acl/Makefile
@@ -1,15 +1,14 @@
 # $NetBSD: Makefile,v 1.3 2012/10/03 09:10:41 asau Exp $
 #
 
-DISTNAME=		acl-2.2.52.src
-PKGNAME=		linux-${DISTNAME:S/.src//}
+DISTNAME=		acl-2.3.1
 CATEGORIES=		sysutils
 MASTER_SITES=		http://download.savannah.nongnu.org/releases/acl/
-LICENSE=		gnu-gpl-v2 AND gnu-lgpl-v2.1
 
-MAINTAINER=		pkgsrc%blackmouse.biz@localhost
+MAINTAINER=		als%thangorodrim.ch@localhost
 HOMEPAGE=		https://savannah.nongnu.org/projects/acl
 COMMENT=		Commands for Manipulating POSIX Access Control Lists
+LICENSE=		gnu-gpl-v2 AND gnu-lgpl-v2.1
 
 # uses linux/version.h and only tested under Linux
 ONLY_FOR_PLATFORM=	Linux-*-*
@@ -17,8 +16,8 @@ ONLY_FOR_PLATFORM=	Linux-*-*
 WRKSRC=			${WRKDIR}/${DISTNAME:S/.src//}
 GNU_CONFIGURE=		yes
 USE_TOOLS=		gmake
-BUILD_TARGET=		default
-INSTALL_TARGET=		install install-lib install-dev
 
-.include "../../wip/linux-attr/buildlink3.mk"
+USE_LIBTOOL=	yes
+
+.include "../../sysutils/attr/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/acl/PLIST b/acl/PLIST
index bcceeae531..146546bece 100644
--- a/acl/PLIST
+++ b/acl/PLIST
@@ -5,6 +5,7 @@ bin/setfacl
 include/acl/libacl.h
 include/sys/acl.h
 lib/libacl.la
+lib/pkgconfig/libacl.pc
 man/man1/chacl.1
 man/man1/getfacl.1
 man/man1/setfacl.1
@@ -26,6 +27,7 @@ man/man3/acl_equiv_mode.3
 man/man3/acl_error.3
 man/man3/acl_extended_fd.3
 man/man3/acl_extended_file.3
+man/man3/acl_extended_file_nofollow.3
 man/man3/acl_free.3
 man/man3/acl_from_mode.3
 man/man3/acl_from_text.3
@@ -47,12 +49,15 @@ man/man3/acl_to_any_text.3
 man/man3/acl_to_text.3
 man/man3/acl_valid.3
 man/man5/acl.5
-share/doc/acl/CHANGES.gz
+share/doc/acl/CHANGES
 share/doc/acl/COPYING
 share/doc/acl/COPYING.LGPL
 share/doc/acl/PORTING
-share/doc/acl/README
+share/doc/acl/extensions.txt
+share/doc/acl/libacl.txt
 share/locale/de/LC_MESSAGES/acl.mo
+share/locale/en@boldquot/LC_MESSAGES/acl.mo
+share/locale/en@quot/LC_MESSAGES/acl.mo
 share/locale/es/LC_MESSAGES/acl.mo
 share/locale/fr/LC_MESSAGES/acl.mo
 share/locale/gl/LC_MESSAGES/acl.mo
diff --git a/acl/buildlink3.mk b/acl/buildlink3.mk
index 2eda8a560a..86ecb6ce3e 100644
--- a/acl/buildlink3.mk
+++ b/acl/buildlink3.mk
@@ -1,14 +1,14 @@
 # $NetBSD$
 
-BUILDLINK_TREE+=	linux-acl
+BUILDLINK_TREE+=	acl
 
-.if !defined(LINUX_ACL_BUILDLINK3_MK)
-LINUX_ACL_BUILDLINK3_MK:=
+.if !defined(ACL_BUILDLINK3_MK)
+ACL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.linux-acl+=	linux-acl>=2.2.52
-BUILDLINK_PKGSRCDIR.linux-acl?=		../../wip/linux-acl
+BUILDLINK_API_DEPENDS.acl+=	acl>=2.2.52
+BUILDLINK_PKGSRCDIR.acl?=	../../devel/acl
 
-.include "../../wip/linux-attr/buildlink3.mk"
-.endif	# LINUX_ACL_BUILDLINK3_MK
+.include "../../sysutils/attr/buildlink3.mk"
+.endif	# ACL_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-linux-acl
+BUILDLINK_TREE+=	-acl
diff --git a/acl/distinfo b/acl/distinfo
index c91f129d76..516dfeca6d 100644
--- a/acl/distinfo
+++ b/acl/distinfo
@@ -1,7 +1,5 @@
 $NetBSD: distinfo,v 1.1.1.1 2006/08/09 23:08:51 ondratu Exp $
 
-RMD160 (acl-2.2.52.src.tar.gz) = 2abac978d1b985c1a30aeaed8d78b13d96b467d6
-SHA512 (acl-2.2.52.src.tar.gz) = 59973199d371cd0b2368e95bc829a1b47f04e808a174fefba4c6854e766158bd19a71d9dbcc8d6fdc1573a1f971cdda39c453f7fa243bce02c1ab97c6e7c72e7
-Size (acl-2.2.52.src.tar.gz) = 386604 bytes
-SHA1 (patch-include_builddefs.in) = b0384d514048af6369852eb68705e20458665335
-SHA1 (patch-include_buildmacros) = 2f28373768e731b9eaa4526bf3ee78917f946684
+BLAKE2s (acl-2.3.1.tar.gz) = 3bf04a465f75087f2ebc660ffdf9f2e946fe5b014a66a8897a6d60b19820a32b
+SHA512 (acl-2.3.1.tar.gz) = f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892
+Size (acl-2.3.1.tar.gz) = 518292 bytes
diff --git a/acl/patches/patch-include_builddefs.in b/acl/patches/patch-include_builddefs.in
deleted file mode 100644
index 68f71c6b81..0000000000
--- a/acl/patches/patch-include_builddefs.in
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
---- include/builddefs.in.orig	2013-05-19 01:58:24.000000000 +0000
-+++ include/builddefs.in
-@@ -28,14 +28,14 @@ PKG_RELEASE	= @pkg_release@
- PKG_VERSION	= @pkg_version@
- PKG_PLATFORM	= @pkg_platform@
- PKG_DISTRIBUTION= @pkg_distribution@
--PKG_BIN_DIR	= @bindir@
--PKG_SBIN_DIR	= @sbindir@
--PKG_LIB_DIR	= @libdir@@libdirsuffix@
--PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
--PKG_INC_DIR	= @includedir@
--PKG_MAN_DIR	= @mandir@
--PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
--PKG_LOCALE_DIR	= @datadir@/locale
-+PKG_BIN_DIR	= $(DESTDIR)@bindir@
-+PKG_SBIN_DIR	= $(DESTDIR)@sbindir@
-+PKG_LIB_DIR	= $(DESTDIR)@libdir@@libdirsuffix@
-+PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@@libdirsuffix@
-+PKG_INC_DIR	= $(DESTDIR)@includedir@
-+PKG_MAN_DIR	= $(DESTDIR)@mandir@
-+PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name@
-+PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale
- 
- CC		= @cc@
- AWK		= @awk@
diff --git a/acl/patches/patch-include_buildmacros b/acl/patches/patch-include_buildmacros
deleted file mode 100644
index c099fd6c46..0000000000
--- a/acl/patches/patch-include_buildmacros
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
---- include/buildmacros.orig	2013-05-19 04:52:09.000000000 +0000
-+++ include/buildmacros
-@@ -66,31 +66,13 @@ endif
- 
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB = \
--	cd $(TOPDIR)/$(LIBNAME)/.libs; \
--	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
--	../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
--	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
-+	cd $(TOPDIR)/$(LIBNAME); \
-+	$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+	$(LTINSTALL) -m 644 $(LIBNAME).la $(PKG_LIB_DIR)/
- endif
- 
--# Libtool thinks the static and shared libs should be in the same dir, so
--# make the static lib appear in the place we chose as rpath (using the two
--# symlinks below).
--# Other things want the shared libs to appear in /usr/lib, else they'll
--# link with the static libs there.  So, another symlink to get the .so into
--# /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
--INSTALL_LTLIB_DEV = \
--	cd $(TOPDIR)/$(LIBNAME)/.libs; \
--	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
--	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \
--	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
--	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
--	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
--	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
--	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
--	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
--	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
--	fi
-+INSTALL_LTLIB_DEV = $(INSTALL_LTLIB)
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
Prev by Date: Rename linux-acl to acl.
Next by Date: zabbix64-*: Update to Zabbix 6.4.1
Previous by Thread: Rename linux-acl to acl.
Next by Thread: zabbix64-*: Update to Zabbix 6.4.1
Indexes:
Home | Main Index | Thread Index | Old Index