summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/curl/options.mk7
-rw-r--r--www/firefox/Makefile10
-rw-r--r--www/firefox/mozilla-common.mk15
-rw-r--r--www/firefox/options.mk6
-rw-r--r--www/firefox24/Makefile10
-rw-r--r--www/firefox24/mozilla-common.mk8
-rw-r--r--www/firefox31/Makefile10
-rw-r--r--www/firefox31/mozilla-common.mk8
-rw-r--r--www/firefox31/options.mk6
-rw-r--r--www/firefox38/Makefile10
-rw-r--r--www/firefox38/mozilla-common.mk12
-rw-r--r--www/firefox38/options.mk6
-rw-r--r--www/http_load/Makefile7
-rw-r--r--www/mMosaic/Makefile33
-rw-r--r--www/mini_httpd/Makefile11
-rw-r--r--www/seamonkey/options.mk7
-rw-r--r--www/sqtop/Makefile10
-rw-r--r--www/squid3/Makefile6
-rw-r--r--www/squid3/options.mk12
-rw-r--r--www/urlget/Makefile10
-rw-r--r--www/w3c-httpd/Makefile28
21 files changed, 74 insertions, 158 deletions
diff --git a/www/curl/options.mk b/www/curl/options.mk
index 83e1b1f1d28..7134e74a04d 100644
--- a/www/curl/options.mk
+++ b/www/curl/options.mk
@@ -1,14 +1,11 @@
-# $NetBSD: options.mk,v 1.13 2015/06/03 12:00:06 fhajny Exp $
+# $NetBSD: options.mk,v 1.14 2016/02/26 10:57:45 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.curl
PKG_SUPPORTED_OPTIONS= inet6 libssh2 gssapi ldap rtmp libidn http2
PKG_SUGGESTED_OPTIONS= inet6 libidn
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == NetBSD
# Kerberos is built in - no additional dependency
-PKG_SUGGESTED_OPTIONS+= gssapi
-.endif
+PKG_SUGGESTED_OPTIONS.NetBSD+= gssapi
.include "../../mk/bsd.options.mk"
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index af16beb5e6a..c95f961dc10 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.243 2016/02/12 15:21:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.244 2016/02/26 10:57:45 jperkin Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
MOZ_BRANCH= 44.0
@@ -29,13 +29,9 @@ LDFLAGS.SunOS+= -lm
ALL_ENV+= MOZILLA_PKG_NAME=firefox
-.include "../../mk/bsd.prefs.mk"
-
# Avoid ld "invalid section index" errors.
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+= rm:-fdata-sections
-BUILDLINK_TRANSFORM+= rm:-ffunction-sections
-.endif
+BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections
+BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections
LDFLAGS.DragonFly= -lplc4 -lnspr4
LDFLAGS.FreeBSD= -lplc4 -lnspr4
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index 7d8811f273e..ee8d930ed5d 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,10 +1,12 @@
-# $NetBSD: mozilla-common.mk,v 1.70 2016/02/09 12:47:22 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.71 2016/02/26 10:57:45 jperkin Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
# used by www/firefox/Makefile
# used by www/seamonkey/Makefile
+.include "../../mk/bsd.prefs.mk"
+
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm
.endif
@@ -18,7 +20,6 @@ test:
cd ${WRKSRC}/${OBJDIR}/dist/bin && \
./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey
-.include "../../mk/bsd.prefs.mk"
# tar(1) of OpenBSD 5.5 has no --exclude command line option.
.if ${OPSYS} == "OpenBSD"
TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar}
@@ -162,9 +163,7 @@ PLIST.mozglue= yes
# See ${WRKSRC}/security/sandbox/mac/Sandbox.mm: On Darwin, sandboxing
# support is only available when the toolkit is cairo-cocoa.
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+= --disable-sandbox
-.endif
+CONFIGURE_ARGS.Darwin+= --disable-sandbox
# See ${WRKSRC}/configure.in: It tries to use MacOS X 10.6 SDK by
# default, which is not always possible.
@@ -190,13 +189,9 @@ create-rm-wrapper:
${WRAPPER_DIR}/bin/rm
chmod +x ${WRAPPER_DIR}/bin/rm
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
# The configure test for __thread succeeds, but later we end up with:
# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
-CONFIGURE_ENV+= ac_cv_thread_keyword=no
-.endif
+CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
.if ${OPSYS} == "SunOS"
# native libbz2.so hides BZ2_crc32Table
diff --git a/www/firefox/options.mk b/www/firefox/options.mk
index d97832af48b..6fa2a631c19 100644
--- a/www/firefox/options.mk
+++ b/www/firefox/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.28 2015/12/27 18:25:33 ryoon Exp $
+# $NetBSD: options.mk,v 1.29 2016/02/26 10:57:45 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
PKG_SUPPORTED_OPTIONS= official-mozilla-branding
@@ -13,9 +13,7 @@ PKG_SUGGESTED_OPTIONS+= pulseaudio
.endif
# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
-.if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+= webrtc
-.endif
+PKG_SUGGESTED_OPTIONS.Linux+= webrtc
.include "../../mk/bsd.options.mk"
diff --git a/www/firefox24/Makefile b/www/firefox24/Makefile
index 4565bab64eb..2dcc55edafe 100644
--- a/www/firefox24/Makefile
+++ b/www/firefox24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2015/11/18 14:19:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.34 2016/02/26 10:57:46 jperkin Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
# Also update MOZ_BRANCH= in devel/xulrunner24/Makefile
@@ -35,13 +35,9 @@ LDFLAGS.NetBSD+= -pthread
ALL_ENV+= MOZILLA_PKG_NAME=firefox24
-.include "../../mk/bsd.prefs.mk"
-
# Avoid ld "invalid section index" errors.
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+= rm:-fdata-sections
-BUILDLINK_TRANSFORM+= rm:-ffunction-sections
-.endif
+BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections
+BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections
LDFLAGS.DragonFly= -lplc4 -lnspr4
LDFLAGS.FreeBSD= -lplc4 -lnspr4
diff --git a/www/firefox24/mozilla-common.mk b/www/firefox24/mozilla-common.mk
index 288001fab5b..b98eaf7d5f8 100644
--- a/www/firefox24/mozilla-common.mk
+++ b/www/firefox24/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.11 2015/12/05 21:26:04 adam Exp $
+# $NetBSD: mozilla-common.mk,v 1.12 2016/02/26 10:57:46 jperkin Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -144,13 +144,9 @@ create-rm-wrapper:
${WRAPPER_DIR}/bin/rm
chmod +x ${WRAPPER_DIR}/bin/rm
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
# The configure test for __thread succeeds, but later we end up with:
# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
-CONFIGURE_ENV+= ac_cv_thread_keyword=no
-.endif
+CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
.if ${OPSYS} == "SunOS"
# native libbz2.so hides BZ2_crc32Table
diff --git a/www/firefox31/Makefile b/www/firefox31/Makefile
index b3b4ca65689..043c1a4fb1e 100644
--- a/www/firefox31/Makefile
+++ b/www/firefox31/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/11/18 14:19:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.19 2016/02/26 10:57:46 jperkin Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}esr
# Also update MOZ_BRANCH= in devel/xulrunner31/Makefile
@@ -34,13 +34,9 @@ LDFLAGS.SunOS+= -lm
ALL_ENV+= MOZILLA_PKG_NAME=firefox31
-.include "../../mk/bsd.prefs.mk"
-
# Avoid ld "invalid section index" errors.
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+= rm:-fdata-sections
-BUILDLINK_TRANSFORM+= rm:-ffunction-sections
-.endif
+BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections
+BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections
LDFLAGS.DragonFly= -lplc4 -lnspr4
LDFLAGS.FreeBSD= -lplc4 -lnspr4
diff --git a/www/firefox31/mozilla-common.mk b/www/firefox31/mozilla-common.mk
index a69d09e66c7..a81e25ab563 100644
--- a/www/firefox31/mozilla-common.mk
+++ b/www/firefox31/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.3 2015/12/05 21:26:04 adam Exp $
+# $NetBSD: mozilla-common.mk,v 1.4 2016/02/26 10:57:46 jperkin Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -173,13 +173,9 @@ create-rm-wrapper:
${WRAPPER_DIR}/bin/rm
chmod +x ${WRAPPER_DIR}/bin/rm
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
# The configure test for __thread succeeds, but later we end up with:
# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
-CONFIGURE_ENV+= ac_cv_thread_keyword=no
-.endif
+CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
.if ${OPSYS} == "SunOS"
# native libbz2.so hides BZ2_crc32Table
diff --git a/www/firefox31/options.mk b/www/firefox31/options.mk
index 9b83d4f18f6..a1e6bd6531a 100644
--- a/www/firefox31/options.mk
+++ b/www/firefox31/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/11/03 12:18:31 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2016/02/26 10:57:46 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.firefox31
PKG_SUPPORTED_OPTIONS= official-mozilla-branding
@@ -12,9 +12,7 @@ PKG_SUGGESTED_OPTIONS+= pulseaudio
.endif
# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
-.if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+= webrtc
-.endif
+PKG_SUGGESTED_OPTIONS.Linux+= webrtc
.include "../../mk/bsd.options.mk"
diff --git a/www/firefox38/Makefile b/www/firefox38/Makefile
index 0eb10ded132..d8a97b526d4 100644
--- a/www/firefox38/Makefile
+++ b/www/firefox38/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/02/19 14:42:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2016/02/26 10:57:46 jperkin Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
MOZ_BRANCH= 38.6
@@ -32,13 +32,9 @@ LDFLAGS.SunOS+= -lm
ALL_ENV+= MOZILLA_PKG_NAME=firefox38
-.include "../../mk/bsd.prefs.mk"
-
# Avoid ld "invalid section index" errors.
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+= rm:-fdata-sections
-BUILDLINK_TRANSFORM+= rm:-ffunction-sections
-.endif
+BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections
+BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections
LDFLAGS.DragonFly= -lplc4 -lnspr4
LDFLAGS.FreeBSD= -lplc4 -lnspr4
diff --git a/www/firefox38/mozilla-common.mk b/www/firefox38/mozilla-common.mk
index ddc99640eb1..45d3dda90d3 100644
--- a/www/firefox38/mozilla-common.mk
+++ b/www/firefox38/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.4 2015/12/05 21:26:04 adam Exp $
+# $NetBSD: mozilla-common.mk,v 1.5 2016/02/26 10:57:46 jperkin Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -157,9 +157,7 @@ PLIST.mozglue= yes
# See ${WRKSRC}/security/sandbox/mac/Sandbox.mm: On Darwin, sandboxing
# support is only available when the toolkit is cairo-cocoa.
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+= --disable-sandbox
-.endif
+CONFIGURE_ARGS.Darwin+= --disable-sandbox
# See ${WRKSRC}/configure.in: It tries to use MacOS X 10.6 SDK by
# default, which is not always possible.
@@ -185,13 +183,9 @@ create-rm-wrapper:
${WRAPPER_DIR}/bin/rm
chmod +x ${WRAPPER_DIR}/bin/rm
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
# The configure test for __thread succeeds, but later we end up with:
# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
-CONFIGURE_ENV+= ac_cv_thread_keyword=no
-.endif
+CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
.if ${OPSYS} == "SunOS"
# native libbz2.so hides BZ2_crc32Table
diff --git a/www/firefox38/options.mk b/www/firefox38/options.mk
index b6f915cfe13..f5ddeedd25a 100644
--- a/www/firefox38/options.mk
+++ b/www/firefox38/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/07/09 14:13:51 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2016/02/26 10:57:46 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.firefox38
PKG_SUPPORTED_OPTIONS= official-mozilla-branding
@@ -12,9 +12,7 @@ PKG_SUGGESTED_OPTIONS+= pulseaudio
.endif
# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
-.if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+= webrtc
-.endif
+PKG_SUGGESTED_OPTIONS.Linux+= webrtc
.include "../../mk/bsd.options.mk"
diff --git a/www/http_load/Makefile b/www/http_load/Makefile
index bf4a477df61..90348c48384 100644
--- a/www/http_load/Makefile
+++ b/www/http_load/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/02/12 23:18:45 tron Exp $
+# $NetBSD: Makefile,v 1.24 2016/02/26 10:57:46 jperkin Exp $
DISTNAME= http_load-12mar2006
PKGNAME= http_load-20060312
@@ -13,10 +13,7 @@ LICENSE= 2-clause-bsd
MAKE_ENV+= SSLBASE=${SSLBASE:Q}
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+= SYSV_LIBS="-lnsl -lsocket -lresolv"
-.endif
+MAKE_ENV.SunOS+= SYSV_LIBS="-lnsl -lsocket -lresolv"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/mMosaic/Makefile b/www/mMosaic/Makefile
index fe455dc2e21..af069dbfe0c 100644
--- a/www/mMosaic/Makefile
+++ b/www/mMosaic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2014/12/15 11:46:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.31 2016/02/26 10:57:46 jperkin Exp $
#
DISTNAME= mMosaic-3.7.2
@@ -16,32 +16,21 @@ WRKSRC= ${WRKDIR}/mMosaic-src-3.7.2
INSTALLATION_DIRS= bin
+OPSYSVARS+= MAKEFLAGS
+MAKEFLAGS.DragonFly+= sysconfigflags='-DFreeBSD -DMOTIF1_2'
+MAKEFLAGS.FreeBSD+= sysconfigflags='-DFreeBSD -DMOTIF1_2'
+MAKEFLAGS.IRIX+= sysconfigflags='-DSVR4 -DIRIX -DMOTIF1_2'
+MAKEFLAGS.Linux+= sysconfigflags='-DLINUX -Dlinux -DMOTIF1_2'
+MAKEFLAGS.NetBSD+= sysconfigflags='-DNETBSD -DMOTIF1_2'
+
+BUILDLINK_TRANSFORM.Darwin+= opt:-shared:-c
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/mMosaic ${DESTDIR}${PREFIX}/bin/
.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/motif.buildlink3.mk"
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-MAKEFLAGS+= sysconfigflags='-DNETBSD -DMOTIF1_2'
-
-.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-MAKEFLAGS+= sysconfigflags='-DFreeBSD -DMOTIF1_2'
-
-.elif ${OPSYS} == "Linux"
-MAKEFLAGS+= sysconfigflags='-DLINUX -Dlinux -DMOTIF1_2'
-
-.elif ${OPSYS:MIRIX*} != ""
-MAKEFLAGS+= sysconfigflags='-DSVR4 -DIRIX -DMOTIF1_2'
-
-.elif ${OPSYS} == "Darwin"
-BUILDLINK_TRANSFORM+= opt:-shared:-c
-.endif
-
.include "../../x11/libXmu/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile
index d90d4d7d7b7..1d5a2b40543 100644
--- a/www/mini_httpd/Makefile
+++ b/www/mini_httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/05/05 15:55:17 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2016/02/26 10:57:46 jperkin Exp $
DISTNAME= mini_httpd-1.21
CATEGORIES= www
@@ -16,13 +16,8 @@ MAKE_ENV+= PKG_CFLAGS=${CFLAGS:Q}
MAKE_ENV+= PKG_LDFLAGS=${LDFLAGS:Q}
MAKE_ENV+= PKG_LIBS=${LIBS:Q}
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+= SYSV_LIBS="-lnsl -lsocket"
-.elif ${OPSYS} == "NetBSD"
-MAKE_ENV+= CRYPT_LIB=-lcrypt
-.endif
+MAKE_ENV.NetBSD+= CRYPT_LIB=-lcrypt
+MAKE_ENV.SunOS+= SYSV_LIBS="-lnsl -lsocket"
SUBST_CLASSES= htpasswd
SUBST_MESSAGE.htpasswd= Fix name of (m)htpasswd in manual pages.
diff --git a/www/seamonkey/options.mk b/www/seamonkey/options.mk
index 8df6f6ae27f..f1be8c24985 100644
--- a/www/seamonkey/options.mk
+++ b/www/seamonkey/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.32 2015/07/01 13:02:30 ryoon Exp $
+# $NetBSD: options.mk,v 1.33 2016/02/26 10:57:46 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.seamonkey
PKG_SUPPORTED_OPTIONS= alsa debug mozilla-jemalloc # gnome
@@ -6,9 +6,8 @@ PKG_SUPPORTED_OPTIONS+= mozilla-lightning webrtc mozilla-chatzilla pulseaudio
PLIST_VARS+= debug gnome jemalloc
-.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+= mozilla-jemalloc
-.endif
+PKG_SUGGESTED_OPTIONS.Linux+= mozilla-jemalloc
+PKG_SUGGESTED_OPTIONS.SunOS+= mozilla-jemalloc
# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
.if (${OPSYS} == "FreeBSD") || (${OPSYS} == "Linux") || (${OPSYS} == "OpenBSD")
diff --git a/www/sqtop/Makefile b/www/sqtop/Makefile
index 293a196bf30..e2e55a9df79 100644
--- a/www/sqtop/Makefile
+++ b/www/sqtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/08/18 07:31:19 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/02/26 10:57:46 jperkin Exp $
DISTNAME= sqtop-2013-12-17
PKGNAME= ${DISTNAME:C/([0-9])-/\1/g}
@@ -17,13 +17,9 @@ DEPENDS+= squid-[0-9]*:../../www/squid3
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
-LDFLAGS.SunOS+= -lsocket -lnsl
-
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS.NetBSD+= --with-resolver=netdb_getnameinfo
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+= --with-resolver=netdb_getnameinfo
-.endif
+LDFLAGS.SunOS+= -lsocket -lnsl
.include "../../mk/resolv.buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index f20b6da9132..f1bc5f95e69 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2016/02/24 06:38:57 taca Exp $
+# $NetBSD: Makefile,v 1.61 2016/02/26 10:57:46 jperkin Exp $
DISTNAME= squid-3.5.15
CATEGORIES= www
@@ -53,9 +53,7 @@ OWN_DIRS_PERMS+=${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
.include "options.mk"
# Incorrect check for <netinet/ip_icmp.h> on FreeBSD:
-.if $(OPSYS) == "FreeBSD"
-CONFIGURE_ENV+= ac_cv_header_netinet_ip_icmp_h=yes
-.endif
+CONFIGURE_ENV.FreeBSD+= ac_cv_header_netinet_ip_icmp_h=yes
INSTALLATION_DIRS= ${EGDIR}
diff --git a/www/squid3/options.mk b/www/squid3/options.mk
index 47f777b0d10..c2ccade0b2a 100644
--- a/www/squid3/options.mk
+++ b/www/squid3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2015/05/04 09:13:34 adam Exp $
+# $NetBSD: options.mk,v 1.17 2016/02/26 10:57:46 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.squid
PKG_SUPPORTED_OPTIONS= inet6 snmp ssl squid-backend-aufs squid-backend-diskd \
@@ -42,14 +42,10 @@ PKG_SUPPORTED_OPTIONS+= squid-pf
PKG_SUGGESTED_OPTIONS+= squid-ipf
.endif
-.if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+= squid-pf
-.endif
+PKG_SUGGESTED_OPTIONS.OpenBSD+= squid-pf
-.if ${OPSYS} == "Darwin"
-PKG_SUPPORTED_OPTIONS+= squid-ipfw
-PKG_SUGGESTED_OPTIONS+= squid-ipfw
-.endif
+PKG_SUPPORTED_OPTIONS.Darwin+= squid-ipfw
+PKG_SUGGESTED_OPTIONS.Darwin+= squid-ipfw
# limited platform support squid-arp-acl
.if !empty(OPSYS:MFreeBSD) || !empty(OPSYS:MNetBSD) || !empty(OPSYS:MOpenBSD) || !empty(OPSYS:MLinux) || !empty(OPSYS:MSunOS)
diff --git a/www/urlget/Makefile b/www/urlget/Makefile
index c7264bb9ba5..0d03b52e5a1 100644
--- a/www/urlget/Makefile
+++ b/www/urlget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2013/03/14 17:04:27 kim Exp $
+# $NetBSD: Makefile,v 1.15 2016/02/26 10:57:46 jperkin Exp $
#
DISTNAME= urlget-1.5
@@ -8,13 +8,9 @@ MASTER_SITES= http://oss.gw.com/people/kim/
MAINTAINER= kim@tac.nyc.ny.us
COMMENT= Simple command-line tool to retrieve an HTTP URL
-.include "../../mk/bsd.prefs.mk"
+BUILD_TARGET.SunOS= svr4
+BUILD_TARGET.*= bsd
-.if ${OPSYS} == "SunOS"
-BUILD_TARGET= svr4
-.else
-BUILD_TARGET= bsd
-.endif
INSTALL_TARGET= inst-all
INSTALL_MAKE_FLAGS+= DEST=${DESTDIR}${PREFIX}
INSTALL_MAKE_FLAGS+= MANDIR=${DESTDIR}/${PREFIX}/${PKGMANDIR}/man1
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index 31f63a9dc8e..3d30073ffc5 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2012/10/28 06:31:08 asau Exp $
+# $NetBSD: Makefile,v 1.27 2016/02/26 10:57:46 jperkin Exp $
DISTNAME= w3c-httpd-3.0A
PKGREVISION= 1
@@ -16,22 +16,16 @@ BUILD_TARGET= build-all
# prevent conflict with directory All on non-case-sensitive file systems
USE_TOOLS+= csh
-.include "../../mk/bsd.prefs.mk"
-.if (${OPSYS} == "FreeBSD") || (${OPSYS} == "DragonFly" )
-OSNAME= freebsd
-.elif (${OPSYS} == "Darwin")
-OSNAME=darwin
-CPPFLAGS+= -Dunix
-.elif (${OPSYS} == "IRIX")
-OSNAME=sgi
-.elif (${OPSYS} == "OSF1")
-OSNAME=osf1
-.elif (${OPSYS} == "Linux")
-OSNAME=linux
-.else
-# covers OpenBSD, too
-OSNAME= netbsd
-.endif
+OPSYSVARS+= OSNAME
+OSNAME.Darwin= darwin
+OSNAME.DragonFly= freebsd
+OSNAME.FreeBSD= freebsd
+OSNAME.IRIX= sgi
+OSNAME.Linux= linux
+OSNAME.OSF1= osf1
+OSNAME.*= netbsd
+
+CPPFLAGS.Darwin+= -Dunix
CFLAGS+= ${CPPFLAGS}
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-22 09:27:25 +0000