From 62323fc0b075b14af2ffa4d35fdbec4bbefbf7ac Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Tue, 31 May 2016 13:02:20 +0000 Subject: [PATCH] Due to an oversight by the developers of syslog-ng, syslog-ng-3.7.3 did not contain pre-generated man pages therefore syslog-ng37 generated them from source. Unfortunately this caused conflicting requirements by users of syslog-ng37 between those who wanted man pages and those who did not want docbook-xsl as a prerquisite to build this port. This commit resolves this by using a specially rolled distfile that incluldes pre-generatded man pages. Thank you to Peter Czanik of balabit.hu, the company that produces syslog-ng, for providing the specially rolled distfile and for providing this patch. PR: 209858 Submitted by: Peter Czanik Syslog-ng upline person for FreeBSD support. --- sysutils/syslog-ng37/Makefile | 15 ++++++--------- sysutils/syslog-ng37/distinfo | 5 +++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sysutils/syslog-ng37/Makefile b/sysutils/syslog-ng37/Makefile index b4538740946e..f1729e30af90 100644 --- a/sysutils/syslog-ng37/Makefile +++ b/sysutils/syslog-ng37/Makefile @@ -3,14 +3,16 @@ PORTNAME= syslog-ng PORTVERSION= 3.7.3 -PORTREVISION= 3 +PORTREVISION= 4 .if !defined(MASTERDIR) PKGNAMESUFFIX= 37 .endif CATEGORIES= sysutils DISTVERSION= $(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/) -DISTFILES= syslog-ng-${DISTVERSION}.tar.gz -MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ +#DISTFILES= syslog-ng-${DISTVERSION}.tar.gz +#MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ +DISTFILES= syslog-ng-${DISTVERSION}_with_man.tar.gz +MASTER_SITES= http://peter.czanik.hu/freebsd/ MAINTAINER= cy@FreeBSD.org COMMENT= Powerful syslogd replacement @@ -52,17 +54,12 @@ INSTALL_TARGET= install-strip CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ --enable-dynamic-linking --enable-manpages \ --disable-linux-caps \ - --datadir=${PREFIX}/share/syslog-ng/ \ - --with-docbook-dir=${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl + --datadir=${PREFIX}/share/syslog-ng/ BROKEN_sparc64= Does not compile on sparc64: gcc core dump .include -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl -.endif - CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" diff --git a/sysutils/syslog-ng37/distinfo b/sysutils/syslog-ng37/distinfo index 1eaffac3844b..9aee6947971f 100644 --- a/sysutils/syslog-ng37/distinfo +++ b/sysutils/syslog-ng37/distinfo @@ -1,2 +1,3 @@ -SHA256 (syslog-ng-3.7.3.tar.gz) = 49201dcfd59c8992936aa16c694f5e6593d505b44895f6c66b7d7f7895ce2c62 -SIZE (syslog-ng-3.7.3.tar.gz) = 3511155 +TIMESTAMP = 1464621619 +SHA256 (syslog-ng-3.7.3_with_man.tar.gz) = bd991765f9f57d35eaa5a909475cbba22fd7a25bc3ea8a210e4b7a8988389f8c +SIZE (syslog-ng-3.7.3_with_man.tar.gz) = 3561113