Sat Sep 2 15:26:58 2023 UTC ()
sysutils/fam: remove redundant CPP/LDFLAGS.


(vins)
diff -r1.45 -r1.46 pkgsrc/sysutils/fam/Makefile
cvs diff -r1.45 -r1.46 pkgsrc/sysutils/fam/Makefile (switch to unified diff)

--- pkgsrc/sysutils/fam/Makefile 2023/08/30 17:56:20 1.45
+++ pkgsrc/sysutils/fam/Makefile 2023/09/02 15:26:58 1.46
@@ -1,100 +1,98 @@ @@ -1,100 +1,98 @@
1# $NetBSD: Makefile,v 1.45 2023/08/30 17:56:20 vins Exp $ 1# $NetBSD: Makefile,v 1.46 2023/09/02 15:26:58 vins Exp $
2 2
3DISTNAME= fam-2.7.0 3DISTNAME= fam-2.7.0
4PKGREVISION= 9 4PKGREVISION= 9
5CATEGORIES= sysutils devel 5CATEGORIES= sysutils devel
6#MASTER_SITES= ftp://oss.sgi.com/projects/fam/download/stable/ 6#MASTER_SITES= ftp://oss.sgi.com/projects/fam/download/stable/
7MASTER_SITES+= ${MASTER_SITE_GENTOO:=distfiles/} 7MASTER_SITES+= ${MASTER_SITE_GENTOO:=distfiles/}
8 8
9CONFLICTS+= gamin-[0-9]* 9CONFLICTS+= gamin-[0-9]*
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12#HOMEPAGE= http://oss.sgi.com/projects/fam/ 12#HOMEPAGE= http://oss.sgi.com/projects/fam/
13COMMENT= File Alteration Monitor 13COMMENT= File Alteration Monitor
14LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 # fam and libfam 14LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 # fam and libfam
15 15
16# fam is bundled with IRIX 16# fam is bundled with IRIX
17NOT_FOR_PLATFORM= IRIX-*-* 17NOT_FOR_PLATFORM= IRIX-*-*
18 18
19USE_TOOLS+= gmake 19USE_TOOLS+= gmake
20USE_LIBTOOL= YES 20USE_LIBTOOL= YES
21GNU_CONFIGURE= YES 21GNU_CONFIGURE= YES
22USE_LANGUAGES= c c++ 22USE_LANGUAGES= c c++
23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
24 24
25EGDIR= ${PREFIX}/share/examples/fam 25EGDIR= ${PREFIX}/share/examples/fam
26CONF_FILES= ${EGDIR}/fam.conf ${PKG_SYSCONFDIR}/fam.conf 26CONF_FILES= ${EGDIR}/fam.conf ${PKG_SYSCONFDIR}/fam.conf
27 27
28RCD_SCRIPTS= famd 28RCD_SCRIPTS= famd
29 29
30SUBST_CLASSES+= paths 30SUBST_CLASSES+= paths
31SUBST_MESSAGE.paths= Fixing hardcoded paths. 31SUBST_MESSAGE.paths= Fixing hardcoded paths.
32SUBST_STAGE.paths= pre-configure 32SUBST_STAGE.paths= pre-configure
33SUBST_FILES.paths= man/famd.conf.5 man/famd.8 33SUBST_FILES.paths= man/famd.conf.5 man/famd.8
34SUBST_SED.paths= -e 's,/usr/local/etc/,${PKG_SYSCONFDIR}/,g' 34SUBST_SED.paths= -e 's,/usr/local/etc/,${PKG_SYSCONFDIR}/,g'
35 35
36PKG_OPTIONS_VAR= PKG_OPTIONS.fam 36PKG_OPTIONS_VAR= PKG_OPTIONS.fam
37PKG_SUPPORTED_OPTIONS= kqueue 37PKG_SUPPORTED_OPTIONS= kqueue
38 38
39.include "../../mk/bsd.options.mk" 39.include "../../mk/bsd.options.mk"
40 40
41.if !empty(PKG_OPTIONS:Mkqueue) && \ 41.if !empty(PKG_OPTIONS:Mkqueue) && \
42 (${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD") 42 (${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD")
43CPPFLAGS+= -DHAVE_KQUEUE 43CPPFLAGS+= -DHAVE_KQUEUE
44 44
45SUBST_CLASSES+= kqueue 45SUBST_CLASSES+= kqueue
46SUBST_MESSAGE.kqueue= Enabling kqueue monitoring. 46SUBST_MESSAGE.kqueue= Enabling kqueue monitoring.
47SUBST_STAGE.kqueue= pre-configure 47SUBST_STAGE.kqueue= pre-configure
48SUBST_FILES.kqueue= src/Makefile.in 48SUBST_FILES.kqueue= src/Makefile.in
49SUBST_SED.kqueue= -e 's,@MONITOR_FUNCS@,IMonKQueue,g' 49SUBST_SED.kqueue= -e 's,@MONITOR_FUNCS@,IMonKQueue,g'
50SUBST_SED.kqueue+= -e 's,@LIBS@,@LIBS@ -lpthread,g' 50SUBST_SED.kqueue+= -e 's,@LIBS@,@LIBS@ -lpthread,g'
51 51
52MESSAGE_SRC= ${.CURDIR}/MESSAGE ${.CURDIR}/MESSAGE.kqueue 52MESSAGE_SRC= ${.CURDIR}/MESSAGE ${.CURDIR}/MESSAGE.kqueue
53 53
54.include "../../mk/pthread.buildlink3.mk" 54.include "../../mk/pthread.buildlink3.mk"
55.endif 55.endif
56 56
57.if ${OPSYS} == "Linux" 57.if ${OPSYS} == "Linux"
58CPPFLAGS+= -I${PREFIX}/include/tirpc 58# glibc lacks RPC support.
59MAKEFLAGS+= LDFLAGS="${LDFLAGS} -ltirpc" 
60 
61.include "../../devel/libtirpc/buildlink3.mk" 59.include "../../devel/libtirpc/buildlink3.mk"
62.endif 60.endif
63 61
64CPPFLAGS.Darwin+= -DNDEBUG 62CPPFLAGS.Darwin+= -DNDEBUG
65LDFLAGS.SunOS+= -lsocket -lnsl 63LDFLAGS.SunOS+= -lsocket -lnsl
66 64
67SUBST_CLASSES.SunOS+= sunfix 65SUBST_CLASSES.SunOS+= sunfix
68SUBST_MESSAGE.sunfix= Fixing ${OPSYS} namespace collision. 66SUBST_MESSAGE.sunfix= Fixing ${OPSYS} namespace collision.
69SUBST_STAGE.sunfix= pre-configure 67SUBST_STAGE.sunfix= pre-configure
70SUBST_FILES.sunfix+= lib/Client.c++ 68SUBST_FILES.sunfix+= lib/Client.c++
71SUBST_FILES.sunfix+= src/ClientConnection.c++ src/ClientConnection.h 69SUBST_FILES.sunfix+= src/ClientConnection.c++ src/ClientConnection.h
72SUBST_FILES.sunfix+= src/LocalClient.c++ src/LocalClient.h 70SUBST_FILES.sunfix+= src/LocalClient.c++ src/LocalClient.h
73SUBST_FILES.sunfix+= src/Listener.c++ 71SUBST_FILES.sunfix+= src/Listener.c++
74SUBST_FILES.sunfix+= src/TCP_Client.h 72SUBST_FILES.sunfix+= src/TCP_Client.h
75SUBST_SED.sunfix= -e 's/sun\([^_]\)/sa_un\1/g' 73SUBST_SED.sunfix= -e 's/sun\([^_]\)/sa_un\1/g'
76 74
77SUBST_CLASSES.SunOS+= dirent 75SUBST_CLASSES.SunOS+= dirent
78SUBST_MESSAGE.dirent= Fixing old sys/dir.h usage. 76SUBST_MESSAGE.dirent= Fixing old sys/dir.h usage.
79SUBST_STAGE.dirent= pre-configure 77SUBST_STAGE.dirent= pre-configure
80SUBST_FILES.dirent+= src/Directory.c++ 78SUBST_FILES.dirent+= src/Directory.c++
81SUBST_FILES.dirent+= src/DirectoryScanner.c++ src/DirectoryScanner.h 79SUBST_FILES.dirent+= src/DirectoryScanner.c++ src/DirectoryScanner.h
82SUBST_SED.dirent= -e 's,sys/dir.h,dirent.h,g' 80SUBST_SED.dirent= -e 's,sys/dir.h,dirent.h,g'
83SUBST_SED.dirent+= -e 's/struct direct/struct dirent/g' 81SUBST_SED.dirent+= -e 's/struct direct/struct dirent/g'
84 82
85.include "../../mk/compiler.mk" 83.include "../../mk/compiler.mk"
86 84
87# type 'unsigned long' to 'rpcprog_t' (aka 'unsigned int') 85# type 'unsigned long' to 'rpcprog_t' (aka 'unsigned int')
88.if !empty(PKGSRC_COMPILER:Mclang) 86.if !empty(PKGSRC_COMPILER:Mclang)
89CXXFLAGS.SunOS+= -Wno-c++11-narrowing 87CXXFLAGS.SunOS+= -Wno-c++11-narrowing
90.endif 88.endif
91 89
92.if !empty(PKGSRC_COMPILER:Msunpro) 90.if !empty(PKGSRC_COMPILER:Msunpro)
93BUILDLINK_TRANSFORM+= rm:-lstdc++ 91BUILDLINK_TRANSFORM+= rm:-lstdc++
94.endif 92.endif
95 93
96post-extract: 94post-extract:
97 ${CP} ${FILESDIR}/IMonKQueue.c++ ${WRKSRC}/src 95 ${CP} ${FILESDIR}/IMonKQueue.c++ ${WRKSRC}/src
98 ${CP} ${FILESDIR}/imon-compat.h ${WRKSRC}/src 96 ${CP} ${FILESDIR}/imon-compat.h ${WRKSRC}/src
99 97
100.include "../../mk/bsd.pkg.mk" 98.include "../../mk/bsd.pkg.mk"