Attachment 144313 Details for Bug 167289 – reworked patch

[patch] reworked patch

dspam-devel.diff (text/plain), 3.29 KB, created by Radim Kolar on 2014-07-01 14:04:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radim Kolar

Created: 2014-07-01 14:04:31 UTC

Size: 3.29 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with less
>diff -ruN /usr/ports/mail/dspam-devel/Makefile ./Makefile
>--- /usr/ports/mail/dspam-devel/Makefile	2014-06-30 13:25:28.000000000 +0200
>+++ ./Makefile	2014-07-01 15:57:31.000000000 +0200
>@@ -6,32 +6,16 @@
> # Else the port will be broken. Thanks.
> 
> PORTNAME=	dspam
>-PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
>-PORTREVISION=	2
>+PORTVERSION=	3.10.2
> PORTEPOCH=	1
> CATEGORIES=	mail
>-MASTER_SITES=	# set later
>+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
> PKGNAMESUFFIX=	-devel
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Bayesian spam filter - development version
> 
>-PORTVER_MAJ=	3.10.1
>-#SNAP_DATE=	.r1
>-
>-#MIN_OPTIONS_VER=	${PORTNAME}-${PKGNAMESUFFIX}-3.10.0.
>-
>-.ifdef(SNAP_DATE)
>-MASTER_SITES=	${MASTER_SITE_LOCAL} \
>-		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}-${PKGNAMESUFFIX}/sources/
>-MASTER_SITE_SUBDIR=	itetcu
>-WRKSRC=		${WRKDIR}/dspam-${PORTVER_MAJ}
>-.else
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ \
>-	http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
>-DISTFILES=	dspam-${PORTVER_MAJ}.tar.gz
>-WRKSRC=		${WRKDIR}/dspam-${PORTVER_MAJ}
>-.endif
>+LICENSE=	AGPLv3
> 
> OPTIONS_DEFINE=	SYSLOG DEBUG VERBOSE_DEBUG BNR_DEBUG PREF_EXT DAEMON \
> 		CLAMAV CLAMAV_LOCAL MYSQL_COMPRESS \
>@@ -87,9 +71,6 @@
> USES=		libtool perl5 shebangfix
> SHEBANG_FILES=	src/tools/dspam_logrotate src/tools/dspam_notify.in \
> 		src/tools/dspam_train.in
>-.ifdef(SNAP_DATE)
>-USE_AUTOTOOLS+=	autoconf:env automake
>-.endif
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> 
>@@ -118,7 +99,7 @@
> DSPAM_HOME_GROUP?=	${DSPAM_GROUP}
> DSPAM_HOME_MODE?=	0770
> 
>-.include <bsd.port.pre.mk>
>+#.include <bsd.port.pre.mk>
> 
> CONFIGURE_ARGS+=	--sysconfdir=${DSPAM_ETC}
> CONFIGURE_ARGS+=	--with-logdir=${LOG_DIR}
>@@ -147,6 +128,8 @@
> 		-e '/^%%FreeBSD/D' \
> 		-e '/^%%Tecnik%%/D'
> 
>+.include <bsd.port.options.mk>
>+
> .if ${PORT_OPTIONS:MSYSLOG}
> CONFIGURE_ARGS+=	--enable-syslog
> .else
>@@ -486,17 +469,12 @@
> 	@${ECHO_CMD} "There's no reason to depend on LightHTTPD if you're not using WebUI"
> 	@${FALSE}
> .endif
>-.ifdef(SNAP_DATE)
>-	@${ECHO_CMD}
>-	@${ECHO_CMD} "You can safely ignore the following auto*  errors"
>-	@${ECHO_CMD}
>-	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh)
>-.endif
> 
> post-install:
>-	${CP} ${WRKSRC}/src/dspam.conf ${WRKSRC}/src/dspam.conf.sample
>-	cd ${WRKSRC}/src/ && \
>-		${INSTALL} dspam.conf.sample ${STAGEDIR}${PREFIX}/etc
>+	${MV} ${STAGEDIR}/usr/local/etc/dspam.conf ${STAGEDIR}${PREFIX}/etc/dspam.conf.sample
>+#	${CP} ${WRKSRC}/src/dspam.conf ${WRKSRC}/src/dspam.conf.sample
>+#	cd ${WRKSRC}/src/ && \
>+#		${INSTALL} dspam.conf.sample ${STAGEDIR}${PREFIX}/etc
> 
> ########
> # stupid hack until I figure out where/how to patch
>@@ -582,4 +560,4 @@
> 	@${ECHO_CMD} "message in ${DOCSDIR}/README.FreeBSD"
> 	@${ECHO_CMD}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN /usr/ports/mail/dspam-devel/distinfo ./distinfo
>--- /usr/ports/mail/dspam-devel/distinfo	2014-01-22 16:30:13.000000000 +0100
>+++ ./distinfo	2014-07-01 12:51:28.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (dspam-3.10.1.tar.gz) = 359d9f58564a87da131b8390d0eeecae4aa40d22ff74b97256d46835a2474063
>-SIZE (dspam-3.10.1.tar.gz) = 1044198
>+SHA256 (dspam-3.10.2.tar.gz) = ae76569604021f35b741fb95198a1e611a8c64c3838661973a6cf360bba593a9
>+SIZE (dspam-3.10.2.tar.gz) = 1035054
>====> Cleaning up
>===> Done

Actions: View | Diff

Attachments on bug 167289: 123866 | 144313