- Update liblogging to 0.7.1

- Update rsyslog to 2.0.5

6 files changed, 22 insertions, 31 deletions

diff --git a/devel/liblogging/Makefile b/devel/liblogging/Makefile
index 2c6a3a2a15d..a427ff21b77 100644
--- a/devel/liblogging/Makefile
+++ b/devel/liblogging/Makefile
@@ -6,35 +6,19 @@
 #
 
 PORTNAME=	liblogging
-PORTVERSION=	0.6.0
+PORTVERSION=	0.7.1
 CATEGORIES=	devel
-MASTER_SITES=	SF http://download.adiscon.com/
+MASTER_SITES=	CENKES http://download.rsyslog.com/liblogging/
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Easy to use system logging library
 
-USE_DOS2UNIX=	yes
 USE_LDCONFIG=	yes
-USE_ZIP=	yes
-WRKSRC=		${WRKDIR}/src
-MAKEFILE=	makefile
-CFLAGS+=	-fPIC
-PLIST_FILES=	include/${PORTNAME}.h include/${PORTNAME}-config.h include/srAPI.h \
-		include/syslogmessage.h lib/${PORTNAME}.so lib/${PORTNAME}.so.0
-
-post-extract:
-	@${MV} ${WRKSRC}/config.h ${WRKSRC}/${PORTNAME}-config.h
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-static
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|config\.h|${PORTNAME}-config.h|' ${WRKSRC}/*.[ch] \
-		${WRKSRC}/${MAKEFILE}
-	@${REINPLACE_CMD} -e 's|\.a|.so|g;s|[(]AR[)] cru|{CC} ${CFLAGS} -shared -o|'\
-		${WRKSRC}/${MAKEFILE}
-
-do-install:
-	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTNAME}.h ${PORTNAME}-config.h \
-		srAPI.h syslogmessage.h ${PREFIX}/include/
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}.so ${PREFIX}/lib/
-	@${LN} -sf ${PORTNAME}.so ${PREFIX}/lib/${PORTNAME}.so.0
+	@${REINPLACE_CMD} -e '/^pkgconfigdir =/s|=.*| \
+		= ${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/devel/liblogging/distinfo b/devel/liblogging/distinfo
index 281ff520242..c43fed783e6 100644
--- a/devel/liblogging/distinfo
+++ b/devel/liblogging/distinfo
@@ -1,3 +1,3 @@
-MD5 (liblogging-0.6.0.zip) = c01c2c674a458e56a908b96db00831d7
-SHA256 (liblogging-0.6.0.zip) = 7af82e60b67c888d0dcd8d1bf44f63800efc647f5b7482253ef44655fc837e5d
-SIZE (liblogging-0.6.0.zip) = 459139
+MD5 (liblogging-0.7.1.tar.gz) = 17a0de3f2a403f6baafcf608d8728690
+SHA256 (liblogging-0.7.1.tar.gz) = 2c3aaf6b5e8d2240d3db43781f7f13d1691f31083c8d4274285ef38fdef5dbbc
+SIZE (liblogging-0.7.1.tar.gz) = 525925
diff --git a/devel/liblogging/pkg-plist b/devel/liblogging/pkg-plist
new file mode 100644
index 00000000000..4e8ca7198dd
--- /dev/null
+++ b/devel/liblogging/pkg-plist
@@ -0,0 +1,9 @@
+include/liblogging/liblogging.h
+include/liblogging/settings.h
+include/liblogging/srAPI.h
+include/liblogging/syslogmessage.h
+lib/liblogging.la
+lib/liblogging.so
+lib/liblogging.so.0
+libdata/pkgconfig/liblogging.pc
+@dirrm include/liblogging
diff --git a/sysutils/rsyslog/Makefile b/sysutils/rsyslog/Makefile
index 968d0116c37..8e39b180316 100644
--- a/sysutils/rsyslog/Makefile
+++ b/sysutils/rsyslog/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	2.0.4
-PORTREVISION=	2
+PORTVERSION=	2.0.5
 CATEGORIES=	sysutils
 MASTER_SITES=	CENKES http://download.rsyslog.com/rsyslog/
 
diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo
index c2ea8219efa..4a49907e77d 100644
--- a/sysutils/rsyslog/distinfo
+++ b/sysutils/rsyslog/distinfo
@@ -1,3 +1,3 @@
-MD5 (rsyslog-2.0.4.tar.gz) = bded1f647dd5a4a6bd40b9f6311aa34c
-SHA256 (rsyslog-2.0.4.tar.gz) = 15a60d36af7643db669af86293aba1a3f1da5d48b921e623212e9b836ef99f8b
-SIZE (rsyslog-2.0.4.tar.gz) = 697603
+MD5 (rsyslog-2.0.5.tar.gz) = 6ad34f309a730c7bc9dfdb8380d82431
+SHA256 (rsyslog-2.0.5.tar.gz) = 4cc23ff7ab80171774f5844bc26b4a89048a817b7bc65a39ffa90d52829ff94c
+SIZE (rsyslog-2.0.5.tar.gz) = 695751
diff --git a/sysutils/rsyslog/pkg-plist b/sysutils/rsyslog/pkg-plist
index 6d74db08d87..1f2ca7040e1 100644
--- a/sysutils/rsyslog/pkg-plist
+++ b/sysutils/rsyslog/pkg-plist
@@ -48,7 +48,6 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_stunnel.html
-%%PORTDOCS%%%%DOCSDIR%%/status.html
 %%PORTDOCS%%%%DOCSDIR%%/syslog-protocol.html
 %%PORTDOCS%%%%DOCSDIR%%/version_naming.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%