Date: Thu, 19 Oct 2006 13:17:20 +0400 (MSD) From: Demin Alexander <support@spectrum.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/104562: Fix MASTER_SITES, addition distribution kit for FreeBSD 6.1 Message-ID: <200610190917.k9J9HKVF078538@support.spectrum.ru> Resent-Message-ID: <200610190920.k9J9KGLk017663@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 104562 >Category: ports >Synopsis: Fix MASTER_SITES, addition distribution kit for FreeBSD 6.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Oct 19 09:20:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Demin Alexander >Release: FreeBSD 5.5-STABLE i386 >Organization: Group of companies Spectrum >Environment: System: FreeBSD support.spectrum.ru 5.5-STABLE FreeBSD 5.5-STABLE #34: Fri Sep 22 18:09:11 MSD 2006 oldman@support.spectrum.ru:/usr/obj/usr/src/sys/MYGENERIC i386 >Description: Fix MASTER_SITES, update statically compiled distribution kit for FreeBSD 4.x, 5.5 and addition for FreeBSD 6.1; update documentations. Please close PR 104223 but this PR is considered in my patch. Thanks. >How-To-Repeat: >Fix: --- drweb_4.33_add_fbsd61distr begins here --- diff -ruN /usr/ports/security/drweb.old/Makefile /usr/ports/security/drweb/Makefile --- /usr/ports/security/drweb.old/Makefile Wed Oct 18 11:52:23 2006 +++ /usr/ports/security/drweb/Makefile Thu Oct 19 12:42:17 2006 @@ -7,18 +7,20 @@ PORTNAME= drweb PORTVERSION= 4.33 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security -MASTER_SITES= ftp://ftp.drweb.ru/pub/drweb/unix/FreeBSD/411/:f411 \ - ftp://ftp.drweb.ru/pub/drweb/unix/FreeBSD/54/:f54 \ - http://freebsd.spectrum.ru/distfiles/:f411,f54 +DIST_SUBDIR= drweb +MASTER_SITES= ftp://ftp.drweb.com/pub/drweb/unix/FreeBSD/61/:f61 \ + ftp://ftp.drweb.com/pub/drweb/unix/FreeBSD/55/:f55 \ + ftp://ftp.drweb.com/pub/drweb/unix/FreeBSD/411/:f411 \ + http://freebsd.spectrum.ru/distfiles/drweb/:f61,f55,f411 MAINTAINER= support@spectrum.ru COMMENT= DrWeb antivirus suite RUN_DEPENDS= ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget -ONLY_FOR_ARCHS= i386 +IA32_BINARY_PORT= yes NO_BUILD= yes .include <bsd.port.pre.mk> @@ -26,12 +28,12 @@ .if ${OSVERSION} < 500000 DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsd411 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:f411 +.elif ${OSVERSION} >= 601000 +DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsd61 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:f61 .else -DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsd54 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:f54 -.if ${OSVERSION} >= 600000 -LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x -.endif +DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsd55 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:f55 .endif WRKSRC= ${WRKDIR}/${DISTNAME} @@ -39,37 +41,45 @@ DRWEB_PREFIX= ${PREFIX}/${PORTNAME} DRWEB_VARPREFIX=/var/drweb +pre-install: +.if ${OSVERSION} < 500000 +PLIST_SUB= RU="@comment " +.else +PLIST_SUB= RU="" +.endif + do-install: - ${INSTALL} -dv -m 0750 ${DRWEB_PREFIX} - ${INSTALL} -dv -m 0750 ${PREFIX}/etc/drweb - ${INSTALL} -dv -m 0750 ${DRWEB_VARPREFIX} - ${RM} -f ${WRKSRC}${LOCALBASE}/drweb/update.pl - ${TAR} -cf - -C ${WRKSRC}${LOCALBASE}/drweb . | \ + @${INSTALL} -dv -m 0750 ${DRWEB_PREFIX} + @${INSTALL} -dv -m 0750 ${PREFIX}/etc/drweb + @${INSTALL} -dv -m 0750 ${DRWEB_VARPREFIX} + @${RM} -f ${WRKSRC}${LOCALBASE}/drweb/update.pl + @${TAR} -cf - -C ${WRKSRC}${LOCALBASE}/drweb . | \ ${TAR} -xf - -C ${DRWEB_PREFIX} \ --exclude "*.static" --exclude "doc" - ${TAR} -cf - -C ${WRKSRC}/var/drweb/ . | \ + @${TAR} -cf - -C ${WRKSRC}/var/drweb/ . | \ ${TAR} -xf - -C ${DRWEB_VARPREFIX} - ${INSTALL_DATA} -m 0640 ${WRKSRC}${LOCALBASE}/etc/drweb/drweb32.ini \ + @${INSTALL_DATA} -m 0640 ${WRKSRC}${LOCALBASE}/etc/drweb/drweb32.ini \ ${PREFIX}/etc/drweb/drweb32.ini-distr if [ ! -f ${PREFIX}/etc/drweb/drweb32.ini ] ; then \ ${CP} ${PREFIX}/etc/drweb/drweb32.ini-distr \ ${PREFIX}/etc/drweb/drweb32.ini; \ fi - ${INSTALL_DATA} -m 0640 ${WRKSRC}${LOCALBASE}/etc/drweb/email.ini \ + @${INSTALL_DATA} -m 0640 ${WRKSRC}${LOCALBASE}/etc/drweb/email.ini \ ${PREFIX}/etc/drweb/email.ini-distr if [ ! -f ${PREFIX}/etc/drweb/email.ini ] ; then \ ${CP} ${PREFIX}/etc/drweb/email.ini-distr \ ${PREFIX}/etc/drweb/email.ini; \ fi - ${INSTALL_SCRIPT} -m 0750 -b ${WRKSRC}${LOCALBASE}/etc/rc.d/00.drwebd.sh \ + @${INSTALL_SCRIPT} -m 0750 -b ${WRKSRC}${LOCALBASE}/etc/rc.d/00.drwebd.sh \ ${PREFIX}/etc/rc.d/001.drwebd.sh post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${TAR} -cf - -C ${WRKSRC}${LOCALBASE}/drweb/doc . | \ + @${MKDIR} ${DOCSDIR} + @${TAR} -cf - -C ${WRKSRC}${LOCALBASE}/drweb/doc . | \ ${TAR} -xf - -C ${DOCSDIR} .endif - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL ${DRWEB_PREFIX} ${DRWEB_VARPREFIX} ${PREFIX} + + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL ${DRWEB_PREFIX} ${DRWEB_VARPREFIX} ${PREFIX} .include <bsd.port.post.mk> diff -ruN /usr/ports/security/drweb.old/distinfo /usr/ports/security/drweb/distinfo --- /usr/ports/security/drweb.old/distinfo Wed Oct 18 11:52:23 2006 +++ /usr/ports/security/drweb/distinfo Thu Oct 19 10:59:32 2006 @@ -1,6 +1,9 @@ -MD5 (drweb-4.33-freebsd411.tar.gz) = 389a65d58c2563f86a7d3297d2bd4e50 -SHA256 (drweb-4.33-freebsd411.tar.gz) = 200f96afc1fcabb92218adaa85649df7cac5414b544bceca93828edda19c3cc8 -SIZE (drweb-4.33-freebsd411.tar.gz) = 3345689 -MD5 (drweb-4.33-freebsd54.tar.gz) = 0376869752653ee075af8a7044eaf57d -SHA256 (drweb-4.33-freebsd54.tar.gz) = 5c9a41865ede292c4bacb675b9c1a1f1ef6789e96932e83a6b26237ba6b6415a -SIZE (drweb-4.33-freebsd54.tar.gz) = 3850792 +MD5 (drweb/drweb-4.33-freebsd61.tar.gz) = e116406f55afeef1c9e9a2a7ec47ef8a +SHA256 (drweb/drweb-4.33-freebsd61.tar.gz) = 8954cb57b2dac599daa1f379e587150d87cf59447f6a2526152e93c54446815a +SIZE (drweb/drweb-4.33-freebsd61.tar.gz) = 4930388 +MD5 (drweb/drweb-4.33-freebsd55.tar.gz) = e822dcd2821ff0f5e0441c7a08a8613e +SHA256 (drweb/drweb-4.33-freebsd55.tar.gz) = be4369b4d67cad5b16faeb2703317fc7805f38d84a3bed02f7fa1ff46d0e25db +SIZE (drweb/drweb-4.33-freebsd55.tar.gz) = 4903456 +MD5 (drweb/drweb-4.33-freebsd411.tar.gz) = e1a4a36ddd81a1cd03ba7fc24aba983b +SHA256 (drweb/drweb-4.33-freebsd411.tar.gz) = 46fe58025e484c5509431f28734d6c66820a8aa795bada9332bd1099f0eb4e97 +SIZE (drweb/drweb-4.33-freebsd411.tar.gz) = 3868905 diff -ruN /usr/ports/security/drweb.old/pkg-plist /usr/ports/security/drweb/pkg-plist --- /usr/ports/security/drweb.old/pkg-plist Wed Oct 18 11:52:23 2006 +++ /usr/ports/security/drweb/pkg-plist Thu Oct 19 12:21:24 2006 @@ -17,10 +17,12 @@ @exec if [ ! -f %B/email.ini ] ; then cp -p %B/%F %B/email.ini ; fi etc/rc.d/001.drwebd.sh %%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.rus %%PORTDOCS%%%%DOCSDIR%%/FAQ %%PORTDOCS%%%%DOCSDIR%%/FAQ.rus %%PORTDOCS%%%%DOCSDIR%%/daemon/readme.daemon %%PORTDOCS%%%%DOCSDIR%%/daemon/readme.daemon.rus +%%PORTDOCS%%%%DOCSDIR%%/drweb.newsyslog.add %%PORTDOCS%%%%DOCSDIR%%/readme.eicar %%PORTDOCS%%%%DOCSDIR%%/readme.eicar.rus %%PORTDOCS%%%%DOCSDIR%%/readme.license @@ -41,9 +43,52 @@ drweb/bases/drw43300.vdb drweb/bases/drw43301.vdb drweb/bases/drw43302.vdb +drweb/bases/drw43303.vdb +drweb/bases/drw43304.vdb +drweb/bases/drw43305.vdb +drweb/bases/drw43306.vdb +drweb/bases/drw43307.vdb +drweb/bases/drw43308.vdb +drweb/bases/drw43309.vdb +drweb/bases/drw43310.vdb +drweb/bases/drw43311.vdb +drweb/bases/drw43312.vdb +drweb/bases/drw43313.vdb +drweb/bases/drw43314.vdb +drweb/bases/drw43315.vdb +drweb/bases/drw43316.vdb +drweb/bases/drw43317.vdb +drweb/bases/drw43318.vdb +drweb/bases/drw43319.vdb +drweb/bases/drw43320.vdb +drweb/bases/drw43321.vdb +drweb/bases/drw43322.vdb +drweb/bases/drw43323.vdb +drweb/bases/drw43324.vdb +%%RU%%drweb/bases/drw43325.vdb +%%RU%%drweb/bases/drw43326.vdb +%%RU%%drweb/bases/drw43327.vdb +%%RU%%drweb/bases/drw43328.vdb +%%RU%%drweb/bases/drw43329.vdb +%%RU%%drweb/bases/drw43330.vdb +%%RU%%drweb/bases/drw43331.vdb +%%RU%%drweb/bases/drw43332.vdb +%%RU%%drweb/bases/drw43333.vdb +%%RU%%drweb/bases/drw43334.vdb +%%RU%%drweb/bases/drw43335.vdb +%%RU%%drweb/bases/drw43336.vdb +%%RU%%drweb/bases/drw43337.vdb +%%RU%%drweb/bases/drw43338.vdb +%%RU%%drweb/bases/drw43339.vdb +%%RU%%drweb/bases/drw43340.vdb +%%RU%%drweb/bases/drw43341.vdb drweb/bases/drwebase.vdb drweb/bases/drwnasty.vdb drweb/bases/drwrisky.vdb +drweb/bases/dwn43301.vdb +%%RU%%drweb/bases/dwn43302.vdb +%%RU%%drweb/bases/dwn43303.vdb +%%RU%%drweb/bases/dwr43301.vdb drweb/bases/update.drl @dirrm drweb/bases @dirrm drweb/infected --- drweb_4.33_add_fbsd61distr ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610190917.k9J9HKVF078538>