aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorrene <rene@FreeBSD.org>2013-06-22 17:36:41 +0800
committerrene <rene@FreeBSD.org>2013-06-22 17:36:41 +0800
commit66a1819a95ed4e693e75992d37764852e28d2eaa (patch)
treefce908dd70183d0477dd49eaca0b081b947d5a26 /security
parent635c83d68861bfeabe85017ecfef65579b791cdf (diff)
downloadfreebsd-ports-gnome-66a1819a95ed4e693e75992d37764852e28d2eaa.tar.gz
freebsd-ports-gnome-66a1819a95ed4e693e75992d37764852e28d2eaa.tar.zst
freebsd-ports-gnome-66a1819a95ed4e693e75992d37764852e28d2eaa.zip
- Remove conditional code for net/samba34, it was removed on 2013-06-04
- Convert Makefile header - Fix typo in pkg-message PR: ports/179279 Submitted by: myself Approved by: maintainer timeout (girald@etcom.ufrgs.br, 19 days)
Diffstat (limited to 'security')
-rw-r--r--security/scannedonly/Makefile34
-rw-r--r--security/scannedonly/pkg-message2
2 files changed, 2 insertions, 34 deletions
diff --git a/security/scannedonly/Makefile b/security/scannedonly/Makefile
index b9d7f6e9bcd5..80a8955a1c3a 100644
--- a/security/scannedonly/Makefile
+++ b/security/scannedonly/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: scannedonly
-# Date created: 20 January 2011
-# Whom: girald@etcom.ufrgs.br
-#
+# Created by: girald@etcom.ufrgs.br
# $FreeBSD$
-#
PORTNAME= scannedonly
PORTVERSION= 0.21
@@ -37,40 +33,12 @@ SAMBA_VERSION?= 3.6
SAMBA_PORT?= net/samba${SAMBA_VERSION:C/([0-9]*)\.([0-9]*).*/\1\2/}
-# If samba34 is installed, we need the sources from samba.
-# We don't if samba3[56] is installed.
-# http://olivier.sessink.nl/scannedonly/faq.html
-.if ${SAMBA_PORT} == net/samba34
-BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/${SAMBA_PORT}:configure
-CONFIGURE_ARGS+=\
- --with-samba-source=${WRKDIR}/../../../${SAMBA_PORT}/work/samba-${SAMBA_VERSION}/source3
-USE_AUTOTOOLS= autoconf
-.endif
-
PLIST_FILES= sbin/scannedonlyd_clamav \
bin/scannedonly_prescan
-.if ${SAMBA_PORT} == net/samba34
-PLIST_FILES+= lib/samba/vfs/scannedonly.so
-PLIST_DIRS= lib/samba/vfs \
- lib/samba
-.endif
MAN8= ${PORTNAME}_prescan.8 \
${PORTNAME}d_clamav.8
MANCOMPRESSED= yes
-# Hackery to avoid death for non-obvious reasons if detected
-# SAMBA_VERSION doesn't match the PORTVERSION of samba in ports
-pre-everything::
-.if ${SAMBA_PORT} == net/samba34
- @if [ "$$(${MAKE} -C ${PORTSDIR}/${SAMBA_PORT} -V PORTVERSION)" \
- != "${SAMBA_VERSION}" ] ; \
- then ${ECHO_MSG} -n "==> Bailing. Version of Samba on system is "; \
- ${ECHO_MSG} "${SAMBA_VERSION}, which does not match" ; \
- ${ECHO_MSG} " that in ports. Please update Samba and try again." ; \
- ${FALSE} ; \
- fi
-.endif
-
post-patch:
@${REINPLACE_CMD} \
-e 's|/var/lib/scannedonly/scan|/var/run/scannedonlyd.sock|g' \
diff --git a/security/scannedonly/pkg-message b/security/scannedonly/pkg-message
index d32606b10e5a..0f585b7d4bda 100644
--- a/security/scannedonly/pkg-message
+++ b/security/scannedonly/pkg-message
@@ -1,7 +1,7 @@
**************************************************
* WARNING! *
* *
-* Make sure you've enough socker buffer size. *
+* Make sure you've enough socket buffer size. *
* Consider increasing kern.ipc.maxsockbuf adding *
* at least the following sysctl setting to *
* /etc/sysctl.conf: *