Attachment #39628 for bug #62434

View | Details | Raw Unified | Return to bug 62434
Collapse All | Expand All





PORTNAME=	xlogmaster
PORTVERSION=	1.6.0
PORTREVISION=	2
CATEGORIES=	sysutils
MASTER_SITES=	${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Quick & easy monitoring of logfiles and devices

USE_XLIB=	yes
USE_GMAKE=	yes
USE_GNOME=	gtk12
USE_GETOPT_LONG=	yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"

MAN1=		xlogmaster.1
INFO=		xlogmaster

CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
LDFLAGS=	-L${LOCALBASE}/lib

post-extract:
	-${RM} ${WRKSRC}/import/getopt*
.endif

post-install:
	@install-info ${PREFIX}/info/xlogmaster.info ${PREFIX}/info/dir
	${INSTALL_DATA} ${FILESDIR}/xlogmasterrc ${PREFIX}/etc/xlogmaster

.include <bsd.port.mk>




--- configure.orig	Thu Apr  1 01:00:59 1999
+++ configure	Thu Feb  5 22:01:46 2004
@@ -860,7 +860,7 @@
 
 

 if test x${CXXFLAGS+set} = xset ; then
   :
 else
@@ -1874,7 +1874,7 @@
 import_sources="$force_libimport"
 rx_sources="$force_libimport"
 
-for ac_func in getopt_long_only
+for ac_func in getopt_long
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:1881: checking for $ac_func" >&5




--- src/Makefile.in.orig	Thu Apr  1 01:01:02 1999
+++ src/Makefile.in	Thu Feb  5 22:17:35 2004
@@ -80,8 +80,8 @@
 @DEVELMODE_TRUE@DEVELFLAGS =  -g -Wall
 
 CLEANFILES = *~ .deps/*
-CXXFLAGS =  $(GTK_CFLAGS) -DXLM_HOME=\"$(XLM_HOME)\" -DXLM_DB=\"$(XLM_DB)\" -DXLM_USER_DB=\"$(XLM_USER_DB)\" -DXLM_LIB=\"$(XLM_LIB)\"  -I../import $(DEVELFLAGS)
-LDFLAGS =  $(GTK_LIBS)
+CXXFLAGS = @CXXFLAGS@ $(GTK_CFLAGS) -DXLM_HOME=\"$(XLM_HOME)\" -DXLM_DB=\"$(XLM_DB)\" -DXLM_USER_DB=\"$(XLM_USER_DB)\" -DXLM_LIB=\"$(XLM_LIB)\"  -I../import $(DEVELFLAGS)
+LDFLAGS = @LDFLAGS@ $(GTK_LIBS)
 
 bin_PROGRAMS = xlogmaster
 xlogmaster_SOURCES = xlogmaster.cc 	alert.cc 	audio.cc 	database.cc 	dialog.cc 	execute.cc 	file.cc 	logclass.cc 	menu.cc 	customize.cc 	watchdog.cc 	output.cc 

Line 0 Link Here

(-)sysutils/xlogmaster/files/patch-src::database.cc (+11 lines)
	1	--- src/database.cc.orig Thu Apr 1 01:00:29 1999
	2	+++ src/database.cc Thu Feb 5 21:39:55 2004
	3	@@ -38,6 +38,8 @@
	4	#include "logclass.H"
	5	#include "database.H"
	6	#include "extern.H"
	7	+#include <iostream>
	8	+using namespace std;
	9
	10	/}}}/
	11

Line 0 Link Here

(-)sysutils/xlogmaster/files/patch-src::execute.cc (+11 lines)
	1	--- src/execute.cc.orig Thu Apr 1 01:00:29 1999
	2	+++ src/execute.cc Thu Feb 5 21:39:55 2004
	3	@@ -38,6 +38,8 @@
	4	#include "logclass.H"
	5	#include "execute.H"
	6	#include "extern.H"
	7	+#include <iostream>
	8	+using namespace std;
	9
	10	/}}}/
	11

Line 0 Link Here

(-)sysutils/xlogmaster/files/patch-src::file.cc (+11 lines)
	1	--- src/file.cc.orig Thu Apr 1 01:00:29 1999
	2	+++ src/file.cc Thu Feb 5 22:11:38 2004
	3	@@ -38,6 +38,8 @@
	4	#include "logclass.H"
	5	#include "file.H"
	6	#include "extern.H"
	7	+#include <iostream>
	8	+using namespace std;
	9
	10	/}}}/
	11




--- src/logclass.H.orig	Thu Apr  1 01:00:29 1999
+++ src/logclass.H	Thu Feb  5 21:39:55 2004
@@ -28,7 +28,7 @@
 
 class Log {
 /*{{{  Functions  */
-  friend Filter;
+  friend class Filter;
 public:
   Log();
   ~Log();
@@ -200,7 +200,7 @@
 class Filter 
 {
 /*{{{  Functions  */
-  friend Log;
+  friend class Log;
 public:
   Filter();
   ~Filter();

Line 0 Link Here

(-)sysutils/xlogmaster/files/patch-src::logclass.cc (+11 lines)
	1	--- src/logclass.cc.orig Thu Apr 1 01:00:29 1999
	2	+++ src/logclass.cc Thu Feb 5 21:39:55 2004
	3	@@ -37,6 +37,8 @@
	4	#include "../import/import.h"
	5	#include "logclass.H"
	6	#include "extern.H"
	7	+#include <iostream>
	8	+using namespace std;
	9
	10	/}}}/
	11

Line 0 Link Here

(-)sysutils/xlogmaster/files/patch-src::output.cc (+11 lines)
	1	--- src/output.cc.orig Thu Apr 1 01:00:29 1999
	2	+++ src/output.cc Thu Feb 5 21:39:55 2004
	3	@@ -38,6 +38,8 @@
	4	#include "logclass.H"
	5	#include "output.H"
	6	#include "extern.H"
	7	+#include <iostream>
	8	+using namespace std;
	9
	10	/}}}/
	11




--- src/sysinc.H.orig	Thu Apr  1 01:00:29 1999
+++ src/sysinc.H	Thu Feb  5 22:12:43 2004
@@ -20,8 +20,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include <fstream.h>
-#include <strstream.h>
+#include <fstream>
+#include <strstream>
+using namespace std;
 #include <unistd.h>
 #include <string.h>
 #include <time.h>

Line 0 Link Here

(-)sysutils/xlogmaster/files/patch-src::watchdog.cc (+11 lines)
	1	--- src/watchdog.cc.orig Thu Apr 1 01:00:29 1999
	2	+++ src/watchdog.cc Thu Feb 5 21:39:55 2004
	3	@@ -38,6 +38,8 @@
	4	#include "logclass.H"
	5	#include "watchdog.H"
	6	#include "extern.H"
	7	+#include <iostream>
	8	+using namespace std;
	9
	10	/}}}/
	11




--- src/xlogmaster.cc.orig	Thu Apr  1 01:00:29 1999
+++ src/xlogmaster.cc	Thu Feb  5 22:09:28 2004
@@ -41,6 +41,8 @@
 
 #include "../graphics/logo.xpm"
 #include "../graphics/logo_small.xpm"
+#include <iostream>
+using namespace std;
 
 /*}}}*/
 
@@ -996,7 +998,7 @@
  int gtkrc = FALSE;
  terse = FALSE;
  
- x = getopt_long_only(argc, argv, "", options, &opt_index);
+ x = getopt_long(argc, argv, "", options, &opt_index);
  while ( x != -1 && x != '?' ){
    const gchar* opt = options[opt_index].name;
    
@@ -1183,7 +1185,7 @@
 	 }
      }
    
-   x = getopt_long_only(argc, argv, "", options, &opt_index);
+   x = getopt_long(argc, argv, "", options, &opt_index);
  };
  
  if ( optind < argc || x == '?' )

Lines 28-36 Link Here

(-)sysutils/xlogmaster/pkg-plist (-3 lines)
28	etc/xlogmaster/steelblue.gtkrc	28	etc/xlogmaster/steelblue.gtkrc
29	etc/xlogmaster/xlogmaster.gtkrc	29	etc/xlogmaster/xlogmaster.gtkrc
30	etc/xlogmaster/xlogmasterrc	30	etc/xlogmaster/xlogmasterrc
31	@unexec install-info --delete %D/info/xlogmaster.info %D/info/dir
32	info/xlogmaster.info
33	@exec install-info %D/info/xlogmaster.info %D/info/dir
34	@dirrm etc/xlogmaster/database	31	@dirrm etc/xlogmaster/database
35	@dirrm etc/xlogmaster/output-plugins	32	@dirrm etc/xlogmaster/output-plugins
36	@dirrm etc/xlogmaster/scripts	33	@dirrm etc/xlogmaster/scripts

Return to bug 62434

Lines 7-35 Link Here

(-)sysutils/xlogmaster/Makefile (-9 / +11 lines)
7		7
8	PORTNAME= xlogmaster	8	PORTNAME= xlogmaster
9	PORTVERSION= 1.6.0	9	PORTVERSION= 1.6.0
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= sysutils	11	CATEGORIES= sysutils
12	MASTER_SITES= ${MASTER_SITE_GNU}	12	MASTER_SITES= ${MASTER_SITE_GNU}
13	MASTER_SITE_SUBDIR= xlogmaster	13	MASTER_SITE_SUBDIR= ${PORTNAME}
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
16	COMMENT= Quick & easy monitoring of logfiles and devices	16	COMMENT= Quick & easy monitoring of logfiles and devices
17		17
18	USE_XLIB= yes
19	USE_GMAKE= yes
20	USE_GNOME= gtk12	18	USE_GNOME= gtk12
		19	USE_GETOPT_LONG= yes
		20	USE_GMAKE= yes
21	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
		22	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
22		23
23	MAN1= xlogmaster.1	24	MAN1= xlogmaster.1
		25	INFO= xlogmaster
24		26
25	.include <bsd.port.pre.mk>	27	CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
		28	LDFLAGS= -L${LOCALBASE}/lib
26		29
27	.if ${OSVERSION} >= 500113	30	post-extract:
28	BROKEN= "Does not compile (bad C++ code)"	31	-${RM} ${WRKSRC}/import/getopt*
29	.endif
30		32
31	post-install:	33	post-install:
32	@install-info ${PREFIX}/info/xlogmaster.info ${PREFIX}/info/dir	34	@install-info ${PREFIX}/info/xlogmaster.info ${PREFIX}/info/dir
33	${INSTALL_DATA} ${FILESDIR}/xlogmasterrc ${PREFIX}/etc/xlogmaster	35	${INSTALL_DATA} ${FILESDIR}/xlogmasterrc ${PREFIX}/etc/xlogmaster
34		36
35	.include <bsd.port.post.mk>	37	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)sysutils/xlogmaster/files/patch-af (-11 / +11 lines)
1	--- configure.orig Wed Mar 31 08:00:59 1999	1	--- configure.orig Thu Apr 1 01:00:59 1999
2	+++ configure Fri Feb 11 00:28:01 2000	2	+++ configure Thu Feb 5 22:01:46 2004
3	@@ -860,7 +860,7 @@	3	@@ -860,7 +860,7 @@
4		4
5		5
Lines 9-20 Link Here
9	if test x${CXXFLAGS+set} = xset ; then	9	if test x${CXXFLAGS+set} = xset ; then
10	:	10	:
11	else	11	else
12	@@ -2835,7 +2835,7 @@	12	@@ -1874,7 +1874,7 @@
13	s%@host_os@%$host_os%g	13	import_sources="$force_libimport"
14	s%@LN_S@%$LN_S%g	14	rx_sources="$force_libimport"
15	s%@GTK_CONFIG@%$GTK_CONFIG%g	15
16	-s%@GTK_CFLAGS@%$GTK_CFLAGS%g	16	-for ac_func in getopt_long_only
17	+s%@GTK_CFLAGS@%$CFLAGS $GTK_CFLAGS%g	17	+for ac_func in getopt_long
18	s%@GTK_LIBS@%$GTK_LIBS%g	18	do
19	s%@CPP@%$CPP%g	19	echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
20	s%@NEED_LIBIMPORT_TRUE@%$NEED_LIBIMPORT_TRUE%g	20	echo "configure:1881: checking for $ac_func" >&5

Line 0 Link Here

(-)sysutils/xlogmaster/files/patch-src::Makefile.in (+13 lines)
	1	--- src/Makefile.in.orig Thu Apr 1 01:01:02 1999
	2	+++ src/Makefile.in Thu Feb 5 22:17:35 2004
	3	@@ -80,8 +80,8 @@
	4	@DEVELMODE_TRUE@DEVELFLAGS = -g -Wall
	5
	6	CLEANFILES = ~ .deps/
	7	-CXXFLAGS = $(GTK_CFLAGS) -DXLM_HOME=\"$(XLM_HOME)\" -DXLM_DB=\"$(XLM_DB)\" -DXLM_USER_DB=\"$(XLM_USER_DB)\" -DXLM_LIB=\"$(XLM_LIB)\" -I../import $(DEVELFLAGS)
	8	-LDFLAGS = $(GTK_LIBS)
	9	+CXXFLAGS = @CXXFLAGS@ $(GTK_CFLAGS) -DXLM_HOME=\"$(XLM_HOME)\" -DXLM_DB=\"$(XLM_DB)\" -DXLM_USER_DB=\"$(XLM_USER_DB)\" -DXLM_LIB=\"$(XLM_LIB)\" -I../import $(DEVELFLAGS)
	10	+LDFLAGS = @LDFLAGS@ $(GTK_LIBS)
	11
	12	bin_PROGRAMS = xlogmaster
	13	xlogmaster_SOURCES = xlogmaster.cc alert.cc audio.cc database.cc dialog.cc execute.cc file.cc logclass.cc menu.cc customize.cc watchdog.cc output.cc

Line 0 Link Here

(-)sysutils/xlogmaster/files/patch-src::logclass.H (+20 lines)
	1	--- src/logclass.H.orig Thu Apr 1 01:00:29 1999
	2	+++ src/logclass.H Thu Feb 5 21:39:55 2004
	3	@@ -28,7 +28,7 @@
	4
	5	class Log {
	6	/{{{ Functions /
	7	- friend Filter;
	8	+ friend class Filter;
	9	public:
	10	Log();
	11	~Log();
	12	@@ -200,7 +200,7 @@
	13	class Filter
	14	{
	15	/{{{ Functions /
	16	- friend Log;
	17	+ friend class Log;
	18	public:
	19	Filter();
	20	~Filter();

Line 0 Link Here

(-)sysutils/xlogmaster/files/patch-src::sysinc.H (+14 lines)
	1	--- src/sysinc.H.orig Thu Apr 1 01:00:29 1999
	2	+++ src/sysinc.H Thu Feb 5 22:12:43 2004
	3	@@ -20,8 +20,9 @@
	4	#include <stdio.h>
	5	#include <stdlib.h>
	6	#include <fcntl.h>
	7	-#include <fstream.h>
	8	-#include <strstream.h>
	9	+#include <fstream>
	10	+#include <strstream>
	11	+using namespace std;
	12	#include <unistd.h>
	13	#include <string.h>
	14	#include <time.h>

Line 0 Link Here

(-)sysutils/xlogmaster/files/patch-src::xlogmaster.cc (+29 lines)
	1	--- src/xlogmaster.cc.orig Thu Apr 1 01:00:29 1999
	2	+++ src/xlogmaster.cc Thu Feb 5 22:09:28 2004
	3	@@ -41,6 +41,8 @@
	4
	5	#include "../graphics/logo.xpm"
	6	#include "../graphics/logo_small.xpm"
	7	+#include <iostream>
	8	+using namespace std;
	9
	10	/}}}/
	11
	12	@@ -996,7 +998,7 @@
	13	int gtkrc = FALSE;
	14	terse = FALSE;
	15
	16	- x = getopt_long_only(argc, argv, "", options, &opt_index);
	17	+ x = getopt_long(argc, argv, "", options, &opt_index);
	18	while ( x != -1 && x != '?' ){
	19	const gchar* opt = options[opt_index].name;
	20
	21	@@ -1183,7 +1185,7 @@
	22	}
	23	}
	24
	25	- x = getopt_long_only(argc, argv, "", options, &opt_index);
	26	+ x = getopt_long(argc, argv, "", options, &opt_index);
	27	};
	28
	29	if ( optind < argc \|\| x == '?' )