diff options
Diffstat (limited to 'security/clamav')
| -rw-r--r-- | security/clamav/Makefile | 32 | ||||
| -rw-r--r-- | security/clamav/distinfo | 6 | ||||
| -rw-r--r-- | security/clamav/files/pkg-install.in | 16 | ||||
| -rw-r--r-- | security/clamav/pkg-plist | 10 |
4 files changed, 42 insertions, 22 deletions
diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 19e71119c304..48169cfecdb3 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -6,7 +6,7 @@ # PORTNAME= clamav -PORTVERSION= 0.91.2 +PORTVERSION= 0.92.1 PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF @@ -19,8 +19,11 @@ LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 OPTIONS= ARC "Enable arch archives support" On \ ARJ "Enable arj archives support" On \ LHA "Enable lha archives support" On \ + UNZOO "Enable zoo archives support" On \ + UNRAR "Enable rar archives support" On \ MILTER "Compile the milter interface" Off \ LDAP "libmilter was built with LDAP" Off \ + ICONV "Enable ICONV support" Off \ STDERR "Print logs to stderr instead of stdout" Off \ EXPERIMENTAL "Build experimental code" Off @@ -105,17 +108,34 @@ CONFIGURE_ARGS+= --enable-gethostbyname_r # force to use -lthr until it's not fixed. .if ${OSVERSION} >= 601000 PTHREAD_LIBS= -lthr +.else +PTHREAD_LIBS= -lpthread .endif -.if !defined(WITHOUT_ARC) +.if defined(WITH_ARC) RUN_DEPENDS+= arc:${PORTSDIR}/archivers/arc .endif -.if !defined(WITHOUT_ARJ) +.if defined(WITH_ARJ) RUN_DEPENDS+= arj:${PORTSDIR}/archivers/arj .endif -.if !defined(WITHOUT_LHA) +.if defined(WITH_LHA) RUN_DEPENDS+= lha:${PORTSDIR}/archivers/lha .endif +.if defined(WITH_UNZOO) +RUN_DEPENDS+= unzoo:${PORTSDIR}/archivers/unzoo +.endif +.if defined(WITH_UNRAR) +PLIST_SUB+= UNRAR="" +.else +PLIST_SUB+= UNRAR="@comment " +CONFIGURE_ARGS+= --disable-unrar +.endif +.if defined(WITH_ICONV) +CONFIGURE_ARGS+=--with-iconv +USE_ICONV= yes +.else +CONFIGURE_ARGS+=--without-iconv +.endif .if defined(WITH_MILTER) USE_RC_SUBR+= clamav-milter @@ -148,11 +168,11 @@ post-patch: ${WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -E 's,^(pkgconfigdir = ).*$$,\1$$(prefix)/libdata/pkgconfig,g' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \ - ${WRKSRC}/libclamav/unrar/unrar.c @${REINPLACE_CMD} ${SED_CONF} \ ${WRKSRC}/etc/clamd.conf \ ${WRKSRC}/etc/freshclam.conf + @${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \ + ${WRKSRC}/libclamunrar/unrar.c pre-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/security/clamav/distinfo b/security/clamav/distinfo index 780c2bb6351a..47c9cdf725cc 100644 --- a/security/clamav/distinfo +++ b/security/clamav/distinfo @@ -1,3 +1,3 @@ -MD5 (clamav-0.91.2.tar.gz) = 2a7265d17cfa80c32858978f16a3f47b -SHA256 (clamav-0.91.2.tar.gz) = dac9de86dff5ef4c9a6e4962da24988e1aa74948a21b7fb7b7fed17867ddf2a0 -SIZE (clamav-0.91.2.tar.gz) = 13394538 +MD5 (clamav-0.92.1.tar.gz) = c16e60f569b6ec575d8de494e788f9d2 +SHA256 (clamav-0.92.1.tar.gz) = e08a63adb3eda3dfc190d7a8b3fa55c881b1632583fbdf67327d3767d6966581 +SIZE (clamav-0.92.1.tar.gz) = 15284752 diff --git a/security/clamav/files/pkg-install.in b/security/clamav/files/pkg-install.in index b6280ecf8df8..d83287ec16aa 100644 --- a/security/clamav/files/pkg-install.in +++ b/security/clamav/files/pkg-install.in @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/pkg-install.in,v 1.4 2007-02-18 16:12:37 garga Exp $ +# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/pkg-install.in,v 1.5 2008-02-21 13:19:50 garga Exp $ PREFIX=${PKG_PREFIX:-%%PREFIX%%} @@ -14,7 +14,7 @@ RUNDIR=%%RUNDIR%% PW="pw" CHOWN="chown" -MKDIR="mkdir -p" +INSTALL_DIR="install -d -o ${CLAMAVUSER} -g ${CLAMAVGROUP} -m 0755" if [ "$2" = "PRE-INSTALL" ]; then @@ -41,16 +41,8 @@ if [ "$2" = "PRE-INSTALL" ]; then fi elif [ "$2" = "POST-INSTALL" ]; then - - [ ! -d "${DBDIR}" ] && (${MKDIR} ${DBDIR} || exit 1) - ${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DBDIR} || exit 1 - - [ ! -d "${LOGDIR}" ] && (${MKDIR} ${LOGDIR} || exit 1) - ${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${LOGDIR} || exit 1 - - [ ! -d "${RUNDIR}" ] && (${MKDIR} ${RUNDIR} || exit 1) - ${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${RUNDIR} || exit 1 - + ${INSTALL_DIR} ${DBDIR} ${LOGDIR} ${RUNDIR} + ${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DBDIR} ${LOGDIR} ${RUNDIR} fi exit 0 diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist index cce136a30848..c2c36a05035b 100644 --- a/security/clamav/pkg-plist +++ b/security/clamav/pkg-plist @@ -9,10 +9,18 @@ bin/sigtool sbin/clamd include/clamav.h include/clamav-config.h -lib/libclamav.so.2 +lib/libclamav.so.3 lib/libclamav.so lib/libclamav.a lib/libclamav.la +%%UNRAR%%lib/libclamunrar.so.3 +%%UNRAR%%lib/libclamunrar.so +%%UNRAR%%lib/libclamunrar.la +%%UNRAR%%lib/libclamunrar.a +%%UNRAR%%lib/libclamunrar_iface.so.3 +%%UNRAR%%lib/libclamunrar_iface.so +%%UNRAR%%lib/libclamunrar_iface.la +%%UNRAR%%lib/libclamunrar_iface.a libdata/pkgconfig/libclamav.pc @unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.default; then rm -f %D/etc/clamd.conf; fi etc/clamd.conf.default |