this requires the new sysutils/eventlog port sent earlier.

please test/comment/ok.

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile    6 Oct 2008 16:09:13 -0000       1.8
+++ Makefile    8 Oct 2008 19:29:28 -0000
@@ -2,50 +2,39 @@
 
 COMMENT=       syslogd replacement
 
+DISTNAME=      syslog-ng-2.1.1
 CATEGORIES=    sysutils
 
-DISTNAME=      syslog-ng-1.6.8
-LIBOL=         libol-0.3.16
+MAINTAINER=    Steven Mestdagh <[EMAIL PROTECTED]>
 
-MAINTAINER=    Jakob Schlyter <[EMAIL PROTECTED]>
+HOMEPAGE =     http://www.balabit.com/network-security/syslog-ng/
 
-MASTER_SITE_SYSLOGNG=\
-       http://www.balabit.com/downloads/files/syslog-ng/sources/
+# GPL v2
+PERMIT_PACKAGE_CDROM =         Yes
+PERMIT_PACKAGE_FTP =           Yes
+PERMIT_DISTFILES_CDROM =       Yes
+PERMIT_DISTFILES_FTP =         Yes
 
-MASTER_SITES=  ${MASTER_SITE_SYSLOGNG:=1.6/src/}
-MASTER_SITES0= ${MASTER_SITE_SYSLOGNG:=libol/0.3/}
+MASTER_SITES = 
http://www.balabit.com/downloads/files/syslog-ng/sources/2.1/src/
 
-HOMEPAGE=      http://www.balabit.com/products/syslog_ng/
+WANTLIB =      c iconv intl wrap
 
-DISTFILES=     ${DISTNAME}.tar.gz \
-               ${LIBOL}.tar.gz:0
+LIB_DEPENDS =  glib-2.0::devel/glib2 \
+               evtlog::sysutils/eventlog
 
-# GPL
-PERMIT_PACKAGE_CDROM=  Yes
-PERMIT_PACKAGE_FTP=    Yes
-PERMIT_DISTFILES_CDROM=        Yes
-PERMIT_DISTFILES_FTP=  Yes
-WANTLIB=               c
+CONFIGURE_STYLE =      gnu
+CONFIGURE_ARGS +=      --enable-tcp-wrapper
 
-CONFIGURE_STYLE=       gnu
-CONFIGURE_ARGS+=       --with-libol=${WRKDIR}/${LIBOL} \
-                       --enable-tcp-wrapper
+DOC =          ${PREFIX}/share/doc/syslog-ng/
+EXAMPLES =     ${PREFIX}/share/examples/syslog-ng/
 
-DOC=           ${PREFIX}/share/doc/syslog-ng
-EXAMPLES=      ${PREFIX}/share/examples/syslog-ng
-
-pre-configure:
-       cp -f ${PORTSDIR}/infrastructure/db/config.guess \
-             ${PORTSDIR}/infrastructure/db/config.sub ${WRKDIR}/${LIBOL}
-       cd ${WRKDIR}/${LIBOL}; ./configure ; ${MAKE}
+post-extract:
+       tar -C ${WRKBUILD} -xzf ${WRKSRC}/doc/reference/syslog-ng.html.tar.gz
 
 post-install:
        ${INSTALL_DATA_DIR} ${DOC}
-       ${INSTALL_DATA} ${WRKSRC}/doc/sgml/*.{ps,sgml,txt} ${DOC}
-       (cd ${DOC} ;\
-       tar xzf ${WRKSRC}/doc/sgml/syslog-ng.html.tar.gz ;\
-       ln -s book1.html syslog-ng.html/index.html )
+       ${INSTALL_DATA} ${WRKBUILD}/syslog-ng.html/index.html ${DOC}
        ${INSTALL_DATA_DIR} ${EXAMPLES}
-       ${INSTALL_DATA} ${WRKSRC}/doc/syslog-ng.conf.sample ${EXAMPLES}
+       ${INSTALL_DATA} ${WRKSRC}/doc/examples/syslog-ng.conf.sample ${EXAMPLES}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo    5 Apr 2007 17:26:13 -0000       1.7
+++ distinfo    8 Oct 2008 19:29:28 -0000
@@ -1,10 +1,5 @@
-MD5 (libol-0.3.16.tar.gz) = Hym+P0vN21svPZZeePBABg==
-MD5 (syslog-ng-1.6.8.tar.gz) = /7rX6ObcvjhYILj/uiO2Ig==
-RMD160 (libol-0.3.16.tar.gz) = ts8Hi0sH/EyHm/SicZpto+lvT8Y=
-RMD160 (syslog-ng-1.6.8.tar.gz) = EcZ5miRCaYao/ZdDxjQH4ums+mc=
-SHA1 (libol-0.3.16.tar.gz) = bW4e+U2Lbdnd2OkkUMXky54wGIo=
-SHA1 (syslog-ng-1.6.8.tar.gz) = cIEq8c7jIXlwlcryoK32CvyBpwA=
-SHA256 (libol-0.3.16.tar.gz) = aL69o59D/V+hO0ARqRxAsmhP4mKvKkCeKC99mn0o7J4=
-SHA256 (syslog-ng-1.6.8.tar.gz) = PIQf2JWZ/7dwzfKERCaYDXXcPasS4PcH5Mu1GTf2El4=
-SIZE (libol-0.3.16.tar.gz) = 345231
-SIZE (syslog-ng-1.6.8.tar.gz) = 383589
+MD5 (syslog-ng-2.1.1.tar.gz) = f/7jARSKZ41cGLGRDLe+HQ==
+RMD160 (syslog-ng-2.1.1.tar.gz) = H/iIJPTV1D3CxjmK6Am8tKas8As=
+SHA1 (syslog-ng-2.1.1.tar.gz) = EeX7CzsrnxzgJlGXVVCcMkz0orQ=
+SHA256 (syslog-ng-2.1.1.tar.gz) = is0YN/wS8OZfns/7jFU794OjUGKKzKPCkyvy9FCfpIU=
+SIZE (syslog-ng-2.1.1.tar.gz) = 420883
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in   8 Oct 2008 19:29:28 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.in.orig   Mon Oct  6 19:27:00 2008
++++ Makefile.in        Mon Oct  6 19:27:05 2008
+@@ -132,7 +132,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = src tests doc contrib solbuild tgzbuild
++SUBDIRS = src doc contrib solbuild tgzbuild
+ 
+ EXTRA_DIST = debian/README.Debian debian/copyright 
debian/syslog-ng.conf.example debian/syslog-ng.files debian/syslog-ng.logrotate 
debian/syslog-ng.postrm \
+       debian/changelog debian/changelog.in debian/rules 
debian/syslog-ng.default debian/syslog-ng.init 
debian/syslog-ng.logrotate.example debian/syslog-ng.preinst \
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in       19 Jun 2004 22:16:23 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2004/06/19 22:16:23 jakob Exp $
---- src/Makefile.in.orig       2004-05-14 16:43:43.000000000 +0200
-+++ src/Makefile.in    2004-06-19 23:48:58.000000000 +0200
-@@ -73,7 +73,7 @@ YACC = @YACC@
- YFLAGS = @YFLAGS@
- MAKE_CLASS = @MAKE_CLASS@
- 
--SUBDIRS = . tests
-+SUBDIRS = . 
- 
- dist_h_files =        syslog-ng.h     cfgfile.h       sources.h       
center.h        filters.h       destinations.h  log.h   afinter.h       
affile.h        afsocket.h      afuser.h        afstreams.h     afprogram.h     
afremctrl.h     utils.h         syslog-names.h  nscache.h       macros.h
- 
Index: patches/patch-src_macros_c
===================================================================
RCS file: patches/patch-src_macros_c
diff -N patches/patch-src_macros_c
--- patches/patch-src_macros_c  19 Jun 2004 22:16:23 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_macros_c,v 1.1 2004/06/19 22:16:23 jakob Exp $
---- src/macros.c.orig  2004-06-19 23:54:01.000000000 +0200
-+++ src/macros.c       2004-06-20 00:00:25.000000000 +0200
-@@ -115,7 +115,10 @@ format_tzofs(char *dest, size_t left)
-                         (timezone < 0 ? -timezone : timezone) / 3600, 
-                         (timezone % 3600) / 60);
- #else
--      length = strftime(dest, left -1, "%z", tm);
-+      time_t unixtime;
-+      tzset();
-+      time(&unixtime);
-+      length = strftime(dest, left -1, "%z", localtime(&unixtime));
- #endif
-       return length;
- }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/syslog-ng/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST   19 Sep 2005 13:35:17 -0000      1.5
+++ pkg/PLIST   8 Oct 2008 19:29:28 -0000
@@ -1,27 +1,9 @@
 @comment $OpenBSD: PLIST,v 1.5 2005/09/19 13:35:17 jakob Exp $
 @man man/man5/syslog-ng.conf.5
 @man man/man8/syslog-ng.8
-sbin/syslog-ng
[EMAIL PROTECTED] sbin/syslog-ng
 share/doc/syslog-ng/
-share/doc/syslog-ng/syslog-ng.html/
-share/doc/syslog-ng/syslog-ng.html/book1.html
-share/doc/syslog-ng/syslog-ng.html/destinations.html
-share/doc/syslog-ng/syslog-ng.html/index.html
-share/doc/syslog-ng/syslog-ng.html/intro.html
-share/doc/syslog-ng/syslog-ng.html/logpath.html
-share/doc/syslog-ng/syslog-ng.html/msgroute.html
-share/doc/syslog-ng/syslog-ng.html/reference.html
-share/doc/syslog-ng/syslog-ng.html/tuning.html
-share/doc/syslog-ng/syslog-ng.html/x172.html
-share/doc/syslog-ng/syslog-ng.html/x361.html
-share/doc/syslog-ng/syslog-ng.html/x728.html
-share/doc/syslog-ng/syslog-ng.html/x768.html
-share/doc/syslog-ng/syslog-ng.html/x900.html
-share/doc/syslog-ng/syslog-ng.html/x906.html
-share/doc/syslog-ng/syslog-ng.html/x97.html
-share/doc/syslog-ng/syslog-ng.ps
-share/doc/syslog-ng/syslog-ng.sgml
-share/doc/syslog-ng/syslog-ng.txt
+share/doc/syslog-ng/index.html
 share/examples/syslog-ng/
 @sample ${SYSCONFDIR}/syslog-ng/
 share/examples/syslog-ng/syslog-ng.conf.sample

Reply via email to