Index: head/net-mgmt/xymon-server/Makefile
===================================================================
--- head/net-mgmt/xymon-server/Makefile	(revision 504241)
+++ head/net-mgmt/xymon-server/Makefile	(revision 504242)
@@ -1,117 +1,117 @@
 # $FreeBSD$
 
 PORTNAME=	xymon
 PORTVERSION=	4.3.28
 PORTREVISION=	0
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}
 DIST_SUBDIR=	repacked
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	System for monitoring servers and networks
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	rrdtool:databases/rrdtool
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libpcre.so:devel/pcre \
 		libcares.so:dns/c-ares
 RUN_DEPENDS=	rrdtool:databases/rrdtool \
 		fping:net/fping \
 		mtr:net/mtr-nox11
 
 USERS=		xymon
 GROUPS=		xymon
 
 # Options
 XYMONUSER?=	xymon
 XYMONHOSTNAME?=	xymon.example.com
 XYMONHOSTIP?=	127.0.0.1
 
-USES=		cpe gmake shebangfix ssl
+USES=		compiler:c11 cpe gmake shebangfix ssl
 SHEBANG_FILES=	${WRKSRC}/xymond/xymonreports.sh.DIST ${WRKSRC}/build/upgrade430.sh
 MAKE_JOBS_UNSAFE=	yes
 CONFIGURE_ENV=	MAKE=gmake
 MAKE_ENV+=	XYMONUSER="${XYMONUSER}"
 MAKE_ENV+=	XYMONHOSTNAME="${XYMONHOSTNAME}"
 MAKE_ENV+=	XYMONHOSTIP="${XYMONHOSTIP}"
 MAKE_ENV+=	INSTALLROOT="${STAGEDIR}"
 MANPREFIX=	${STAGEDIR}${PREFIX}
 MAKE_ARGS+=	PKGBUILD="true"
 USE_RC_SUBR=	xymon-server
 SUB_LIST+=	XYMONUSER="${XYMONUSER}"
 PLIST_SUB+=	XYMONUSER="${XYMONUSER}"
 
 CONFIG_FILES=	cgioptions.cfg client-local.cfg \
 		columndoc.csv graphs.cfg protocols.cfg \
 		tasks.cfg xymonserver.cfg xymon-apache.conf
 FIXME1=		alerts.cfg hosts.cfg xymon-apache-open xymon-apache-secure
 FIXME2=		analysis.cfg combo.cfg holidays.cfg rrddefinitions.cfg \
 		snmpmibs.cfg xymonmenu.cfg xymonserver-migration.cfg
 
 OPTIONS_DEFINE=DEBUG LDAP NETSNMP
 NETSNMP_DESC=Enable Net-SNMP support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLDAP}
 MAKE_ENV+=	WITH_LDAP=1
 USE_OPENLDAP=	yes
 .endif
 
 .if ${PORT_OPTIONS:MNETSNMP}
 MAKE_ENV+=	WITH_NETSNMP=1
 LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|web-build client|web-build|' ${WRKSRC}/build/Makefile.rules
 	${REINPLACE_CMD} -e 's|install-docs install-client|install-docs|' ${WRKSRC}/build/Makefile.rules
 	${REINPLACE_CMD} -e 's|$$(INSTALLETCDIR)/protocols.cfg|$$(INSTALLETCDIR)/protocols.cfg.DIST|' ${WRKSRC}/xymonnet/Makefile
 	${REINPLACE_CMD} -e 's|TRACEROUTE="traceroute"|TRACEROUTE="mtr -c 2 -n --report"|' ${WRKSRC}/xymond/etcfiles/xymonserver.cfg.DIST
 	${RM} ${WRKSRC}/docs/manpages/man1/xymonping.1.html
 	${RM} ${WRKSRC}/xymonnet/xymonping.1
 	${REINPLACE_CMD} -e 's|@CGIDIR@|${WWWDIR}/server/cgi-bin|g' \
 	-e 's|@SECURECGIDIR@|${WWWDIR}/server/cgi-secure|g' \
 	-e 's|@INSTALLETCDIR@|${WWWDIR}/server/etc|g' \
 	-e 's|@INSTALLWWWDIR@|${WWWDIR}/server/www|g' \
 	-e 's|@SECUREXYMONCGIURL@|/cgi-secure|g' \
 	-e 's|@XYMONCGIURL@|/cgi-bin|g' \
 	-e 's|@XYMONHOSTURL@|/xymon|g' ${WRKSRC}/xymond/etcfiles/xymon-apache-*.DIST
 
 # Configure script is interactive
 do-configure:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}/
 
 post-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/acks
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/data
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/disabled
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/hist
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/histlogs
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/hostdata
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/logs
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/rrd
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/download
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/tmp
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/html
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/notes
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/rep
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/snap
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/wml
 	${LN} -s ${LOCALBASE}/sbin/fping ${STAGEDIR}${WWWDIR}/server/bin/xymonping
 	${INSTALL_SCRIPT} ${WRKSRC}/build/upgrade430.sh ${STAGEDIR}${WWWDIR}/server/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/build/renamevars ${STAGEDIR}${WWWDIR}/server/bin/
 .for i in ${FIXME1}
 	${INSTALL_DATA} ${WRKSRC}/xymond/etcfiles/${i}.DIST ${STAGEDIR}${WWWDIR}/server/etc/${i}.sample
 .endfor
 .for i in ${FIXME2}
 	${INSTALL_DATA} ${WRKSRC}/xymond/etcfiles/${i} ${STAGEDIR}${WWWDIR}/server/etc/${i}.sample
 .endfor
 .for i in ${CONFIG_FILES}
 	${MV} ${STAGEDIR}${WWWDIR}/server/etc/${i}.DIST ${STAGEDIR}${WWWDIR}/server/etc/${i}.sample
 .endfor
 
 .include <bsd.port.mk>
Index: head/net-mgmt/xymon-server/files/Makefile
===================================================================
--- head/net-mgmt/xymon-server/files/Makefile	(revision 504241)
+++ head/net-mgmt/xymon-server/files/Makefile	(revision 504242)
@@ -1,95 +1,102 @@
 # Toplevel Makefile for Xymon
 # $FreeBSD$
 
 BUILDTOPDIR=`pwd`
 
 # configure settings for Xymon
 #
 # Toplevel dir
 XYMONTOPDIR = ${PREFIX}/www/xymon
 # Server home dir for etc/, bin/
 XYMONHOME = ${PREFIX}/www/xymon/server
 # Server data dir for hist/ etc.
 XYMONVAR = ${PREFIX}/www/xymon/data
 # CGI scripts go in CGIDIR
 CGIDIR = ${PREFIX}/www/xymon/cgi-bin
 # Admin CGI scripts go in SECURECGIDIR
 SECURECGIDIR = ${PREFIX}/www/xymon/cgi-secure
 # Where to put logfiles
 XYMONLOGDIR = /var/log/xymon
 # Where to install manpages
 MANROOT = ${PREFIX}/man
 # How to run fping or xymonping
 FPING = fping
 
 # Username running xymon
 #XYMONUSER = nobody
 # Xymon server hostname
 #XYMONHOSTNAME = xymon.example.com
 # Xymon server IP-address
 #XYMONHOSTIP = 127.0.0.1
 # Xymon server OS
 XYMONHOSTOS = freebsd
 
 # URL for Xymon webpages
 XYMONHOSTURL = /xymon
 # URL for Xymon CGIs
 XYMONCGIURL = /xymon-cgi
 # URL for Xymon Admin CGIs
 SECUREXYMONCGIURL = /xymon-seccgi
 # Webserver group-ID
 HTTPDGID=80
 
 # C-ARES settings
 SYSTEMCARES = yes
 CARESINCDIR = -I${LOCALBASE}/include
 CARESLIBS = -L${LOCALBASE}/lib -lcares
 RPATHVAL += ${LOCALBASE}/lib
 
 # PCRE settings
 PCREINCDIR = -I${LOCALBASE}/include
 PCRELIBS = -L${LOCALBASE}/lib -lpcre
 RPATHVAL += ${LOCALBASE}/lib
 
 # RRDtool settings
 RRDDEF = -DRRDTOOL12
 RRDINCDIR = -I${LOCALBASE}/include
 RRDLIBS = -L${LOCALBASE}/lib -lrrd -L${LOCALBASE}/lib -lpng
 RPATHVAL += ${LOCALBASE}/lib
 DORRD = yes
 #
 # OpenSSL settings
 SSLFLAGS = -DHAVE_OPENSSL
+
+ifneq (${OPENSSLLIB},/usr/lib)
 SSLINCDIR = -I${OPENSSLINC}
 SSLLIBS = -L${OPENSSLLIB} -lssl -lcrypto
 RPATHVAL += ${OPENSSLLIB}
+else
+SSLLIBS = -lssl -lcrypto
+endif
 DOSSL = yes
 #
 ifdef WITH_LDAP
 # OpenLDAP settings
 LDAPFLAGS = -DXYMON_LDAP -DXYMON_LDAP_USESTARTTLS -DHAVE_LDAP
 LDAPINCDIR = -I${PREFIX}/include
 LDAPLIBS = -L${PREFIX}/lib -lldap -llber
+ifneq (${OPENSSLLIB},/usr/lib)
 RPATHVAL += ${PREFIX}/lib
+endif
 RPATHVAL += /usr/local/lib
 DOLDAP = yes
 endif
 #
 # clock_gettime() settings
 LIBRTDEF =
 
 ifdef WITH_NETSNMP
 # Net-SNMP settings
 DOSNMP = yes
 else
 DOSNMP = no
 endif
 
 # Large File Support settings
 LFSDEF = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
 include build/Makefile.FreeBSD
 
 # Add local CFLAGS, etc. settings here
 
 include build/Makefile.rules