sysutils/logfmon moved to github

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

sysutils/logfmon moved to github

Marcus MERIGHI
Hello,

after talking to $MAINTAINER (Tom Doherty) privately I'm doing what he
told me to...

Notes:
- I have no idea what I'm doing
- I just copied the GH_* stuff from other software in sysutils/
- I just copied autohell stuff from other software in sysutils/
- I just copied CONFIGURE_* stuff from - well, guess it.
- I just adjusted PLIST to match nicms layout change
    (sbin/logfmon -> bin/logfmon)
- I removed patches/patch-Makefile which contained:
            +++ Makefile
            -INCDIRS= -I- -I. -I/usr/local/include
            +INCDIRS= -iquote -I. -I/usr/local/include
    This patch caused an error because Makefile isn't there at the time
    of patching and it only removes an "obsolete" warning with the hint
    to use "-iquote".
    Please advise on how to get the Makefile patch right!

Thanks for your time, Marcus

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/logfmon/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- Makefile 11 Jan 2018 19:27:10 -0000 1.4
+++ Makefile 17 Jan 2018 11:09:35 -0000
@@ -2,11 +2,11 @@
 
 COMMENT= log file monitoring daemon
 
-DISTNAME= logfmon-1.1
-REVISION= 1
-CATEGORIES= sysutils
+GH_ACCOUNT=             nicm
+GH_PROJECT=             logfmon
+GH_TAGNAME= 1.2
 
-HOMEPAGE= http://sourceforge.net/projects/logfmon/
+CATEGORIES= sysutils
 
 MAINTAINER= Tom Doherty <[hidden email]>
 
@@ -15,9 +15,19 @@ PERMIT_PACKAGE_CDROM= Yes
 
 WANTLIB= c m pthread
 
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=logfmon/}
-
 NO_TEST= Yes
+
+CONFIGURE_STYLE =       gnu
+CONFIGURE_ARGS +=       --disable-debug
+
+AUTOCONF_VERSION=       2.69
+AUTOMAKE_VERSION=       1.15
+BUILD_DEPENDS +=        ${MODGNU_AUTOMAKE_DEPENDS} \
+ ${MODGNU_AUTOCONF_DEPENDS}
+
+pre-configure:
+ cd ${WRKSRC} && AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+ AUTOCONF_VERSION=${AUTOCONF_VERSION} /bin/sh ./autogen.sh
 
 post-install:
  ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/logfmon
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/logfmon/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- distinfo 18 Jan 2015 03:15:12 -0000 1.2
+++ distinfo 17 Jan 2018 11:09:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (logfmon-1.1.tar.gz) = FVuURXcM3O4rQtmaVH74fTfBDvUHsiug81G9eaiOGzg=
-SIZE (logfmon-1.1.tar.gz) = 49705
+SHA256 (logfmon-1.2.tar.gz) = b6b154964a2a871e85a5dd7c1f2282c0708d0d879b7307c69a9292361321ba74
+SIZE (logfmon-1.2.tar.gz) = 43040
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/logfmon/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- pkg/PLIST 16 May 2012 06:10:18 -0000 1.1.1.1
+++ pkg/PLIST 17 Jan 2018 11:09:35 -0000
@@ -1,7 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2012/05/16 06:10:18 jasper Exp $
 @man man/man5/logfmon.conf.5
 @man man/man8/logfmon.8
-@bin sbin/logfmon
+@bin bin/logfmon
 share/examples/logfmon/
 share/examples/logfmon/brandini.conf
 share/examples/logfmon/logfmon-freebsd.conf

Reply | Threaded
Open this post in threaded view
|

Re: sysutils/logfmon moved to github

Stuart Henderson
On 2018/01/17 12:31, Marcus MERIGHI wrote:

> Hello,
>
> after talking to $MAINTAINER (Tom Doherty) privately I'm doing what he
> told me to...
>
> Notes:
> - I have no idea what I'm doing
> - I just copied the GH_* stuff from other software in sysutils/
> - I just copied autohell stuff from other software in sysutils/
> - I just copied CONFIGURE_* stuff from - well, guess it.
> - I just adjusted PLIST to match nicms layout change
>     (sbin/logfmon -> bin/logfmon)
> - I removed patches/patch-Makefile which contained:
>             +++ Makefile
>             -INCDIRS= -I- -I. -I/usr/local/include
>             +INCDIRS= -iquote -I. -I/usr/local/include
>     This patch caused an error because Makefile isn't there at the time
>     of patching and it only removes an "obsolete" warning with the hint
>     to use "-iquote".
>     Please advise on how to get the Makefile patch right!
>
> Thanks for your time, Marcus

This is how it should look. Build-tested only.


Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/logfmon/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 11 Jan 2018 19:27:10 -0000 1.4
+++ Makefile 17 Jan 2018 11:39:16 -0000
@@ -2,22 +2,22 @@
 
 COMMENT= log file monitoring daemon
 
-DISTNAME= logfmon-1.1
-REVISION= 1
+V= 1.2
+DISTNAME= logfmon-$V
 CATEGORIES= sysutils
 
-HOMEPAGE= http://sourceforge.net/projects/logfmon/
+HOMEPAGE= https://github.com/nicm/logfmon
 
 MAINTAINER= Tom Doherty <[hidden email]>
 
 # ISC
 PERMIT_PACKAGE_CDROM= Yes
 
-WANTLIB= c m pthread
+WANTLIB= c pthread
 
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=logfmon/}
+MASTER_SITES= https://github.com/nicm/logfmon/releases/download/$V/
 
-NO_TEST= Yes
+CONFIGURE_STYLE= gnu
 
 post-install:
  ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/logfmon
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/logfmon/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 18 Jan 2015 03:15:12 -0000 1.2
+++ distinfo 17 Jan 2018 11:39:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (logfmon-1.1.tar.gz) = FVuURXcM3O4rQtmaVH74fTfBDvUHsiug81G9eaiOGzg=
-SIZE (logfmon-1.1.tar.gz) = 49705
+SHA256 (logfmon-1.2.tar.gz) = r5geqSav7O3rs2oCr2E69AeCEE1oJmfvrcvEkkqy6cc=
+SIZE (logfmon-1.2.tar.gz) = 149108
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 16 May 2012 06:10:18 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2012/05/16 06:10:18 jasper Exp $
-
-cc1: note: obsolete option -I- used, please use -iquote instead
-NB: The hardcoded /usr/local in this Makefile does not affect OpenBSD's build.
-
---- Makefile.orig Mon May 14 09:53:28 2012
-+++ Makefile Mon May 14 09:53:57 2012
-@@ -34,7 +34,7 @@ PREFIX?= /usr/local
- INSTALLBIN= install -g bin -o root -m 555
- INSTALLMAN= install -g bin -o root -m 444
-
--INCDIRS= -I- -I. -I/usr/local/include
-+INCDIRS= -iquote -I. -I/usr/local/include
- LDFLAGS+= -L/usr/local/lib
- LIBS= -lm
- .if ${OS} == "OpenBSD" || ${OS} == "FreeBSD"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/logfmon/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 16 May 2012 06:10:18 -0000 1.1.1.1
+++ pkg/PLIST 17 Jan 2018 11:39:16 -0000
@@ -1,7 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2012/05/16 06:10:18 jasper Exp $
+@bin bin/logfmon
 @man man/man5/logfmon.conf.5
 @man man/man8/logfmon.8
-@bin sbin/logfmon
 share/examples/logfmon/
 share/examples/logfmon/brandini.conf
 share/examples/logfmon/logfmon-freebsd.conf
Index: pkg/logfmon.rc
===================================================================
RCS file: /cvs/ports/sysutils/logfmon/pkg/logfmon.rc,v
retrieving revision 1.2
diff -u -p -r1.2 logfmon.rc
--- pkg/logfmon.rc 11 Jan 2018 19:27:10 -0000 1.2
+++ pkg/logfmon.rc 17 Jan 2018 11:39:16 -0000
@@ -2,7 +2,7 @@
 #
 # $OpenBSD: logfmon.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
 
-daemon="${TRUEPREFIX}/sbin/logfmon"
+daemon="${TRUEPREFIX}/bin/logfmon"
 
 . /etc/rc.d/rc.subr
 

Reply | Threaded
Open this post in threaded view
|

Re: sysutils/logfmon moved to github

Marcus MERIGHI
Thanks for looking at it!

Anything *I* can/need/should do?
This is sort of a ping...

It runs, but I'm only in a rather slow move to get it cumstomized, no
real world testing atm...

Marcus

[hidden email] (Stuart Henderson), 2018.01.17 (Wed) 12:40 (CET):

> On 2018/01/17 12:31, Marcus MERIGHI wrote:
> > Hello,
> >
> > after talking to $MAINTAINER (Tom Doherty) privately I'm doing what he
> > told me to...
> >
> > Notes:
> > - I have no idea what I'm doing
> > - I just copied the GH_* stuff from other software in sysutils/
> > - I just copied autohell stuff from other software in sysutils/
> > - I just copied CONFIGURE_* stuff from - well, guess it.
> > - I just adjusted PLIST to match nicms layout change
> >     (sbin/logfmon -> bin/logfmon)
> > - I removed patches/patch-Makefile which contained:
> >             +++ Makefile
> >             -INCDIRS= -I- -I. -I/usr/local/include
> >             +INCDIRS= -iquote -I. -I/usr/local/include
> >     This patch caused an error because Makefile isn't there at the time
> >     of patching and it only removes an "obsolete" warning with the hint
> >     to use "-iquote".
> >     Please advise on how to get the Makefile patch right!
> >
> > Thanks for your time, Marcus
>
> This is how it should look. Build-tested only.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/logfmon/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile 11 Jan 2018 19:27:10 -0000 1.4
> +++ Makefile 17 Jan 2018 11:39:16 -0000
> @@ -2,22 +2,22 @@
>  
>  COMMENT= log file monitoring daemon
>  
> -DISTNAME= logfmon-1.1
> -REVISION= 1
> +V= 1.2
> +DISTNAME= logfmon-$V
>  CATEGORIES= sysutils
>  
> -HOMEPAGE= http://sourceforge.net/projects/logfmon/
> +HOMEPAGE= https://github.com/nicm/logfmon
>  
>  MAINTAINER= Tom Doherty <[hidden email]>
>  
>  # ISC
>  PERMIT_PACKAGE_CDROM= Yes
>  
> -WANTLIB= c m pthread
> +WANTLIB= c pthread
>  
> -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=logfmon/}
> +MASTER_SITES= https://github.com/nicm/logfmon/releases/download/$V/
>  
> -NO_TEST= Yes
> +CONFIGURE_STYLE= gnu
>  
>  post-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/logfmon
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/logfmon/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 18 Jan 2015 03:15:12 -0000 1.2
> +++ distinfo 17 Jan 2018 11:39:16 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (logfmon-1.1.tar.gz) = FVuURXcM3O4rQtmaVH74fTfBDvUHsiug81G9eaiOGzg=
> -SIZE (logfmon-1.1.tar.gz) = 49705
> +SHA256 (logfmon-1.2.tar.gz) = r5geqSav7O3rs2oCr2E69AeCEE1oJmfvrcvEkkqy6cc=
> +SIZE (logfmon-1.2.tar.gz) = 149108
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: patches/patch-Makefile
> diff -N patches/patch-Makefile
> --- patches/patch-Makefile 16 May 2012 06:10:18 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-Makefile,v 1.1.1.1 2012/05/16 06:10:18 jasper Exp $
> -
> -cc1: note: obsolete option -I- used, please use -iquote instead
> -NB: The hardcoded /usr/local in this Makefile does not affect OpenBSD's build.
> -
> ---- Makefile.orig Mon May 14 09:53:28 2012
> -+++ Makefile Mon May 14 09:53:57 2012
> -@@ -34,7 +34,7 @@ PREFIX?= /usr/local
> - INSTALLBIN= install -g bin -o root -m 555
> - INSTALLMAN= install -g bin -o root -m 444
> -
> --INCDIRS= -I- -I. -I/usr/local/include
> -+INCDIRS= -iquote -I. -I/usr/local/include
> - LDFLAGS+= -L/usr/local/lib
> - LIBS= -lm
> - .if ${OS} == "OpenBSD" || ${OS} == "FreeBSD"
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/logfmon/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 16 May 2012 06:10:18 -0000 1.1.1.1
> +++ pkg/PLIST 17 Jan 2018 11:39:16 -0000
> @@ -1,7 +1,7 @@
>  @comment $OpenBSD: PLIST,v 1.1.1.1 2012/05/16 06:10:18 jasper Exp $
> +@bin bin/logfmon
>  @man man/man5/logfmon.conf.5
>  @man man/man8/logfmon.8
> -@bin sbin/logfmon
>  share/examples/logfmon/
>  share/examples/logfmon/brandini.conf
>  share/examples/logfmon/logfmon-freebsd.conf
> Index: pkg/logfmon.rc
> ===================================================================
> RCS file: /cvs/ports/sysutils/logfmon/pkg/logfmon.rc,v
> retrieving revision 1.2
> diff -u -p -r1.2 logfmon.rc
> --- pkg/logfmon.rc 11 Jan 2018 19:27:10 -0000 1.2
> +++ pkg/logfmon.rc 17 Jan 2018 11:39:16 -0000
> @@ -2,7 +2,7 @@
>  #
>  # $OpenBSD: logfmon.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
>  
> -daemon="${TRUEPREFIX}/sbin/logfmon"
> +daemon="${TRUEPREFIX}/bin/logfmon"
>  
>  . /etc/rc.d/rc.subr
>  
>

Reply | Threaded
Open this post in threaded view
|

Re: sysutils/logfmon moved to github

Klemens Nanni
On Fri, Jan 26, 2018 at 04:15:06PM +0100, Marcus MERIGHI wrote:
> Anything *I* can/need/should do?
> This is sort of a ping...
Since sthen only build tested it, you can run the test suite (I take
there is one since NO_TEST=yes is gone).

> It runs, but I'm only in a rather slow move to get it cumstomized, no
> real world testing atm...
Running things in production is good for testing real world examples,
so that's another thing you can do :)

Reply | Threaded
Open this post in threaded view
|

Re: sysutils/logfmon moved to github

Stuart Henderson
On 2018/01/26 18:12, Klemens Nanni wrote:
> On Fri, Jan 26, 2018 at 04:15:06PM +0100, Marcus MERIGHI wrote:
> > Anything *I* can/need/should do?
> > This is sort of a ping...
> Since sthen only build tested it, you can run the test suite (I take
> there is one since NO_TEST=yes is gone).

I removed NO_TEST because it no longer errors out, there isn't a test
suite though.