diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2013-03-07 02:47:55 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2013-03-07 02:47:55 +0800 |
| commit | fee1f622884fc9c10a8c3dd2adcf9e95a4eabe97 (patch) | |
| tree | 63731109e0ef2cbe54a46c3c765d452b26f6a9dd /www | |
| parent | 4cd3af08478be3fc96190fb1d488f043eb92f8e3 (diff) | |
| download | freebsd-ports-gnome-fee1f622884fc9c10a8c3dd2adcf9e95a4eabe97.tar.gz freebsd-ports-gnome-fee1f622884fc9c10a8c3dd2adcf9e95a4eabe97.tar.zst freebsd-ports-gnome-fee1f622884fc9c10a8c3dd2adcf9e95a4eabe97.zip | |
- Fix build with clang
- Convert NOPORTDOCS/NOPORTEXAMPLES to new options framework
Submitted by: sunpoet (myself)
Approved by: tmseck (maintainer)
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid32/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/www/squid32/Makefile b/www/squid32/Makefile index 35fa128f6461..4309bfc82f3c 100644 --- a/www/squid32/Makefile +++ b/www/squid32/Makefile @@ -97,7 +97,7 @@ OPTIONS_DEFINE= ARP_ACL AUTH_KERB AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB \ CACHE_DIGESTS DEBUG DELAY_POOLS DNS_HELPER ECAP ESI \ FOLLOW_XFF FS_AUFS FS_COSS HTCP ICAP ICMP IDENT IPV6 KQUEUE \ LARGEFILE SNMP SSL SSL_CRTD STACKTRACES STRICT_HTTP \ - TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 + TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 DOCS EXAMPLES ARP_ACL_DESC= Enable ARP/MAC/EUI based authentification AUTH_KERB_DESC= Install Kerberos authentication helpers @@ -235,11 +235,10 @@ CONFIGURE_ARGS= --with-default-user=squid \ --disable-linux-tproxy \ --disable-translation -.include <bsd.port.options.mk> .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 1000024 -USE_GCC=any +.if ${CC:T:Mclang} == "clang" || ${CXX:T:Mclang++} == "clang++" || ${OSVERSION} >= 1000024 +CXXFLAGS+= -Wno-unused-private-field .endif # Authentication methods and modules: @@ -527,7 +526,7 @@ pre-su-install: ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR} .endif @@ -535,7 +534,7 @@ post-install: ${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \ ${CHGRP} squid ${PREFIX}/libexec/squid/pinger .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR} .endif |