Attachment 144166 Details for Bug 191417 – scamp diff file

[patch] scamp diff file

scamp.diff (text/plain), 6.10 KB, created by Gerard Seibert on 2014-06-26 17:53:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerard Seibert

Created: 2014-06-26 17:53:22 UTC

Size: 6.10 KB

patch

obsolete

>diff -ruN /usr/ports/security/scamp/Makefile /usr/ports/user/scamp/Makefile
>--- /usr/ports/security/scamp/Makefile	2014-01-22 12:00:46.000000000 -0500
>+++ /usr/ports/user/scamp/Makefile	2014-05-26 06:55:34.000000000 -0400
>@@ -9,27 +9,27 @@
> MAINTAINER=	gerard@seibercom.net
> COMMENT=	Download & Install additional definition files for Clamav
> 
>-LICENSE=	BSD
>+LICENSE=	BSD2CLAUSE
> 
>-RUN_DEPENDS=	bash>=4.2.42:${PORTSDIR}/shells/bash \
>-		clamav>=0.97.8:${PORTSDIR}/security/clamav \
>-		gnupg>=2.0.19:${PORTSDIR}/security/gnupg \
>-		rsync>=3.0.9:${PORTSDIR}/net/rsync
>+RUN_DEPENDS=	bash>=4.3.11_2:${PORTSDIR}/shells/bash \
>+		clamav>=0.98.3_5:${PORTSDIR}/security/clamav \
>+		gnupg>=2.0.22:${PORTSDIR}/security/gnupg \
>+		rsync>=3.1.0_3:${PORTSDIR}/net/rsync
> 
> .if exists (${LOCALBASE}/bin/wget) && ! exists (${LOCALBASE}/bin/curl)
>-RUN_DEPENDS+=	wget>=1.14:${PORTSDIR}/ftp/wget
>+RUN_DEPENDS+=	wget>=1.15:${PORTSDIR}/ftp/wget
> .else
>-RUN_DEPENDS+=	curl>=7.24.0_2:${PORTSDIR}/ftp/curl
>+RUN_DEPENDS+=	curl>=7.36.0_1:${PORTSDIR}/ftp/curl
> .endif
> 
> NO_BUILD=	yes
> SUB_FILES=	pkg-message
> 
>-MAN1=		scamp.1
>+#MAN1=		scamp.1
> 
> OPTIONS_DEFINE=	DOCS
> 
>-NO_STAGE=	yes
>+#NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> post-patch:
>@@ -37,26 +37,26 @@
> 	@${REINPLACE_CMD} -e 's|CONFIG_DIR=$${CONFIG_DIR:-"/etc/scamp"}|CONFIG_DIR=$${CONFIG_DIR:-"${ETCDIR}"}|g' ${WRKSRC}/${PORTNAME}.sh
> 
> post-install:
>-	@if [ ! -d ${ETCDIR} ]; then \
>-		${MKDIR} ${ETCDIR} ; \
>+	@if [ ! -d ${STAGEDIR}${ETCDIR} ]; then \
>+		${MKDIR} ${STAGEDIR}${ETCDIR} ; \
> 	fi
> 
>-	@${INSTALL_DATA} ${FILESDIR}/default.sample ${ETCDIR}
>+	@${INSTALL_DATA} ${FILESDIR}/default.sample ${STAGEDIR}${ETCDIR}
> 
> 	@if [ ! -f ${PREFIX}/etc/scamp/default ]; then \
>-		${CP} -p ${PREFIX}/etc/scamp/default.sample ${PREFIX}/etc/scamp/default ; \
>+		${CP} -p ${STAGEDIR}${PREFIX}/etc/scamp/default.sample ${STAGEDIR}${PREFIX}/etc/scamp/default ; \
> 	fi
> 
> do-install:
>-	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTNAME}.sh ${PREFIX}/bin
>-	cd ${WRKSRC} && ${INSTALL_MAN} scamp.1 ${MANPREFIX}/man/man1
>+	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin
>+	cd ${WRKSRC} && ${INSTALL_MAN} scamp.1 ${STAGEDIR}${MANPREFIX}/man/man1
> 
> # Documentation
> .if ${PORT_OPTIONS:MDOCS}
>-	@${MKDIR} ${DOCSDIR}
>-	cd ${WRKSRC} && ${INSTALL_DATA} README CHANGE.LOG INSTALL Release.pdf ${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC} && ${INSTALL_DATA} README CHANGE.LOG INSTALL Release.pdf ${STAGEDIR}${DOCSDIR}
> .endif
> 
>-	@${CAT} ${PKGMESSAGE}
>+#	@${CAT} ${PKGMESSAGE}
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/security/scamp/pkg-plist /usr/ports/user/scamp/pkg-plist
>--- /usr/ports/security/scamp/pkg-plist	2014-01-22 10:16:56.000000000 -0500
>+++ /usr/ports/user/scamp/pkg-plist	2014-05-16 12:54:37.000000000 -0400
>@@ -1,4 +1,6 @@
> bin/scamp.sh
>+%%ETCDIR%%/default
>+man/man1/scamp.1.gz
> %%PORTDOCS%%%%DOCSDIR%%/CHANGE.LOG
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL
> %%PORTDOCS%%%%DOCSDIR%%/README
>diff -ruN /usr/ports/security/scamp/scamp.diff /usr/ports/user/scamp/scamp.diff
>--- /usr/ports/security/scamp/scamp.diff	1969-12-31 19:00:00.000000000 -0500
>+++ /usr/ports/user/scamp/scamp.diff	2014-06-26 13:20:18.000000000 -0400
>@@ -0,0 +1,86 @@
>+diff -ruN /usr/ports/security/scamp/Makefile /usr/ports/user/scamp/Makefile
>+--- /usr/ports/security/scamp/Makefile	2014-01-22 12:00:46.000000000 -0500
>++++ /usr/ports/user/scamp/Makefile	2014-05-26 06:55:34.000000000 -0400
>+@@ -9,27 +9,27 @@
>+ MAINTAINER=	gerard@seibercom.net
>+ COMMENT=	Download & Install additional definition files for Clamav
>+ 
>+-LICENSE=	BSD
>++LICENSE=	BSD2CLAUSE
>+ 
>+-RUN_DEPENDS=	bash>=4.2.42:${PORTSDIR}/shells/bash \
>+-		clamav>=0.97.8:${PORTSDIR}/security/clamav \
>+-		gnupg>=2.0.19:${PORTSDIR}/security/gnupg \
>+-		rsync>=3.0.9:${PORTSDIR}/net/rsync
>++RUN_DEPENDS=	bash>=4.3.11_2:${PORTSDIR}/shells/bash \
>++		clamav>=0.98.3_5:${PORTSDIR}/security/clamav \
>++		gnupg>=2.0.22:${PORTSDIR}/security/gnupg \
>++		rsync>=3.1.0_3:${PORTSDIR}/net/rsync
>+ 
>+ .if exists (${LOCALBASE}/bin/wget) && ! exists (${LOCALBASE}/bin/curl)
>+-RUN_DEPENDS+=	wget>=1.14:${PORTSDIR}/ftp/wget
>++RUN_DEPENDS+=	wget>=1.15:${PORTSDIR}/ftp/wget
>+ .else
>+-RUN_DEPENDS+=	curl>=7.24.0_2:${PORTSDIR}/ftp/curl
>++RUN_DEPENDS+=	curl>=7.36.0_1:${PORTSDIR}/ftp/curl
>+ .endif
>+ 
>+ NO_BUILD=	yes
>+ SUB_FILES=	pkg-message
>+ 
>+-MAN1=		scamp.1
>++#MAN1=		scamp.1
>+ 
>+ OPTIONS_DEFINE=	DOCS
>+ 
>+-NO_STAGE=	yes
>++#NO_STAGE=	yes
>+ .include <bsd.port.options.mk>
>+ 
>+ post-patch:
>+@@ -37,26 +37,26 @@
>+ 	@${REINPLACE_CMD} -e 's|CONFIG_DIR=$${CONFIG_DIR:-"/etc/scamp"}|CONFIG_DIR=$${CONFIG_DIR:-"${ETCDIR}"}|g' ${WRKSRC}/${PORTNAME}.sh
>+ 
>+ post-install:
>+-	@if [ ! -d ${ETCDIR} ]; then \
>+-		${MKDIR} ${ETCDIR} ; \
>++	@if [ ! -d ${STAGEDIR}${ETCDIR} ]; then \
>++		${MKDIR} ${STAGEDIR}${ETCDIR} ; \
>+ 	fi
>+ 
>+-	@${INSTALL_DATA} ${FILESDIR}/default.sample ${ETCDIR}
>++	@${INSTALL_DATA} ${FILESDIR}/default.sample ${STAGEDIR}${ETCDIR}
>+ 
>+ 	@if [ ! -f ${PREFIX}/etc/scamp/default ]; then \
>+-		${CP} -p ${PREFIX}/etc/scamp/default.sample ${PREFIX}/etc/scamp/default ; \
>++		${CP} -p ${STAGEDIR}${PREFIX}/etc/scamp/default.sample ${STAGEDIR}${PREFIX}/etc/scamp/default ; \
>+ 	fi
>+ 
>+ do-install:
>+-	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTNAME}.sh ${PREFIX}/bin
>+-	cd ${WRKSRC} && ${INSTALL_MAN} scamp.1 ${MANPREFIX}/man/man1
>++	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin
>++	cd ${WRKSRC} && ${INSTALL_MAN} scamp.1 ${STAGEDIR}${MANPREFIX}/man/man1
>+ 
>+ # Documentation
>+ .if ${PORT_OPTIONS:MDOCS}
>+-	@${MKDIR} ${DOCSDIR}
>+-	cd ${WRKSRC} && ${INSTALL_DATA} README CHANGE.LOG INSTALL Release.pdf ${DOCSDIR}
>++	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>++	cd ${WRKSRC} && ${INSTALL_DATA} README CHANGE.LOG INSTALL Release.pdf ${STAGEDIR}${DOCSDIR}
>+ .endif
>+ 
>+-	@${CAT} ${PKGMESSAGE}
>++#	@${CAT} ${PKGMESSAGE}
>+ 
>+ .include <bsd.port.mk>
>+diff -ruN /usr/ports/security/scamp/pkg-plist /usr/ports/user/scamp/pkg-plist
>+--- /usr/ports/security/scamp/pkg-plist	2014-01-22 10:16:56.000000000 -0500
>++++ /usr/ports/user/scamp/pkg-plist	2014-05-16 12:54:37.000000000 -0400
>+@@ -1,4 +1,6 @@
>+ bin/scamp.sh
>++%%ETCDIR%%/default
>++man/man1/scamp.1.gz
>+ %%PORTDOCS%%%%DOCSDIR%%/CHANGE.LOG
>+ %%PORTDOCS%%%%DOCSDIR%%/INSTALL
>+ %%PORTDOCS%%%%DOCSDIR%%/README

Actions: View | Diff

Attachments on bug 191417: 144166