diff options
Diffstat (limited to 'net')
47 files changed, 165 insertions, 318 deletions
diff --git a/net/6tunnel/Makefile b/net/6tunnel/Makefile index 1e148ec6abc..0e133401cb9 100644 --- a/net/6tunnel/Makefile +++ b/net/6tunnel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2013/04/06 03:45:20 rodent Exp $ +# $NetBSD: Makefile,v 1.15 2016/02/25 16:20:49 jperkin Exp $ # DISTNAME= 6tunnel-0.11rc2 @@ -11,11 +11,7 @@ COMMENT= Tunnelling for applications that don't speak IPv6 NOT_FOR_PLATFORM+= Interix-*-* # no IPv6 support -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -LDFLAGS+= -lsocket -lnsl -.endif +LDFLAGS.SunOS+= -lsocket -lnsl INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/net/IglooFTP/Makefile b/net/IglooFTP/Makefile index 982e8124a7a..417ec766159 100644 --- a/net/IglooFTP/Makefile +++ b/net/IglooFTP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/10/23 17:18:08 asau Exp $ +# $NetBSD: Makefile,v 1.19 2016/02/25 16:20:50 jperkin Exp $ DISTNAME= IglooFTP-0.6.1 PKGREVISION= 6 @@ -15,13 +15,9 @@ BUILD_DIRS= src post-extract: ${RM} ${WRKSRC}/share/docs/LICENSE~ -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "DragonFly" -LDFLAGS.resolv= -.else -LDFLAGS.resolv= -lresolv -.endif +OPSYSVARS+= LDFLAGS.resolv +LDFLAGS.resolv.DragonFly= # empty +LDFLAGS.resolv.*= -lresolv MAKE_ENV+= LDFLAGS.resolv=${LDFLAGS.resolv:Q} diff --git a/net/aget/Makefile b/net/aget/Makefile index 2f523efe9e2..dcc5893294c 100644 --- a/net/aget/Makefile +++ b/net/aget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2014/10/09 14:06:44 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2016/02/25 16:20:50 jperkin Exp $ # DISTNAME= aget-0.4 @@ -12,8 +12,6 @@ COMMENT= Multithreaded HTTP download accelerator NO_CONFIGURE= yes -.include "../../mk/bsd.prefs.mk" - SUBST_CLASSES+= options SUBST_MESSAGE.options= Fixing build options. SUBST_STAGE.options= post-patch @@ -26,10 +24,8 @@ PTHREAD_OPTS+= require LDFLAGS+= ${PTHREAD_LIBS} PTHREAD_AUTO_VARS= yes -.if ${OPSYS} == "SunOS" -CFLAGS+= -DSOLARIS -LDFLAGS+= -lsocket -lnsl -lresolv -.endif +CFLAGS.SunOS+= -DSOLARIS +LDFLAGS.SunOS+= -lsocket -lnsl -lresolv INSTALLATION_DIRS= bin diff --git a/net/arpd/Makefile b/net/arpd/Makefile index 9f3a43d6bc9..ffdd87b2a66 100644 --- a/net/arpd/Makefile +++ b/net/arpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/10/23 17:18:10 asau Exp $ +# $NetBSD: Makefile,v 1.19 2016/02/25 16:20:50 jperkin Exp $ # DISTNAME= arpd @@ -17,12 +17,8 @@ MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} INSTALLATION_DIRS= sbin share/doc ${PREFIX}/etc -.include "../../mk/bsd.prefs.mk" - # Bogus warning from GCC 4.5 -.if ${OPSYS} == "NetBSD" -BUILDLINK_TRANSFORM+= rm:-Werror -.endif +BUILDLINK_TRANSFORM.NetBSD+= rm:-Werror post-install: ${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/arpd.README diff --git a/net/avahi/Makefile b/net/avahi/Makefile index 97c2f6938d3..b4d27d6d2b0 100644 --- a/net/avahi/Makefile +++ b/net/avahi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2015/10/10 01:58:15 ryoon Exp $ +# $NetBSD: Makefile,v 1.60 2016/02/25 16:20:50 jperkin Exp $ DISTNAME= avahi-0.6.31 PKGREVISION= 24 @@ -46,10 +46,7 @@ PKG_GECOS.${AVAHI_USER}= Avahi user .include "options.mk" -.if ${OPSYS} == "NetBSD" -CFLAGS+= -D_NETBSD_SOURCE -.endif - +CFLAGS.NetBSD+= -D_NETBSD_SOURCE CPPFLAGS.SunOS+= --std=c99 -D_XOPEN_SOURCE=600 # Not yet reported upstream. CPPFLAGS.Darwin+= -D__APPLE_USE_RFC_3542 diff --git a/net/balance/Makefile b/net/balance/Makefile index 396a3d24399..ea705fd1a4e 100644 --- a/net/balance/Makefile +++ b/net/balance/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2015/09/05 16:16:03 wiedi Exp $ +# $NetBSD: Makefile,v 1.10 2016/02/25 16:20:50 jperkin Exp $ # DISTNAME= balance-3.57 @@ -13,10 +13,7 @@ LICENSE= gnu-gpl-v2 BUILD_DEFS+= VARBASE MAKE_ENV+= VARBASE=${VARBASE} -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -MAKE_ENV+= LIBRARIES="-lsocket -lnsl" -.endif +MAKE_ENV.SunOS+= LIBRARIES="-lsocket -lnsl" OWN_DIRS_PERMS= ${VARBASE}/run/balance \ ${ROOT_USER} ${ROOT_GROUP} 0750 diff --git a/net/bind910/Makefile b/net/bind910/Makefile index 4b2e0b6f091..827704f5289 100644 --- a/net/bind910/Makefile +++ b/net/bind910/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2016/01/20 02:15:58 taca Exp $ +# $NetBSD: Makefile,v 1.16 2016/02/25 16:20:50 jperkin Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= ${DISTNAME:S/-P/pl/} @@ -39,9 +39,7 @@ CONFIGURE_ARGS+= --disable-atomic .if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} != "" CONFIGURE_ARGS+= --disable-threads .endif -.if ${OPSYS} == "DragonFly" -CONFIGURE_ARGS+= --disable-kqueue -.endif +CONFIGURE_ARGS.DragonFly+= --disable-kqueue PKG_GROUPS_VARS+= BIND_GROUP PKG_USERS_VARS= BIND_USER diff --git a/net/bind99/Makefile b/net/bind99/Makefile index 1d3fecefa1e..8fba7f2f6a1 100644 --- a/net/bind99/Makefile +++ b/net/bind99/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2016/01/20 02:17:12 taca Exp $ +# $NetBSD: Makefile,v 1.52 2016/02/25 16:20:50 jperkin Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= ${DISTNAME:S/-P/pl/} @@ -40,9 +40,7 @@ CONFIGURE_ARGS+= --disable-atomic .if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} != "" CONFIGURE_ARGS+= --disable-threads .endif -.if ${OPSYS} == "DragonFly" -CONFIGURE_ARGS+= --disable-kqueue -.endif +CONFIGURE_ARGS.DragonFly+= --disable-kqueue PKG_GROUPS_VARS+= BIND_GROUP PKG_USERS_VARS+= BIND_USER diff --git a/net/bing/Makefile b/net/bing/Makefile index c63190a6c89..fea312043f6 100644 --- a/net/bing/Makefile +++ b/net/bing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2012/10/23 17:18:11 asau Exp $ +# $NetBSD: Makefile,v 1.27 2016/02/25 16:20:50 jperkin Exp $ DISTNAME= bing-1.0.4 CATEGORIES= net @@ -8,11 +8,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://fgouget.free.fr/bing/index-en.shtml COMMENT= Bing is a point-to-point bandwidth measurement tool -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -LDFLAGS+= -lsocket -lnsl -.endif +LDFLAGS.SunOS+= -lsocket -lnsl INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 share/doc/bing diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile index bf64ac45504..e86bc165373 100644 --- a/net/bug-buddy/Makefile +++ b/net/bug-buddy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.107 2015/10/10 01:58:15 ryoon Exp $ +# $NetBSD: Makefile,v 1.108 2016/02/25 16:20:50 jperkin Exp $ # DISTNAME= bug-buddy-2.30.0 @@ -21,15 +21,13 @@ CPPFLAGS+= -I${LOCALBASE}/include/libelf GCONF_SCHEMAS= bug-buddy.schemas +CONFIGURE_ARGS.SunOS+= --disable-google-breakpad + pre-configure: cd ${WRKSRC} && autoconf -f .include "options.mk" -.if ${OPSYS} == "SunOS" -CONFIGURE_ARGS+= --disable-google-breakpad -.endif - .include "../../mk/omf-scrollkeeper.mk" .include "../../devel/GConf/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/net/csup/Makefile b/net/csup/Makefile index c8c388e0648..d1c4d6a608f 100644 --- a/net/csup/Makefile +++ b/net/csup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2014/02/12 23:18:19 tron Exp $ +# $NetBSD: Makefile,v 1.10 2016/02/25 16:20:50 jperkin Exp $ # DISTNAME= csup-snap-20100404 @@ -34,9 +34,7 @@ CFLAGS+= -DHAVE_FFLAGS .endif # taken from ${WRKSRC}/GNUmakefile -.if ${OPSYS} == "Linux" -CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -.endif +CFLAGS.Linux+= -D_XOPEN_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/net/dnsmasq/Makefile b/net/dnsmasq/Makefile index c46553971f0..dfc085c7185 100644 --- a/net/dnsmasq/Makefile +++ b/net/dnsmasq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2015/08/15 12:38:17 leot Exp $ +# $NetBSD: Makefile,v 1.32 2016/02/25 16:20:50 jperkin Exp $ DISTNAME= dnsmasq-2.75 CATEGORIES= net @@ -46,9 +46,7 @@ PLIST.dbus= yes CFLAGS+= -DNO_IPV6 .endif -.if ${OPSYS} == "SunOS" -CFLAGS+= -DNO_IPSET -.endif +CFLAGS.SunOS+= -DNO_IPSET # Override the defaults AUTO_MKDIRS=yes diff --git a/net/ftpproxy/Makefile b/net/ftpproxy/Makefile index 2852bbeb6bc..cb447c8210d 100644 --- a/net/ftpproxy/Makefile +++ b/net/ftpproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/23 17:18:22 asau Exp $ +# $NetBSD: Makefile,v 1.17 2016/02/25 16:20:50 jperkin Exp $ # DISTNAME= ftpproxy-${VERSION} @@ -16,11 +16,10 @@ VERSION= 1.2.3 .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -LIBS+= -lsocket -lnsl -OSFLAG= -DSOLARIS -.endif -MAKE_ENV+= OSFLAG=${OSFLAG:Q} OSLIB=${LIBS:M*:Q} VERSION=${VERSION:Q} +MAKE_ENV+= OSLIB=${LIBS:M*:Q} VERSION=${VERSION:Q} + +LIBS.SunOS+= -lsocket -lnsl +MAKE_ENV.SunOS+= OSFLAG=-DSOLARIS INSTALLATION_DIRS= libexec ${PKGMANDIR}/man8 diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile index 47187884502..e7adc707993 100644 --- a/net/gtk-vnc/Makefile +++ b/net/gtk-vnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2015/08/23 14:30:35 wiz Exp $ +# $NetBSD: Makefile,v 1.48 2016/02/25 16:20:51 jperkin Exp $ # DISTNAME= gtk-vnc-0.5.2 @@ -45,12 +45,10 @@ do-configure: --with-gtk=3.0 # The GTK3 build excludes some functions which are still listed in the mapfile. -.if ${OPSYS} == "SunOS" -SUBST_CLASSES+= mapfile +SUBST_CLASSES.SunOS+= mapfile SUBST_STAGE.mapfile= pre-build SUBST_FILES.mapfile= gtk3-build/src/Makefile SUBST_SED.mapfile= -e '/VERSION_SCRIPT_FLAGS.*GTK_VNC_VERSION_FILE/d' -.endif #VIEW_REQUIRED=0.6.0 #libview diff --git a/net/host/Makefile b/net/host/Makefile index 857b71515b3..03191135df4 100644 --- a/net/host/Makefile +++ b/net/host/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2014/08/28 10:58:18 jperkin Exp $ +# $NetBSD: Makefile,v 1.30 2016/02/25 16:20:51 jperkin Exp $ DISTNAME= host-20070128 CATEGORIES= net @@ -19,20 +19,18 @@ MAKE_FLAGS+= __NetBSD__=1 USE_TOOLS+= nroff +BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,--warn-common +BUILDLINK_TRANSFORM.Darwin+= rm:-static +CPPFLAGS.Darwin+= -DBIND_8_COMPAT + +BUILDLINK_TRANSFORM.SunOS+= rm:-static +LDFLAGS.SunOS+= -lresolv -lsocket -lnsl + +BUILDLINK_TRANSFORM.Linux+= rm:-static +LDFLAGS.Linux+= -lresolv + .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "Darwin" -CPPFLAGS+= -DBIND_8_COMPAT -BUILDLINK_TRANSFORM+= rm:-Wl,--warn-common -BUILDLINK_TRANSFORM+= rm:-static -.endif -.if ${OPSYS} == "SunOS" -LDFLAGS+= -lresolv -lsocket -lnsl -BUILDLINK_TRANSFORM+= rm:-static -.endif -.if ${OPSYS} == "Linux" -LDFLAGS+= -lresolv -BUILDLINK_TRANSFORM+= rm:-static -.endif + .if !empty(MACHINE_PLATFORM:MIRIX-5*) CPPFLAGS+= -DIRIX5 .endif diff --git a/net/icsi-finger/Makefile b/net/icsi-finger/Makefile index 349adbad94e..8353276a93d 100644 --- a/net/icsi-finger/Makefile +++ b/net/icsi-finger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2015/11/08 21:41:25 dholland Exp $ +# $NetBSD: Makefile,v 1.29 2016/02/25 16:20:51 jperkin Exp $ # DISTNAME= icsi-finger-1.0.29 @@ -16,22 +16,19 @@ WRKSRC= ${WRKDIR}/finger XMPLD= ${DESTDIR}${PREFIX}/share/examples/icsi-finger XMPLDT= ${XMPLD}/targets -.include "../../mk/compiler.mk" -.include "../../mk/bsd.prefs.mk" - INSTALLATION_DIRS= bin libexec sbin INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 INSTALLATION_DIRS+= share/examples/icsi-finger/targets TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp +.include "../../mk/compiler.mk" + .if !empty(PKGSRC_COMPILER:Mclang) CPPFLAGS+= -Wno-error=return-type .endif -.if ${OPSYS} == "SunOS" -MAKE_ENV+= CPP_ARGS=-DSVR4 -.endif +MAKE_ENV.SunOS+= CPP_ARGS=-DSVR4 pre-configure: chmod +w ${WRKSRC}/config.h diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common index 3b56f1c56f3..3a71515490d 100644 --- a/net/isc-dhcp4/Makefile.common +++ b/net/isc-dhcp4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.28 2016/01/22 12:06:40 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.29 2016/02/25 16:20:51 jperkin Exp $ # # used by net/isc-dhcp4/Makefile # used by net/isc-dhcpd4/Makefile @@ -50,14 +50,12 @@ CONFIGURE_ARGS+= --with-relay6-pid-file=${DHCP_PID}/isc-dhcrelay6.pid .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) CONFIGURE_ENV+= BUILD_CC=${NATIVE_CC:Q} -. if ${OPSYS} == "NetBSD" # Target will have /dev/random. For whatever reason this package # requires you to specify the random device to use, and for native # compilation it uses /dev/random, so we'll match that here even though # it is almost certainly the case that it should be using /dev/urandom. -CONFIGURE_ENV+= ac_cv_file__dev_random=yes -CONFIGURE_ARGS+= --with-randomdev=/dev/random -. endif +CONFIGURE_ENV.NetBSD+= ac_cv_file__dev_random=yes +CONFIGURE_ARGS.NetBSD+= --with-randomdev=/dev/random .endif SUBST_CLASSES+= config diff --git a/net/isic/Makefile b/net/isic/Makefile index 0516fb763d3..cdd5cd6ccd2 100644 --- a/net/isic/Makefile +++ b/net/isic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2012/10/23 17:18:30 asau Exp $ +# $NetBSD: Makefile,v 1.20 2016/02/25 16:20:51 jperkin Exp $ # DISTNAME= isic-0.07 @@ -15,20 +15,13 @@ GNU_CONFIGURE= YES INSTALLATION_DIRS+= share/doc +# XXX: this was originally added for NetBSD/alpha gcc-2.95.3, but then was +# XXX: made to apply to all NetBSD platforms without comment in -r1.18. Check +# XXX: it is still required. +BUILDLINK_TRANSFORM.NetBSD+= rm:-O[0-9]* + post-install: ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/isic.README .include "../../devel/libnet11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" - -# XXX On NetBSD, the egcs and gcc-2.95.3 for: -# XXX -# XXX alpha -# XXX -# XXX has an optimization bug when compiling with -O2 -# -.if ${OPSYS} == "NetBSD" -#. if (${MACHINE_ARCH} == "alpha") -BUILDLINK_TRANSFORM+= rm:-O[0-9]* -#. endif -.endif diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index 5bb6dec37f3..38f60a1b72d 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.105 2015/04/25 14:23:45 tnn Exp $ +# $NetBSD: Makefile,v 1.106 2016/02/25 16:20:51 jperkin Exp $ DISTNAME= kdenetwork-${_KDE_VERSION} PKGREVISION= 35 @@ -25,13 +25,8 @@ CONFIGURE_ARGS+= --disable-meanwhile .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "NetBSD" -CONFIGURE_ENV+= ac_cv_header_net_if_ppp_h=yes -.endif - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= ac_cv_sys_file_offset_bits=no -.endif +CONFIGURE_ENV.NetBSD+= ac_cv_header_net_if_ppp_h=yes +CONFIGURE_ENV.SunOS+= ac_cv_sys_file_offset_bits=no .if ${X11_TYPE} != "native" .include "../../x11/libXScrnSaver/buildlink3.mk" diff --git a/net/knot/Makefile b/net/knot/Makefile index 5d9e2decd10..4936588f0a2 100644 --- a/net/knot/Makefile +++ b/net/knot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2015/12/13 00:01:29 pettai Exp $ +# $NetBSD: Makefile,v 1.28 2016/02/25 16:20:51 jperkin Exp $ DISTNAME= knot-2.0.2 CATEGORIES= net @@ -21,11 +21,7 @@ CONFIGURE_ARGS+= --with-storage=${VARBASE}/knot/lib CONFIGURE_ARGS+= --with-urcu=${BUILDLINK_PREFIX.userspace-rcu} CONFIGURE_ARGS+= --with-libidn=${BUILDLINK_PREFIX.libidn} -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --enable-recvmmsg=no -.endif +CONFIGURE_ARGS.NetBSD+= --enable-recvmmsg=no USE_LIBTOOL= yes USE_TOOLS+= bison flex gmake pkg-config diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile index d28c729fde8..78d5b5c1253 100644 --- a/net/libdnet/Makefile +++ b/net/libdnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2012/10/23 17:18:33 asau Exp $ +# $NetBSD: Makefile,v 1.22 2016/02/25 16:20:51 jperkin Exp $ # DISTNAME= libdnet-1.12 @@ -33,12 +33,7 @@ TEST_TARGET= check CONFIGURE_ARGS+= --without-check .endif -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "NetBSD" -CONFIGURE_ENV+= ac_cv_header_netinet_ip_fil_h=no -.endif -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= ac_cv_dnet_linux_pf_packet=no -.endif +CONFIGURE_ENV.NetBSD+= ac_cv_header_netinet_ip_fil_h=no +CONFIGURE_ENV.SunOS+= ac_cv_dnet_linux_pf_packet=no .include "../../mk/bsd.pkg.mk" diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile index f574fd7493d..e6503c212d2 100644 --- a/net/libpcap/Makefile +++ b/net/libpcap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2015/10/17 10:07:54 adam Exp $ +# $NetBSD: Makefile,v 1.61 2016/02/25 16:20:51 jperkin Exp $ DISTNAME= libpcap-1.7.4 CATEGORIES= net @@ -15,14 +15,10 @@ USE_LIBTOOL= yes USE_TOOLS+= bison flex gm4 GNU_CONFIGURE= yes -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ARGS+= --with-pcap=dlpi # Versions of SunOS which include getifaddrs confuse the configure script, # and result in dlpi stubs not being enabled. -CONFIGURE_ENV+= ac_cv_func_getifaddrs=no -.endif +CONFIGURE_ARGS.SunOS+= --with-pcap=dlpi +CONFIGURE_ENV.SunOS+= ac_cv_func_getifaddrs=no post-install: ${INSTALL_DATA} ${WRKSRC}/pcap-int.h ${DESTDIR}${PREFIX}/include diff --git a/net/libtrace/Makefile b/net/libtrace/Makefile index 2a5f8237ae2..77813921ae2 100644 --- a/net/libtrace/Makefile +++ b/net/libtrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/09/06 07:40:00 jperkin Exp $ +# $NetBSD: Makefile,v 1.12 2016/02/25 16:20:51 jperkin Exp $ # DISTNAME= libtrace-3.0.10 @@ -19,12 +19,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= libtrace_doxygen='false' -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "DragonFly" -CONFIGURE_ENV+= ac_cv_have_decl_BIOCSETIF=no -CFLAGS+= -DHAVE_VSNPRINTF -.endif +CONFIGURE_ENV.DragonFly+= ac_cv_have_decl_BIOCSETIF=no +CFLAGS.DragonFly+= -DHAVE_VSNPRINTF CFLAGS.Linux+= -DHAVE_VSNPRINTF diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile index 15d5e3e1f31..5a98005f521 100644 --- a/net/mDNSResponder/Makefile +++ b/net/mDNSResponder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2015/11/20 09:32:53 jperkin Exp $ +# $NetBSD: Makefile,v 1.41 2016/02/25 16:20:51 jperkin Exp $ DISTNAME= mDNSResponder-258.14 PKGREVISION= 2 @@ -18,31 +18,25 @@ MAKE_JOBS_SAFE= no USE_GCC_RUNTIME= yes -.include "../../mk/bsd.prefs.mk" +MAKE_ENV.NetBSD+= os=netbsd +MAKE_ENV.FreeBSD+= os=freebsd +MAKE_ENV.OpenBSD+= os=openbsd +MAKE_ENV.SunOS+= os=solaris +MAKE_ENV.Linux+= os=linux +MAKE_ENV.Darwin+= os=x +MAKE_ENV.*+= os=netbsd -SO_SUFFIX= so -.if ${OPSYS} == "NetBSD" -MAKE_ENV+= os=netbsd -.elif ${OPSYS} == "FreeBSD" -MAKE_ENV+= os=freebsd -.elif ${OPSYS} == "OpenBSD" -MAKE_ENV+= os=openbsd -.elif ${OPSYS} == "SunOS" -MAKE_ENV+= os=solaris -.elif ${OPSYS} == "Linux" -MAKE_ENV+= os=linux -.elif ${OPSYS} == "Darwin" -MAKE_ENV+= os=x -SO_SUFFIX= dylib -.else -MAKE_ENV+= os=netbsd -.endif -PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} +OPSYSVARS+= SO_SUFFIX +SO_SUFFIX.Darwin= dylib +SO_SUFFIX.*= so +PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} BINARY= mDNSClientPosix mDNSIdentify mDNSNetMonitor \ mDNSProxyResponderPosix mDNSResponderPosix SBINARY= mdnsd dnsextd +.include "../../mk/bsd.prefs.mk" + .if !empty(MACHINE_PLATFORM:MNetBSD-3.99.[1-7]-*) || \ !empty(MACHINE_PLATFORM:MNetBSD-3.[0-9]-*) || \ !empty(MACHINE_PLATFORM:MNetBSD-3.[0-9][._]*) || \ diff --git a/net/nagios-plugins/Makefile.common b/net/nagios-plugins/Makefile.common index d80412b9761..982b7edf154 100644 --- a/net/nagios-plugins/Makefile.common +++ b/net/nagios-plugins/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2015/04/03 17:50:27 rodent Exp $ +# $NetBSD: Makefile.common,v 1.12 2016/02/25 16:20:51 jperkin Exp $ # # used by net/nagios-plugin-mysql/Makefile # used by net/nagios-plugin-pgsql/Makefile @@ -13,10 +13,7 @@ MASTER_SITES?= http://nagios-plugins.org/download/ .include "../../net/nagios-base/Makefile.common" .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "DragonFly" -CONFIGURE_ARGS+= fu_cv_sys_stat_statvfs=no -.endif - +CONFIGURE_ARGS.DragonFly+= fu_cv_sys_stat_statvfs=no CONFIGURE_ARGS+= --with-nagios-user=${NAGIOS_USER:Q} CONFIGURE_ARGS+= --with-nagios-group=${NAGIOS_GROUP:Q} diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 9b0a003cebf..f67d5e60543 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.112 2015/08/20 13:51:03 jperkin Exp $ +# $NetBSD: Makefile,v 1.113 2016/02/25 16:20:52 jperkin Exp $ .include "Makefile.common" CATEGORIES= net @@ -23,9 +23,7 @@ MAKE_JOBS_SAFE= no # Don't compress manual pages as they include each other. .undef MANZ -.if ${OPSYS} == "DragonFly" -MAKE_ENV+= MIB_SYSTEM_LIBS=-lkinfo -.endif +MAKE_ENV.DragonFly+= MIB_SYSTEM_LIBS=-lkinfo .if ${OPSYS} == "NetBSD" OSVERSION_SPECIFIC= YES @@ -93,13 +91,11 @@ CONFIGURE_ARGS+= --with-dummy-values # CONFIGURE_ARGS+= --enable-ucd-snmp-compatibility -.if ${OPSYS} == "Darwin" -CFLAGS+= -framework ApplicationServices -CFLAGS+= -framework CoreFoundation -CFLAGS+= -framework CoreServices -CFLAGS+= -framework DiskArbitration -CFLAGS+= -framework IOKit -.endif +CFLAGS.Darwin+= -framework ApplicationServices +CFLAGS.Darwin+= -framework CoreFoundation +CFLAGS.Darwin+= -framework CoreServices +CFLAGS.Darwin+= -framework DiskArbitration +CFLAGS.Darwin+= -framework IOKit # Handle ${PREFIX}/share/snmp in the DEINSTALL script since it may contain # leftover config files or pidfiles after deinstallation. diff --git a/net/netatalk30/Makefile b/net/netatalk30/Makefile index 41cea29491d..116728ff049 100644 --- a/net/netatalk30/Makefile +++ b/net/netatalk30/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2015/08/24 22:00:57 tron Exp $ +# $NetBSD: Makefile,v 1.8 2016/02/25 16:20:52 jperkin Exp $ DISTNAME= netatalk-3.0.8 PKGNAME= ${DISTNAME:C/-/30-/} @@ -72,9 +72,7 @@ PLIST_VARS+= ea PLIST.ea= yes .endif -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --without-dtrace -.endif +CONFIGURE_ARGS.NetBSD+= --without-dtrace .include "options.mk" diff --git a/net/netname/Makefile b/net/netname/Makefile index 9d5b2f6ff52..04c51b54cc5 100644 --- a/net/netname/Makefile +++ b/net/netname/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/03/14 14:20:58 kim Exp $ +# $NetBSD: Makefile,v 1.16 2016/02/25 16:20:52 jperkin Exp $ # DISTNAME= netname-2.2 @@ -8,13 +8,9 @@ MASTER_SITES= http://oss.gw.com/people/kim/ MAINTAINER= kim@tac.nyc.ny.us COMMENT= Return the canonical network name of a host -.include "../../mk/bsd.prefs.mk" +BUILD_TARGET.SunOS= svr4 +BUILD_TARGET.*= netname -.if ${OPSYS} == "SunOS" -BUILD_TARGET= svr4 -.else -BUILD_TARGET= netname -.endif INSTALL_TARGET= inst-all INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile index 0a3cdbca04a..12981b6f2c5 100644 --- a/net/ngrep/Makefile +++ b/net/ngrep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2013/02/06 19:30:59 jperkin Exp $ +# $NetBSD: Makefile,v 1.31 2016/02/25 16:20:52 jperkin Exp $ DISTNAME= ngrep-1.45 PKGREVISION= 1 @@ -20,11 +20,9 @@ CONFIGURE_ARGS+= --includedir=${BUILDLINK_PREFIX.libpcap}/include CONFIGURE_ARGS+= --enable-ipv6 BUILD_TARGET= ngrep -.include "../../mk/bsd.prefs.mk" +CONFIGURE_ARGS.FreeBSD+= --disable-pcap-restart -.if ${OPSYS} == "FreeBSD" -CONFIGURE_ARGS+= --disable-pcap-restart -.endif +.include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" do-configure: diff --git a/net/openwbem/Makefile b/net/openwbem/Makefile index e60807f949c..d451f8d9de2 100644 --- a/net/openwbem/Makefile +++ b/net/openwbem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2015/06/12 10:50:44 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2016/02/25 16:20:52 jperkin Exp $ DISTNAME= openwbem-3.2.2 PKGREVISION= 4 @@ -83,11 +83,7 @@ SUBST_FILES.mkdir+= ${WRKSRC}/src/providers/cpp/instance/OpenWBEM_ConfigSettingD SUBST_SED.mkdir= -e "s|\$$(INSTALL_PROGRAM) -d|\$${mkdir_p}|g" SUBST_MESSAGE.mkdir= Fixing ${INSTALL_PROGRAM} -d lines (the -s does not interoperate with -d) -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= ac_cv_func_gethostbyname_r=no -.endif +CONFIGURE_ARGS.NetBSD+= ac_cv_func_gethostbyname_r=no .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/pchar/Makefile b/net/pchar/Makefile index 923d16bdf97..a50ccc9a4c7 100644 --- a/net/pchar/Makefile +++ b/net/pchar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2014/02/12 23:18:24 tron Exp $ +# $NetBSD: Makefile,v 1.41 2016/02/25 16:20:52 jperkin Exp $ DISTNAME= pchar-1.5 PKGREVISION= 4 @@ -28,9 +28,7 @@ CONFIGURE_ARGS+= --with-snmp=${BUILDLINK_PREFIX.net-snmp} LIBS+= -lsnmp -lcrypto -ldes .endif -.if ${OPSYS} == "Darwin" -CFLAGS+= -D__APPLE_USE_RFC_3542 -.endif +CFLAGS.Darwin+= -D__APPLE_USE_RFC_3542 INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin diff --git a/net/php-sockets/Makefile b/net/php-sockets/Makefile index 685e6993de0..0b9e96f9390 100644 --- a/net/php-sockets/Makefile +++ b/net/php-sockets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2014/01/22 12:26:11 jperkin Exp $ +# $NetBSD: Makefile,v 1.14 2016/02/25 16:20:52 jperkin Exp $ MODNAME= sockets CATEGORIES+= net @@ -10,12 +10,8 @@ CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} USE_PHP_EXT_PATCHES= Yes -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ARGS+= ac_cv_func_if_indextoname=yes -CFLAGS+= -D_XOPEN_SOURCE=500 # msghdr extensions -.endif +CONFIGURE_ARGS.SunOS+= ac_cv_func_if_indextoname=yes +CFLAGS.SunOS+= -D_XOPEN_SOURCE=500 # msghdr extensions .include "../../lang/php/ext.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/powerdns-pgsql/Makefile b/net/powerdns-pgsql/Makefile index a64a3873450..b2d69616ced 100644 --- a/net/powerdns-pgsql/Makefile +++ b/net/powerdns-pgsql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2015/10/22 19:01:25 fhajny Exp $ +# $NetBSD: Makefile,v 1.19 2016/02/25 16:20:52 jperkin Exp $ .include "../../net/powerdns/Makefile.backend" @@ -9,11 +9,7 @@ CONFIGURE_ARGS+= --with-dynmodules="gpgsql" CONFIGURE_ARGS+= --with-pgsql-lib=${BUILDLINK_PREFIX.${PGSQL_TYPE}}/lib CONFIGURE_ARGS+= --with-pgsql-includes=${BUILDLINK_PREFIX.${PGSQL_TYPE}}/include -.include "../../mk/bsd.fast.prefs.mk" - -.if ${OPSYS} == "OpenBSD" -BUILDLINK_TRANSFORM+= rm:-lcrypt -.endif +BUILDLINK_TRANSFORM.OpenBSD+= rm:-lcrypt .include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile index 64e4fb63fed..b4aca8c5fde 100644 --- a/net/pure-ftpd/Makefile +++ b/net/pure-ftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2014/02/12 23:18:25 tron Exp $ +# $NetBSD: Makefile,v 1.34 2016/02/25 16:20:52 jperkin Exp $ DISTNAME= pure-ftpd-1.0.35 PKGREVISION= 4 @@ -26,11 +26,7 @@ CONFIGURE_ARGS+= --localstatedir=${VARBASE} BUILD_DEFS+= VARBASE -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Interix" -CONFIGURE_ARGS+= --without-privsep -.endif +CONFIGURE_ARGS.Interix+= --without-privsep .include "options.mk" diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile index a97b58eb90b..6db3ced0657 100644 --- a/net/py-ORBit/Makefile +++ b/net/py-ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2015/12/05 21:25:54 adam Exp $ +# $NetBSD: Makefile,v 1.50 2016/02/25 16:20:52 jperkin Exp $ DISTNAME= pyorbit-2.24.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pyorbit/ORBit/} @@ -25,10 +25,7 @@ BUILDLINK_API_DEPENDS.python26+= python26>=2.6.2nb4 PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # dead upstream, no plans to port -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -BUILDLINK_TRANSFORM+= rm:-std=c9x -.endif +BUILDLINK_TRANSFORM.SunOS+= rm:-std=c9x do-test: (cd ${WRKSRC}/tests/c-inproc && ${PYTHONBIN} test-c-inproc.py) diff --git a/net/ra-rtsp-proxy/Makefile b/net/ra-rtsp-proxy/Makefile index 4f543157903..3e88ce8ddbf 100644 --- a/net/ra-rtsp-proxy/Makefile +++ b/net/ra-rtsp-proxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2012/10/23 17:19:04 asau Exp $ +# $NetBSD: Makefile,v 1.29 2016/02/25 16:20:52 jperkin Exp $ DISTNAME= rtspd-src-1.0.0.0 PKGNAME= ra-rtsp-proxy-1.0.0.0 @@ -21,11 +21,7 @@ RCD_SCRIPTS= rtspd WRKSRC= ${WRKDIR}/rtspd-1.0.0.0a -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -MAKE_ENV+= LOCAL_LIBS="-lsocket -lnsl" -.endif +MAKE_ENV.SunOS+= LOCAL_LIBS="-lsocket -lnsl" INSTALLATION_DIRS= etc/rc.d ${PKGMANDIR}/man8 sbin share/doc/ra-rtsp-proxy diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile index 4df8a711f3e..d3d7c593370 100644 --- a/net/rdesktop/Makefile +++ b/net/rdesktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2015/02/14 13:16:39 bad Exp $ +# $NetBSD: Makefile,v 1.46 2016/02/25 16:20:52 jperkin Exp $ DISTNAME= rdesktop-1.8.3 CATEGORIES= net @@ -26,9 +26,7 @@ SUBST_MESSAGE.audio= Fixing hardcoded audio device. .include "options.mk" -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --with-sound=oss -.endif +CONFIGURE_ARGS.NetBSD+= --with-sound=oss .if ${OPSYS} == "Linux" CONFIGURE_ARGS+= --with-sound=alsa diff --git a/net/samba/options.mk b/net/samba/options.mk index 35b3f77b47b..1ab4f3bcba2 100644 --- a/net/samba/options.mk +++ b/net/samba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.34 2015/05/10 12:55:03 ryoon Exp $ +# $NetBSD: options.mk,v 1.35 2016/02/25 16:20:52 jperkin Exp $ # Recommended package options for various setups: # @@ -38,14 +38,10 @@ CONFIGURE_ARGS+= --with-ads CONFIGURE_ARGS+= --with-krb5=${KRB5BASE} # Avoid build failures with recent version of Heimdal under NetBSD. -. if ${OPSYS} == "NetBSD" -CONFIGURE_ENV+= samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER=no -. endif +CONFIGURE_ENV.NetBSD+= samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER=no # ignore gssapi.h on Solaris as it conflicts with <gssapi/gssapi.h> -. if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= ac_cv_header_gssapi_h=no -. endif +CONFIGURE_ENV.SunOS+= ac_cv_header_gssapi_h=no .else CONFIGURE_ARGS+= --without-ads CONFIGURE_ARGS+= --without-krb5 diff --git a/net/tacacs/Makefile b/net/tacacs/Makefile index 82381292b71..46a2c19748d 100644 --- a/net/tacacs/Makefile +++ b/net/tacacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2015/06/12 10:50:53 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2016/02/25 16:20:53 jperkin Exp $ VERSION= 4.0.4.28 DISTNAME= tacacs-F${VERSION} @@ -19,12 +19,9 @@ USE_LIBTOOL= yes USE_TOOLS+= perl:run flex bison CONFIGURE_ARGS+= ac_cv_path_PERLV_PATH=${TOOLS_PATH.perl} -#CONFIGURE_ARGS+=--enable-debug -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -MAKE_FLAGS+= OS=-DSOLARIS OSLIBS="-lsocket -lnsl" -.endif +OPSYSVARS+= MAKE_FLAGS +MAKE_FLAGS.SunOS+= OS=-DSOLARIS OSLIBS="-lsocket -lnsl" INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin diff --git a/net/traceroute-as/Makefile b/net/traceroute-as/Makefile index ad0687db9d8..f6b7e8c8642 100644 --- a/net/traceroute-as/Makefile +++ b/net/traceroute-as/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/10/23 17:19:14 asau Exp $ +# $NetBSD: Makefile,v 1.11 2016/02/25 16:20:53 jperkin Exp $ # DISTNAME= traceroute_991603.tar @@ -12,12 +12,11 @@ COMMENT= Traceroute capable of reporting the AS number of hops WRKSRC= ${WRKDIR} -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -PKG_SYSDEFS= -DSYSV -PKG_LIBRARIES= -lresolv -lsocket -lnsl -.endif +OPSYSVARS+= PKG_LIBRARIES PKG_SYSDEFS +PKG_LIBRARIES.SunOS= -lresolv -lsocket -lnsl +PKG_LIBRARIES.*= # empty +PKG_SYSDEFS.SunOS= -DSYSV +PKG_SYSDEFS.*= #empty MAKE_FLAGS+= CC=${CC:Q} PKG_CFLAGS=${CFLAGS:M*:Q} PKG_SYSDEFS=${PKG_SYSDEFS:Q} MAKE_FLAGS+= PKG_LIBRARIES=${PKG_LIBRARIES:Q} diff --git a/net/traceroute-nanog/Makefile b/net/traceroute-nanog/Makefile index 8f353bca99a..71099c95104 100644 --- a/net/traceroute-nanog/Makefile +++ b/net/traceroute-nanog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2016/01/24 16:14:45 jperkin Exp $ +# $NetBSD: Makefile,v 1.8 2016/02/25 16:20:53 jperkin Exp $ DISTNAME= traceroute-nanog_6.4.2.orig PKGNAME= ${DISTNAME:S/.orig//:S/_/-/} @@ -20,27 +20,25 @@ USE_FEATURES+= snprintf .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -.if ${OS_VERSION} >= 5.0 -.if ${OS_VERSION} != 5.4 -CPPFLAGS+= -DSOLARIS -LIBS+= -lresolv -lsocket -lnsl -.endif .if ${MACHINE_ARCH} == "i386" CPPFLAGS+= -DBYTESWAP_IP_LEN .endif -.endif -.elif ${OPSYS} == "Linux" -LIBS+= -lresolv -CPPFLAGS+= -DSTRING -.elif ${OPSYS} == "FreeBSD" -CPPFLAGS+= -DSTRING -.elif ${OPSYS} == "Darwin" + +CPPFLAGS.FreeBSD+= -DSTRING +CPPFLAGS.Linux+= -DSTRING +CPPFLAGS.SunOS+= -DSOLARIS + +LIBS.Linux+= -lresolv +LIBS.SunOS+= -lresolv -lsocket -lnsl + +.if ${OPSYS} == "Darwin" CPPFLAGS+= -DBIND_8_COMPAT -DRA_SERVICE=\"nicname\" -.if !empty(OS_VERSION:M10.*) # MacOS X 10.6.X aka Snow Leopard -LIBS+= -lresolv +. if !empty(OS_VERSION:M10.*) # MacOS X 10.6.X aka Snow Leopard +LIBS+= -lresolv +. endif .endif -.elif !empty(LOWER_OPSYS:Mirix5*) + +.if !empty(LOWER_OPSYS:Mirix5*) CPPFLAGS+= -Dsocklen_t=int .endif diff --git a/net/tspc/Makefile b/net/tspc/Makefile index c7837e333b7..b85a2b0a8c7 100644 --- a/net/tspc/Makefile +++ b/net/tspc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2015/11/08 21:55:11 dholland Exp $ +# $NetBSD: Makefile,v 1.23 2016/02/25 16:20:53 jperkin Exp $ DISTNAME= tspc-2.1.1-src PKGNAME= ${DISTNAME:S/-src//} @@ -16,13 +16,9 @@ BROKEN_EXCEPT_ON_PLATFORM= NetBSD-*-* OpenBSD-*-* FreeBSD-*-* Linux-*-* \ AUTO_MKDIRS= yes -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -TARGET= solaris -.else -TARGET= ${LOWER_OPSYS} -.endif +OPSYSVARS+= TARGET +TARGET.SunOS= solaris +TARGET.*= ${LOWER_OPSYS} MAKE_ENV+= target=${TARGET:Q} MAKE_ENV+= configdir=${PREFIX}/share/tspc diff --git a/net/upclient/Makefile b/net/upclient/Makefile index e88312826c2..df2691a242a 100644 --- a/net/upclient/Makefile +++ b/net/upclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2013/04/06 15:46:38 rodent Exp $ +# $NetBSD: Makefile,v 1.30 2016/02/25 16:20:53 jperkin Exp $ # DISTNAME= upclient-4.2.1.23 @@ -10,15 +10,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://uptimes.hostingwired.com/ COMMENT= Keeps track of your server uptime, and compares it to other hosts -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "DragonFly" -BUILD_TARGET= dragonfly -.elif ${OPSYS} == "SunOS" -BUILD_TARGET= solaris -.else -BUILD_TARGET= bsd -.endif +BUILD_TARGET.DragonFly= dragonfly +BUILD_TARGET.SunOS= solaris +BUILD_TARGET.*= bsd EGDIR= ${PREFIX}/share/examples/upclient CONF_FILES= ${EGDIR}/upclient.conf ${PKG_SYSCONFDIR}/upclient.conf diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile index 3a6ddf9f086..8f5bc47d065 100644 --- a/net/vinagre/Makefile +++ b/net/vinagre/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2015/10/10 01:58:17 ryoon Exp $ +# $NetBSD: Makefile,v 1.63 2016/02/25 16:20:53 jperkin Exp $ # DISTNAME= vinagre-3.6.2 @@ -46,10 +46,8 @@ PLIST.telepathy= yes CONFIGURE_ARGS+= --without-telepathy .endif -.if ${OPSYS} == "NetBSD" # Interface conflicts with glibc's version -CONFIGURE_ARGS+= ac_cv_func_ptsname_r=no -.endif +CONFIGURE_ARGS.NetBSD+= ac_cv_func_ptsname_r=no .include "../../databases/shared-mime-info/mimedb.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.28.0 diff --git a/net/waste/Makefile b/net/waste/Makefile index e7a10df45be..cafd818b531 100644 --- a/net/waste/Makefile +++ b/net/waste/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/10/23 17:19:18 asau Exp $ +# $NetBSD: Makefile,v 1.19 2016/02/25 16:20:53 jperkin Exp $ # DISTNAME= waste-source @@ -26,11 +26,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED} USE_LANGUAGES= c c++ -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "DragonFly" -LDFLAGS+= -lmd -.endif +LDFLAGS.DragonFly+= -lmd INSTALLATION_DIRS= sbin share/doc/waste diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 4d68b756ff3..b2e353f9a08 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.142 2016/01/02 11:39:56 ryoon Exp $ +# $NetBSD: Makefile,v 1.143 2016/02/25 16:20:53 jperkin Exp $ DISTNAME= wireshark-1.12.9 CATEGORIES= net @@ -56,9 +56,7 @@ REPLACE_PYTHON+= tools/rdps.py USE_BUILTIN.libpcap= no .endif -.if ${OPSYS} == "Darwin" -CONFIGURE_ARGS+= --disable-osx-deploy-target -.endif +CONFIGURE_ARGS.Darwin+= --disable-osx-deploy-target # Extra post install targets are in options.mk post-install: ${POST_INSTALL_TARGETS} diff --git a/net/wireshark2/Makefile b/net/wireshark2/Makefile index f410b8f5951..a9f97bc668d 100644 --- a/net/wireshark2/Makefile +++ b/net/wireshark2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2016/01/02 23:59:02 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2016/02/25 16:20:53 jperkin Exp $ DISTNAME= wireshark-2.0.1 CATEGORIES= net @@ -54,9 +54,7 @@ REPLACE_PYTHON+= tools/rdps.py USE_BUILTIN.libpcap= no .endif -.if ${OPSYS} == "Darwin" -CONFIGURE_ARGS+= --disable-osx-deploy-target -.endif +CONFIGURE_ARGS.Darwin+= --disable-osx-deploy-target # Extra post install targets are in options.mk post-install: ${POST_INSTALL_TARGETS} |