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 Dec 16 15:40:54 UTC 2024
Modified Files:
pkgsrc/net/netatalk4: Makefile distinfo
Added Files:
pkgsrc/net/netatalk4/patches: patch-config_meson.build
patch-config_pam_meson.build
Log Message:
Do not let the Meson build system attempt to install config files.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/netatalk4/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/netatalk4/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/netatalk4/patches/patch-config_meson.build \
pkgsrc/net/netatalk4/patches/patch-config_pam_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.3 pkgsrc/net/netatalk4/Makefile:1.4
--- pkgsrc/net/netatalk4/Makefile:1.3 Thu Dec 12 11:08:18 2024
+++ pkgsrc/net/netatalk4/Makefile Mon Dec 16 15:40:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2024/12/12 11:08:18 hauke Exp $
+# $NetBSD: Makefile,v 1.4 2024/12/16 15:40:54 hauke Exp $
GITHUB_PROJECT= netatalk
GITHUB_TAG= refs/tags/${DISTNAME}
@@ -6,7 +6,7 @@ DISTNAME= netatalk-4-0-6
PKGVER= ${GITHUB_TAG:C/^.+netatalk-//:C/-/./g}
PKGNAME= ${DISTNAME:C/-[0-9].*$//}-${PKGVER}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=Netatalk/}
@@ -18,15 +18,15 @@ LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${DISTNAME}
USE_TOOLS+= pkg-config perl
+TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
+TOOL_DEPENDS+= docbook-xsl>=1.79.2:../../textproc/docbook-xsl
PKG_SYSCONFSUBDIR= netatalk
-EGDIR= ${PREFIX}/share/examples/netatalk
+
+EGDIR= share/examples/netatalk
CONF_FILES+= ${EGDIR}/afp.conf ${PKG_SYSCONFDIR}/afp.conf
CONF_FILES+= ${EGDIR}/extmap.conf ${PKG_SYSCONFDIR}/extmap.conf
-TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-TOOL_DEPENDS+= docbook-xsl>=1.79.2:../../textproc/docbook-xsl
-
CONFLICTS= netatalk22-[0-9]* netatalk30-[0-9]* netatalk3-[0-9]*
CONFLICTS+= netatalk-[0-9]* netatalk-asun-[0-9]* netatalk-umich-[0-9]*
@@ -117,24 +117,22 @@ post-install:
rm -r ${DESTDIR}${PREFIX}/share/doc/netatalk/htmldocs
chmod -w ${DESTDIR}${PREFIX}/bin/afppasswd
${INSTALL_DATA} ${WRKSRC}/output/config/afp.conf \
- ${DESTDIR}${EGDIR}/afp.conf
+ ${DESTDIR}${PREFIX}/${EGDIR}/afp.conf
${INSTALL_DATA} ${WRKSRC}/config/extmap.conf \
- ${DESTDIR}${EGDIR}/extmap.conf
+ ${DESTDIR}${PREFIX}/${EGDIR}/extmap.conf
.if !empty(PKG_OPTIONS:Mappletalk)
${INSTALL_DATA} ${WRKSRC}/config/atalkd.conf \
- ${DESTDIR}${EGDIR}/atalkd.conf
+ ${DESTDIR}${PREFIX}/${EGDIR}/atalkd.conf
${INSTALL_DATA} ${WRKSRC}/config/papd.conf \
- ${DESTDIR}${EGDIR}/papd.conf
+ ${DESTDIR}${PREFIX}/${EGDIR}/papd.conf
.endif
.if !empty(PKG_OPTIONS:Mspotlight)
${INSTALL_DATA} ${WRKSRC}/output/config/dbus-session.conf \
- ${DESTDIR}${EGDIR}/dbus-session.conf
-.else
- rm -r ${DESTDIR}${PREFIX}/share/dbus-1
+ ${DESTDIR}${PREFIX}/${EGDIR}/dbus-session.conf
.endif
.if !empty(PKG_OPTIONS:Mpam)
${INSTALL_DATA} ${WRKSRC}/output/config/pam/netatalk \
- ${DESTDIR}${EGDIR}/netatalk.pam
+ ${DESTDIR}${PREFIX}/${EGDIR}/netatalk.pam
.endif
.include "../../converters/libiconv/buildlink3.mk"
Index: pkgsrc/net/netatalk4/distinfo
diff -u pkgsrc/net/netatalk4/distinfo:1.2 pkgsrc/net/netatalk4/distinfo:1.3
--- pkgsrc/net/netatalk4/distinfo:1.2 Thu Nov 21 22:02:11 2024
+++ pkgsrc/net/netatalk4/distinfo Mon Dec 16 15:40:54 2024
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2024/11/21 22:02:11 hauke Exp $
+$NetBSD: distinfo,v 1.3 2024/12/16 15:40:54 hauke Exp $
BLAKE2s (netatalk-4-0-6.tar.gz) = 00beb8d601af7dba7f9e0c30f00c3f90fd3e786346b60997a7708674214a2df9
SHA512 (netatalk-4-0-6.tar.gz) = d0a99bc8200d767dba8254cf21b9880267da4a18524dbbffec2049dca747f0fe3d7023d26098c5bdc1fca160d06cc019f23e9f34be9ca9f823b3071a6cc729c8
Size (netatalk-4-0-6.tar.gz) = 1326496 bytes
+SHA1 (patch-config_meson.build) = ec5be047b65e37afc4b78f36518623169eeb0e16
+SHA1 (patch-config_pam_meson.build) = f321c7bd246f1d82c287e745ea75c9561bc528a9
SHA1 (patch-libatalk_bstring_bstrlib.c) = 8f38b0c0abea02074172b11f066f0628eb54c55c
SHA1 (patch-meson.build) = 1a62c6009058e2e38fe9017afe30a8732c86d40d
Added files:
Index: pkgsrc/net/netatalk4/patches/patch-config_meson.build
diff -u /dev/null pkgsrc/net/netatalk4/patches/patch-config_meson.build:1.1
--- /dev/null Mon Dec 16 15:40:54 2024
+++ pkgsrc/net/netatalk4/patches/patch-config_meson.build Mon Dec 16 15:40:54 2024
@@ -0,0 +1,72 @@
+$NetBSD: patch-config_meson.build,v 1.1 2024/12/16 15:40:54 hauke Exp $
+
+Leave installation of config files to pkgsrc framework
+
+--- config/meson.build.orig 2024-12-16 15:31:18.321903696 +0000
++++ config/meson.build
+@@ -10,65 +10,6 @@ dbus_session_conf = configure_file(
+ configuration: cdata,
+ )
+
+-if (
+- fs.exists(pkgconfdir / 'afp.conf')
+- and not get_option('with-overwrite')
+-)
+- message('will not replace existing', pkgconfdir / 'afp.conf')
+-else
+- install_data(afp_conf, install_dir: pkgconfdir)
+-endif
+-
+-if (
+- fs.exists(pkgconfdir / 'dbus-session.conf')
+- and not get_option('with-overwrite')
+-)
+- message('will not replace existing', pkgconfdir / 'dbus-session.conf')
+-else
+- install_data(dbus_session_conf, install_dir: pkgconfdir)
+-endif
+-
+-if (
+- fs.exists(dbus_sysconfpath / 'netatalk-dbus.conf')
+- and not get_option('with-overwrite')
+-)
+- message('will not replace existing', dbus_sysconfpath / 'netatalk-dbus.conf')
+-else
+- install_data('netatalk-dbus.conf', install_dir: dbus_sysconfpath)
+-endif
+-
+-static_conf_files = ['extmap.conf']
+-
+-if have_appletalk
+- static_conf_files += ['atalkd.conf', 'papd.conf']
+-endif
+-
+-foreach file : static_conf_files
+- if (
+- fs.exists(pkgconfdir / file)
+- and not get_option('with-overwrite')
+- )
+- message('will not replace existing', pkgconfdir / file)
+- else
+- install_data(file, install_dir: pkgconfdir)
+- endif
+-endforeach
+-
+-if (
+- fs.exists('/etc/ld.so.conf.d')
+- and get_option('with-ldsoconf')
+-)
+- configure_file(
+- input: 'libatalk.conf.in',
+- output: 'libatalk.conf',
+- configuration: cdata,
+- install: true,
+- install_dir: '/etc/ld.so.conf.d',
+- )
+-endif
+-
+-install_data('README', install_dir: localstatedir / 'netatalk/CNID')
+-
+ if have_pam
+ subdir('pam')
+ endif
Index: pkgsrc/net/netatalk4/patches/patch-config_pam_meson.build
diff -u /dev/null pkgsrc/net/netatalk4/patches/patch-config_pam_meson.build:1.1
--- /dev/null Mon Dec 16 15:40:54 2024
+++ pkgsrc/net/netatalk4/patches/patch-config_pam_meson.build Mon Dec 16 15:40:54 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-config_pam_meson.build,v 1.1 2024/12/16 15:40:54 hauke Exp $
+
+Leave installation of config files to pkgsrc framework
+
+--- config/pam/meson.build.orig 2024-12-16 15:29:40.082881669 +0000
++++ config/pam/meson.build
+@@ -3,12 +3,3 @@ netatalk_pamd = configure_file(
+ output: 'netatalk',
+ configuration: cdata,
+ )
+-
+-if (
+- fs.exists(pam_confdir / 'netatalk')
+- and not get_option('with-overwrite')
+-)
+- message('will not replace existing', pam_confdir / 'netatalk')
+-else
+- install_data(netatalk_pamd, install_dir: pam_confdir)
+-endif
Home |
Main Index |
Thread Index |
Old Index