pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/netatalk4
Module Name: pkgsrc
Committed By: hauke
Date: Mon Mar 17 17:42:45 UTC 2025
Modified Files:
pkgsrc/net/netatalk4: Makefile PLIST distinfo options.mk
pkgsrc/net/netatalk4/patches: patch-meson.build
Log Message:
net/netatalk: Accomodate non-NetBSD OSes better.
Have Meson use PREFIXed paths
Fix PLIST generation for AppleTalk related paths
Builds, installs, runs on FreeBSD 13 now.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/netatalk4/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/netatalk4/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/netatalk4/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/netatalk4/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/netatalk4/patches/patch-meson.build
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/netatalk4/Makefile
diff -u pkgsrc/net/netatalk4/Makefile:1.11 pkgsrc/net/netatalk4/Makefile:1.12
--- pkgsrc/net/netatalk4/Makefile:1.11 Wed Mar 12 09:54:41 2025
+++ pkgsrc/net/netatalk4/Makefile Mon Mar 17 17:42:44 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2025/03/12 09:54:41 hauke Exp $
+# $NetBSD: Makefile,v 1.12 2025/03/17 17:42:44 hauke Exp $
GITHUB_PROJECT= netatalk
GITHUB_TAG= refs/tags/${DISTNAME}
DISTNAME= netatalk-4-1-2
+PKGREVISION= 1
PKGVER= ${GITHUB_TAG:C/^.+netatalk-//:C/-/./g}
PKGNAME= ${DISTNAME:C/-[0-9].*$//}-${PKGVER}
@@ -34,11 +35,8 @@ CONFLICTS+= netatalk-[0-9]* netatalk-as
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
RCD_SCRIPTS= netatalk
-ATALK_RCD_SCRIPTS= a2boot atalkd macipgw papd timelord
RCD_SCRIPT_SRC.netatalk= ${WRKSRC}/output/distrib/initscripts/netatalk
-.endif
SMF_SRCDIR= ${WRKSRC}/distrib/initscripts
SMF_METHODS= netatalk_smf
@@ -58,6 +56,8 @@ MESON_ARGS+= -Dwith-tcp-wrappers=true
MESON_ARGS+= -Dwith-statedir-path=${VARBASE}/db
MESON_ARGS+= -Dwith-init-hooks=false
+LDFLAGS.FreeBSD+= -lpthread
+
# Meson will look for perl(1), but then substitute the buildlink path
# into scripts, so replace manually
SUBST_CLASSES+= perlpath
@@ -93,13 +93,23 @@ PLIST.ea= yes
.for atbin in aecho getzones nbplkup nbprgstr nbpunrgstr pap papstatus
PRINT_PLIST_AWK+= { gsub(/^bin\/${atbin}$$/, "$${PLIST.appletalk}&"); }
.endfor
+.for atsbin in a2boot atalkd macipgw papd timelord
+PRINT_PLIST_AWK+= { gsub(/^sbin\/${atsbin}$$/, "$${PLIST.appletalk}&"); }
+.endfor
.for athdr in aarp at at_var ddp ddp_var endian phase2
PRINT_PLIST_AWK+= { gsub(/^include\/netatalk\/${athdr}\.h$$/, "$${PLIST.appletalk}&"); }
.endfor
-.for atsbin in a2boot atalkd macipgw papd timelord
-PRINT_PLIST_AWK+= { gsub(/^sbin\/${atsbin}$$/, "$${PLIST.appletalk}&"); }
-PRINT_PLIST_AWK+= { gsub(/^share\/examples\/netatalk\/(atalk|pap)d\.conf$$/, "$${PLIST.appletalk}&"); }
+.for atman1 in aecho getzones nbp nbplkup nbprgstr nbpunrgstr pap
+PRINT_PLIST_AWK+= { gsub(/^man\/man1\/${atman1}\.1$$/, "$${PLIST.appletalk}&"); }
+.endfor
+.for atman5 in atalkd.conf papd.conf
+PRINT_PLIST_AWK+= { gsub(/^man\/man5\/${atman5}\.5$$/, "$${PLIST.appletalk}&"); }
.endfor
+.for atman8 in a2boot atalkd macipgw papd papstatus timelord
+PRINT_PLIST_AWK+= { gsub(/^man\/man8\/${atman8}\.8$$/, "$${PLIST.appletalk}&"); }
+.endfor
+PRINT_PLIST_AWK+= { gsub(/^share\/examples\/netatalk\/(atalk|pap)d\.conf$$/, "$${PLIST.appletalk}&"); }
+PRINT_PLIST_AWK+= { gsub(/^share\/doc\/netatalk\/README.AppleTalk$$/, "$${PLIST.appletalk}&"); }
# ea
PRINT_PLIST_AWK+= { gsub(/^bin\/ad$$/, "$${PLIST.ea}&"); }
@@ -157,8 +167,8 @@ BUILDLINK_API_DEPENDS.libevent+=
.include "../../security/openssl/buildlink3.mk"
.include "../../security/tcp_wrappers/buildlink3.mk"
.include "../../textproc/cmark-gfm/buildlink3.mk"
-
.include "../../mk/bdb.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../devel/meson/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/netatalk4/PLIST
diff -u pkgsrc/net/netatalk4/PLIST:1.2 pkgsrc/net/netatalk4/PLIST:1.3
--- pkgsrc/net/netatalk4/PLIST:1.2 Wed Mar 12 09:54:41 2025
+++ pkgsrc/net/netatalk4/PLIST Mon Mar 17 17:42:44 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2025/03/12 09:54:41 hauke Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/03/17 17:42:44 hauke Exp $
${PLIST.ea}bin/ad
bin/addump
${PLIST.appletalk}bin/aecho
@@ -68,7 +68,7 @@ lib/netatalk/uams_passwd.so
lib/netatalk/uams_randnum.so
man/man1/ad.1
man/man1/addump.1
-man/man1/aecho.1
+${PLIST.appletalk}man/man1/aecho.1
man/man1/afp_lantest.1
man/man1/afp_logintest.1
man/man1/afp_spectest.1
@@ -80,33 +80,33 @@ man/man1/afpstats.1
man/man1/afptest.1
man/man1/asip-status.1
man/man1/dbd.1
-man/man1/getzones.1
+${PLIST.appletalk}man/man1/getzones.1
man/man1/macusers.1
-man/man1/nbp.1
-man/man1/nbplkup.1
-man/man1/nbprgstr.1
-man/man1/nbpunrgstr.1
-man/man1/pap.1
+${PLIST.appletalk}man/man1/nbp.1
+${PLIST.appletalk}man/man1/nbplkup.1
+${PLIST.appletalk}man/man1/nbprgstr.1
+${PLIST.appletalk}man/man1/nbpunrgstr.1
+${PLIST.appletalk}man/man1/pap.1
man/man3/atalk_aton.3
man/man3/nbp_name.3
man/man4/atalk.4
man/man5/afp.conf.5
man/man5/afp_signature.conf.5
man/man5/afp_voluuid.conf.5
-man/man5/atalkd.conf.5
+${PLIST.appletalk}man/man5/atalkd.conf.5
man/man5/extmap.conf.5
man/man5/macipgw.conf.5
-man/man5/papd.conf.5
-man/man8/a2boot.8
+${PLIST.appletalk}man/man5/papd.conf.5
+${PLIST.appletalk}man/man8/a2boot.8
man/man8/afpd.8
-man/man8/atalkd.8
+${PLIST.appletalk}man/man8/atalkd.8
man/man8/cnid_dbd.8
man/man8/cnid_metad.8
-man/man8/macipgw.8
+${PLIST.appletalk}man/man8/macipgw.8
man/man8/netatalk.8
-man/man8/papd.8
-man/man8/papstatus.8
-man/man8/timelord.8
+${PLIST.appletalk}man/man8/papd.8
+${PLIST.appletalk}man/man8/papstatus.8
+${PLIST.appletalk}man/man8/timelord.8
${PLIST.appletalk}sbin/a2boot
sbin/afpd
${PLIST.appletalk}sbin/atalkd
@@ -121,7 +121,7 @@ share/doc/netatalk/DEVELOPER
share/doc/netatalk/DOCKER.txt
share/doc/netatalk/INSTALL.txt
share/doc/netatalk/NEWS
-share/doc/netatalk/README.AppleTalk
+${PLIST.appletalk}share/doc/netatalk/README.AppleTalk
share/doc/netatalk/README.txt
share/doc/netatalk/SECURITY.txt
share/examples/netatalk/afp.conf
Index: pkgsrc/net/netatalk4/distinfo
diff -u pkgsrc/net/netatalk4/distinfo:1.6 pkgsrc/net/netatalk4/distinfo:1.7
--- pkgsrc/net/netatalk4/distinfo:1.6 Wed Mar 12 09:54:41 2025
+++ pkgsrc/net/netatalk4/distinfo Mon Mar 17 17:42:44 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2025/03/12 09:54:41 hauke Exp $
+$NetBSD: distinfo,v 1.7 2025/03/17 17:42:44 hauke Exp $
BLAKE2s (netatalk-4-1-2.tar.gz) = a0b33a04528152322b84f2e10345871f96e343d88079610cefcf1b4aef819665
SHA512 (netatalk-4-1-2.tar.gz) = b1fde5a0b27e6e67751caf40759e8648e48f3daeb8d43041761023147dc3edac33d07f8c40ec853dffd57ec7b69ebc94c99a0d7ded72ea0ff803865e937b8aba
Size (netatalk-4-1-2.tar.gz) = 1327961 bytes
SHA1 (patch-config_meson.build) = 5a746388b89d094ca6847e487e6ef18d98dac0ca
SHA1 (patch-config_pam_meson.build) = f321c7bd246f1d82c287e745ea75c9561bc528a9
-SHA1 (patch-meson.build) = 97b9dba80a438785abd04727e88c7841288b0e7d
+SHA1 (patch-meson.build) = 6f407838065addb4807dc46a43440d4a97a35129
Index: pkgsrc/net/netatalk4/options.mk
diff -u pkgsrc/net/netatalk4/options.mk:1.4 pkgsrc/net/netatalk4/options.mk:1.5
--- pkgsrc/net/netatalk4/options.mk:1.4 Wed Mar 12 09:54:41 2025
+++ pkgsrc/net/netatalk4/options.mk Mon Mar 17 17:42:44 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2025/03/12 09:54:41 hauke Exp $
+# $NetBSD: options.mk,v 1.5 2025/03/17 17:42:44 hauke Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk
PKG_SUPPORTED_OPTIONS= debug dnssd kerberos ldap pam
@@ -26,10 +26,7 @@ MESON_ARGS+= -Dwith-appletalk=true
MESON_ARGS+= -Dwith-spooldir=${VARBASE}/spool/netatalk
CONF_FILES+= ${EGDIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf
CONF_FILES+= ${EGDIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf
-. if ${OPSYS} == "NetBSD"
-MESON_BINARIES+= service
-MESON_BINARY.service= /usr/sbin/service
-. endif
+ATALK_RCD_SCRIPTS= a2boot atalkd macipgw papd timelord
RCD_SCRIPTS+= ${ATALK_RCD_SCRIPTS}
.for rs in ${ATALK_RCD_SCRIPTS}
RCD_SCRIPT_SRC.${rs}= ${WRKSRC}/output/distrib/initscripts/${rs}
Index: pkgsrc/net/netatalk4/patches/patch-meson.build
diff -u pkgsrc/net/netatalk4/patches/patch-meson.build:1.4 pkgsrc/net/netatalk4/patches/patch-meson.build:1.5
--- pkgsrc/net/netatalk4/patches/patch-meson.build:1.4 Wed Mar 12 09:54:41 2025
+++ pkgsrc/net/netatalk4/patches/patch-meson.build Mon Mar 17 17:42:45 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-meson.build,v 1.4 2025/03/12 09:54:41 hauke Exp $
+$NetBSD: patch-meson.build,v 1.5 2025/03/17 17:42:45 hauke Exp $
+
+Add PREFIXed paths (include, lib) for all OSes.
Make PREFIX path configurable.
@@ -13,6 +15,15 @@ Install at.h on Linux, we do it on NetBS
--- meson.build.orig 2025-02-10 20:41:20.000000000 +0000
+++ meson.build
+@@ -162,7 +162,7 @@ if host_os in ['dragonfly', 'freebsd', '
+ 'include',
+ 'sys',
+ 'etc/afpd',
+- '/usr/local/include',
++ get_option('prefix') / 'include',
+ )
+ elif host_os == 'netbsd'
+ root_includes = include_directories(
@@ -170,7 +170,7 @@ elif host_os == 'netbsd'
'include',
'sys',
@@ -22,7 +33,38 @@ Install at.h on Linux, we do it on NetBS
)
elif host_os == 'omnios'
root_includes = include_directories(
-@@ -219,7 +219,7 @@ if host_os in ['dragonfly', 'freebsd', '
+@@ -178,7 +178,7 @@ elif host_os == 'omnios'
+ 'include',
+ 'sys',
+ 'etc/afpd',
+- '/opt/local/include',
++ get_option('prefix') / 'include',
+ )
+ else
+ root_includes = include_directories(
+@@ -186,6 +186,7 @@ else
+ 'include',
+ 'sys',
+ 'etc/afpd',
++ get_option('prefix') / 'include',
+ )
+ endif
+
+@@ -201,7 +202,7 @@ cmarkgfm = find_program('cmark-gfm', req
+ if host_os == 'darwin'
+ bison = find_program(brew_prefix / 'opt/bison/bin/bison', required: false)
+ if not bison.found()
+- bison = find_program('/opt/local/bin/bison', required: false)
++ bison = find_program( get_option('prefix') / 'bison', required: false)
+ endif
+ else
+ bison = find_program('bison', required: false)
+@@ -215,15 +216,15 @@ uname_stdout = run_command(uname, '-a',
+ libsearch_dirs = []
+
+ if host_os in ['dragonfly', 'freebsd', 'openbsd']
+- libsearch_dirs += '/usr/local/lib'
++ libsearch_dirs += get_option('prefix') / 'lib'
endif
if host_os == 'netbsd'
@@ -31,7 +73,42 @@ Install at.h on Linux, we do it on NetBS
endif
if uname.found() and uname_stdout.to_lower().contains('omnios')
-@@ -1025,6 +1025,12 @@ endif
+- libsearch_dirs += '/opt/local/lib'
++ libsearch_dirs += get_option('prefix') / 'lib'
+ endif
+
+ socket = cc.find_library('socket', required: false)
+@@ -260,7 +261,7 @@ add_global_link_arguments(netatalk_commo
+
+ header_dir = []
+ if host_os in ['dragonfly', 'freebsd', 'openbsd']
+- header_dir += '/usr/local/include'
++ header_dir += get_option('prefix') / 'include'
+ endif
+
+ check_headers = [
+@@ -456,9 +457,7 @@ else
+ endif
+
+ bdb_dirs += [
+- '/usr/local',
+- '/usr/pkg',
+- '/opt/local',
++ get_option('prefix'),
+ '/usr',
+ ]
+ endif
+@@ -610,8 +609,7 @@ unicode_dirs = [
+ meson.current_source_dir(),
+ '/usr/share/unicode',
+ '/usr/share/unicode/ucd',
+- '/usr/pkg/share/texmf-dist/tex/generic/unicode-data',
+- '/usr/local/share/texmf-dist/tex/generic/unicode-data/',
++ get_option('prefix') / 'share/texmf-dist/tex/generic/unicode-data',
+ ]
+
+ unicode_data_path = get_option('with-unicode-data-path')
+@@ -1025,6 +1023,12 @@ endif
enable_quota = get_option('with-quota')
@@ -44,7 +121,42 @@ Install at.h on Linux, we do it on NetBS
prop = cc.find_library('prop', required: false)
quota = cc.find_library('quota', required: false)
rpcsvc = cc.find_library('rpcsvc', required: false)
-@@ -2193,7 +2199,6 @@ if host_os.contains('freebsd')
+@@ -1644,9 +1648,7 @@ else
+ '/usr/share/xml/docbook/stylesheet/docbook-xsl',
+ '/usr/share/xml/docbook/xsl-stylesheets-nons',
+ '/usr/share/xml/docbook/xsl-stylesheets',
+- '/opt/local/share/xsl/docbook',
+- '/usr/local/share/xsl/docbook',
+- '/usr/pkg/share/xsl/docbook',
++ get_option('prefix') / 'share/xsl/docbook',
+ ]
+ endif
+
+@@ -1714,7 +1716,7 @@ else
+ pam_paths = [
+ '/',
+ '/usr',
+- '/usr/local',
++ get_option('prefix'),
+ ]
+
+ foreach path : pam_paths
+@@ -2066,12 +2068,8 @@ if fs.is_dir('/usr/share/cracklib')
+ cracklib_dict += '/usr/share/cracklib/pw_dict'
+ elif fs.is_dir('/var/cache/cracklib')
+ cracklib_dict += '/var/cache/cracklib/cracklib_dict'
+-elif fs.is_dir('/usr/local/libdata/cracklib')
+- cracklib_dict += '/usr/local/libdata/cracklib/cracklib-words'
+-elif fs.is_dir('/usr/pkg/share/cracklib')
+- cracklib_dict += '/usr/pkg/share/cracklib/pw_dict'
+-elif fs.is_dir('/usr/local/share/cracklib')
+- cracklib_dict += '/usr/local/share/cracklib/cracklib-small'
++elif fs.is_dir(get_option('prefix') / 'share/cracklib')
++ cracklib_dict += get_option('prefix') / 'share/cracklib/cracklib-small'
+ endif
+
+ if not enable_cracklib
+@@ -2193,7 +2191,6 @@ if host_os.contains('freebsd')
cdata.set('FREEBSD', 1)
cdata.set('OPEN_NOFOLLOW_ERRNO', 'EMLINK')
elif host_os.contains('linux')
Home |
Main Index |
Thread Index |
Old Index