Index: Makefile
===================================================================
--- Makefile	(revision 336069)
+++ Makefile	(working copy)
@@ -11,8 +11,8 @@
 
 BUILD_DEPENDS=	libgcrypt-config:${PORTSDIR}/security/libgcrypt
 
-LIB_DEPENDS=	ee:${PORTSDIR}/devel/libee \
-		estr:${PORTSDIR}/devel/libestr \
+LIB_DEPENDS=	libee.so:${PORTSDIR}/devel/libee \
+		libestr.so:${PORTSDIR}/devel/libestr \
 		libjson.so:${PORTSDIR}/devel/json-c
 
 USE_LDCONFIG=	yes
@@ -35,11 +35,10 @@
 
 USES=		pkgconfig
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDBI}
-LIB_DEPENDS+=	dbi.1:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS+=	libdbi.so:${PORTSDIR}/databases/libdbi
 CONFIGURE_ARGS+=--enable-libdbi
 PLIST_FILES+=	lib/rsyslog/omlibdbi.la \
 		lib/rsyslog/omlibdbi.so
@@ -48,7 +47,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--enable-gnutls
 PLIST_FILES+=	lib/rsyslog/lmnsd_gtls.la \
 		lib/rsyslog/lmnsd_gtls.so
@@ -87,7 +86,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MRELP}
-LIB_DEPENDS+=	relp.0:${PORTSDIR}/devel/librelp
+LIB_DEPENDS+=	librelp.so:${PORTSDIR}/devel/librelp
 CONFIGURE_ARGS+=--enable-relp
 PLIST_FILES+=	lib/rsyslog/imrelp.la \
 		lib/rsyslog/imrelp.so \
@@ -98,7 +97,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MRFC3195}
-LIB_DEPENDS+=	logging.0:${PORTSDIR}/devel/liblogging
+LIB_DEPENDS+=	liblogging.so:${PORTSDIR}/devel/liblogging
 CONFIGURE_ARGS+=--enable-rfc3195
 PLIST_FILES+=	lib/rsyslog/im3195.la \
 		lib/rsyslog/im3195.so
@@ -107,7 +106,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MSNMP}
-LIB_DEPENDS+=	netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 CONFIGURE_ARGS+=--enable-snmp
 PLIST_FILES+=	lib/rsyslog/omsnmp.la \
 		lib/rsyslog/omsnmp.so
@@ -116,7 +115,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MUUID}
-LIB_DEPENDS+=	uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS+=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
 .else
 CONFIGURE_ARGS+=--disable-uuid
 .endif
@@ -148,9 +147,6 @@
 CONFIGURE_ENV+=	LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lkvm"
 CFLAGS+=	${CPPFLAGS}
 
-MAN8=	rsyslogd.8
-MAN5=	rsyslog.conf.5
-
 USE_RC_SUBR=	${PORTNAME}d
 SUB_FILES=	pkg-message
 
@@ -165,15 +161,10 @@
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${INSTALL} -d ${DOCSDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/doc/*html ${DOCSDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/doc/*jpg ${DOCSDIR}/
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${INSTALL} -d ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${EXAMPLESDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
+	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/doc/*html ${STAGEDIR}${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/doc/*jpg ${STAGEDIR}${DOCSDIR}/
+	@${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 336069)
+++ pkg-plist	(working copy)
@@ -40,5 +40,7 @@
 lib/rsyslog/omstdout.so
 lib/rsyslog/omtesting.la
 lib/rsyslog/omtesting.so
+man/man5/rsyslog.conf.5.gz
+man/man8/rsyslogd.8.gz
 sbin/rsyslogd
 @dirrmtry lib/rsyslog