Tue Feb 28 16:24:01 2023 UTC ()
Remove comment -- upstream has dropped support for openssl 1.0 APIs.

No functional changes.


(hauke)
diff -r1.52 -r1.53 pkgsrc/net/netatalk22/Makefile
cvs diff -r1.52 -r1.53 pkgsrc/net/netatalk22/Makefile (switch to unified diff)

--- pkgsrc/net/netatalk22/Makefile 2023/02/28 15:33:59 1.52
+++ pkgsrc/net/netatalk22/Makefile 2023/02/28 16:24:01 1.53
@@ -1,93 +1,90 @@ @@ -1,93 +1,90 @@
1# $NetBSD: Makefile,v 1.52 2023/02/28 15:33:59 hauke Exp $ 1# $NetBSD: Makefile,v 1.53 2023/02/28 16:24:01 hauke Exp $
2 2
3DISTNAME= netatalk-2.2.8 3DISTNAME= netatalk-2.2.8
4PKGNAME= ${DISTNAME:C/-/22-/} 4PKGNAME= ${DISTNAME:C/-/22-/}
5CATEGORIES= net print 5CATEGORIES= net print
6MASTER_SITES= ${MASTER_SITE_GITHUB:=Netatalk/}Netatalk/releases/download/${DISTNAME:C/\./-/g}/ 6MASTER_SITES= ${MASTER_SITE_GITHUB:=Netatalk/}Netatalk/releases/download/${DISTNAME:C/\./-/g}/
7#PATCHFILES= patch-adv1tov2.c 7#PATCHFILES= patch-adv1tov2.c
8PATCH_SITES= http://svn.macosforge.org/repository/macports/trunk/dports/net/netatalk/files/ \ 8PATCH_SITES= http://svn.macosforge.org/repository/macports/trunk/dports/net/netatalk/files/ \
9 http://mirror.lug.udel.edu/pub/macports/trunk/dports/net/netatalk/files/ 9 http://mirror.lug.udel.edu/pub/macports/trunk/dports/net/netatalk/files/
10 10
11MAINTAINER= markd@NetBSD.org 11MAINTAINER= markd@NetBSD.org
12HOMEPAGE= http://netatalk.sourceforge.net/ 12HOMEPAGE= http://netatalk.sourceforge.net/
13COMMENT= Netatalk appletalk file and print services 13COMMENT= Netatalk appletalk file and print services
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16BDB_ACCEPTED= db4 db5 16BDB_ACCEPTED= db4 db5
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= gmake pkg-config perl:run 18USE_TOOLS+= gmake pkg-config perl:run
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20 20
21# https://mail-index.netbsd.org/pkgsrc-users/2021/10/01/msg034512.html 21# https://mail-index.netbsd.org/pkgsrc-users/2021/10/01/msg034512.html
22CHECK_RELRO_SKIP+= libexec/netatalk/uams/*.a 22CHECK_RELRO_SKIP+= libexec/netatalk/uams/*.a
23 23
24BUILDLINK_TRANSFORM+= l:db48:${BDB_TYPE} 24BUILDLINK_TRANSFORM+= l:db48:${BDB_TYPE}
25 25
26PKG_SYSCONFSUBDIR= netatalk 26PKG_SYSCONFSUBDIR= netatalk
27EGDIR= ${PREFIX}/share/examples/netatalk 27EGDIR= ${PREFIX}/share/examples/netatalk
28CONF_FILES= ${EGDIR}/AppleVolumes.default ${PKG_SYSCONFDIR}/AppleVolumes.default 28CONF_FILES= ${EGDIR}/AppleVolumes.default ${PKG_SYSCONFDIR}/AppleVolumes.default
29CONF_FILES+= ${EGDIR}/AppleVolumes.system ${PKG_SYSCONFDIR}/AppleVolumes.system 29CONF_FILES+= ${EGDIR}/AppleVolumes.system ${PKG_SYSCONFDIR}/AppleVolumes.system
30CONF_FILES+= ${EGDIR}/afpd.conf ${PKG_SYSCONFDIR}/afpd.conf 30CONF_FILES+= ${EGDIR}/afpd.conf ${PKG_SYSCONFDIR}/afpd.conf
31CONF_FILES+= ${EGDIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf 31CONF_FILES+= ${EGDIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf
32CONF_FILES+= ${EGDIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf 32CONF_FILES+= ${EGDIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf
33CONF_FILES+= ${EGDIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf 33CONF_FILES+= ${EGDIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf
34 34
35.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
36 36
37BUILD_DEFS+= VARBASE 37BUILD_DEFS+= VARBASE
38CONFIGURE_ARGS+= --enable-overwrite 38CONFIGURE_ARGS+= --enable-overwrite
39CONFIGURE_ARGS+= --enable-timelord 39CONFIGURE_ARGS+= --enable-timelord
40CONFIGURE_ARGS+= --enable-ddp 40CONFIGURE_ARGS+= --enable-ddp
41CONFIGURE_ARGS+= --enable-quota 41CONFIGURE_ARGS+= --enable-quota
42CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/netatalk 42CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/netatalk
43CONFIGURE_ARGS+= --sbindir=${PREFIX}/libexec/netatalk 43CONFIGURE_ARGS+= --sbindir=${PREFIX}/libexec/netatalk
44CONFIGURE_ARGS+= --with-pkgconfdir=${PKG_SYSCONFDIR} 44CONFIGURE_ARGS+= --with-pkgconfdir=${PKG_SYSCONFDIR}
45CONFIGURE_ARGS+= --with-message-dir=${PKG_SYSCONFDIR}/msg 45CONFIGURE_ARGS+= --with-message-dir=${PKG_SYSCONFDIR}/msg
46CONFIGURE_ARGS+= --localstatedir=${VARBASE}/netatalk 46CONFIGURE_ARGS+= --localstatedir=${VARBASE}/netatalk
47CONFIGURE_ARGS+= --with-uams-path=${PREFIX}/libexec/netatalk/uams 47CONFIGURE_ARGS+= --with-uams-path=${PREFIX}/libexec/netatalk/uams
48CONFIGURE_ARGS+= --with-bdb=${BDBBASE} 48CONFIGURE_ARGS+= --with-bdb=${BDBBASE}
49CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl} 49CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl}
50CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} 50CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
51 51
52# See <http://mail-index.netbsd.org/netbsd-users/2019/04/25/msg022684.html> 
53#CFLAGS+= -DOPENSSL_API_COMPAT=0x10000000L 
54 
55MAKE_DIRS+= ${PKG_SYSCONFDIR}/msg 52MAKE_DIRS+= ${PKG_SYSCONFDIR}/msg
56 53
57SUBST_CLASSES+= paths 54SUBST_CLASSES+= paths
58SUBST_MESSAGE.paths= Fixing hardcoded paths. 55SUBST_MESSAGE.paths= Fixing hardcoded paths.
59SUBST_STAGE.paths= pre-configure 56SUBST_STAGE.paths= pre-configure
60SUBST_FILES.paths= etc/psf/etc2ps.sh 57SUBST_FILES.paths= etc/psf/etc2ps.sh
61SUBST_SED.paths= -e 's,^\(DVIPS="*\)/usr\(/bin\),\1${PREFIX}\2,' 58SUBST_SED.paths= -e 's,^\(DVIPS="*\)/usr\(/bin\),\1${PREFIX}\2,'
62 59
63.if ${OPSYS} == "NetBSD" 60.if ${OPSYS} == "NetBSD"
64CONFIGURE_ARGS+= --enable-netbsd 61CONFIGURE_ARGS+= --enable-netbsd
65RCD_SCRIPTS= afpd atalkd papd timelord cnid_metad 62RCD_SCRIPTS= afpd atalkd papd timelord cnid_metad
66. for f in ${RCD_SCRIPTS} 63. for f in ${RCD_SCRIPTS}
67RCD_SCRIPT_SRC.${f}= ${WRKSRC}/distrib/initscripts/${f} 64RCD_SCRIPT_SRC.${f}= ${WRKSRC}/distrib/initscripts/${f}
68. endfor 65. endfor
69.endif 66.endif
70 67
71PLIST_VARS+= ea 68PLIST_VARS+= ea
72.if ${OPSYS} == "SunOS" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \ 69.if ${OPSYS} == "SunOS" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \
73 (${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 070000) || \ 70 (${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 070000) || \
74 ${OPSYS} == "FreeBSD" 71 ${OPSYS} == "FreeBSD"
75PLIST.ea= yes 72PLIST.ea= yes
76.endif 73.endif
77 74
78CHECK_SSP_SKIP+= libexec/netatalk/uams/*.a 75CHECK_SSP_SKIP+= libexec/netatalk/uams/*.a
79 76
80.include "options.mk" 77.include "options.mk"
81 78
82INSTALLATION_DIRS= libexec/psffilters 79INSTALLATION_DIRS= libexec/psffilters
83 80
84post-install: 81post-install:
85.if !empty(PKG_OPTIONS:Mpam) 82.if !empty(PKG_OPTIONS:Mpam)
86 ${INSTALL_DATA} ${WRKSRC}/config/pam/netatalk.pam ${DESTDIR}${EGDIR} 83 ${INSTALL_DATA} ${WRKSRC}/config/pam/netatalk.pam ${DESTDIR}${EGDIR}
87.endif 84.endif
88 85
89.include "../../security/libgcrypt/buildlink3.mk" 86.include "../../security/libgcrypt/buildlink3.mk"
90.include "../../security/openssl/buildlink3.mk" 87.include "../../security/openssl/buildlink3.mk"
91.include "../../security/tcp_wrappers/buildlink3.mk" 88.include "../../security/tcp_wrappers/buildlink3.mk"
92.include "../../mk/bdb.buildlink3.mk" 89.include "../../mk/bdb.buildlink3.mk"
93.include "../../mk/bsd.pkg.mk" 90.include "../../mk/bsd.pkg.mk"