5 files changed, 55 insertions, 14 deletions

diff --git a/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile
index 2fd81a7edc64..81cb69cd80ef 100644
--- a/sysutils/xlogmaster/Makefile
+++ b/sysutils/xlogmaster/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xlogmaster
-# Version required:	1.4.4
+# Version required:	1.6.0
 # Date created:		1 August 1998
 # Whom:			Adrian Wontroba <aw1@stade.co.uk>
 #
-# $Id: Makefile,v 1.8 1998/09/22 22:55:55 asami Exp $
+# $Id: Makefile,v 1.9 1999/01/27 07:41:28 fenner Exp $
 #
 
-DISTNAME=	xlogmaster-1.4.4
+DISTNAME=	xlogmaster-1.6.0
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://sunsite.doc.ic.ac.uk/packages/gnu/\
 		${MASTER_SITE_GNU}\
@@ -16,23 +16,21 @@ MASTER_SITE_SUBDIR=	xlogmaster
 
 MAINTAINER=	aw1@stade.co.uk
 
-LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
 
+NO_PACKAGE=	ignores CFLAGS
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}" GTK_CONFIG="${PREFIX}/bin/gtk11-config"
-USE_X_PREFIX=	yes
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}" GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+USE_XLIB=	yes
 USE_GMAKE=	yes
 
 MAN1=		xlogmaster.1
 
-post-patch:
-	cd ${WRKSRC}/doc && ln -s tutorial.texinfo xlogmaster.texinfo
-
 post-install:
 	@if [ ! -f ${PREFIX}/info/dir ]; then \
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	 fi
 	@install-info ${PREFIX}/info/xlogmaster.info ${PREFIX}/info/dir
-	@install-info ${PREFIX}/info/xlogmaster_faq.info ${PREFIX}/info/dir
+	${INSTALL_DATA} ${FILESDIR}/xlogmasterrc ${PREFIX}/etc/xlogmaster
 
 .include <bsd.port.mk>
diff --git a/sysutils/xlogmaster/distinfo b/sysutils/xlogmaster/distinfo
index 8d59bc7299db..65214ef0ef1a 100644
--- a/sysutils/xlogmaster/distinfo
+++ b/sysutils/xlogmaster/distinfo
@@ -1 +1 @@
-MD5 (xlogmaster-1.4.4.tar.gz) = 3e1f062a4ed7fcdd1988aa997d819a57
+MD5 (xlogmaster-1.6.0.tar.gz) = b1900ebae821656fb6b7f028fab8bf10
diff --git a/sysutils/xlogmaster/files/patch-ae b/sysutils/xlogmaster/files/patch-ae
new file mode 100644
index 000000000000..201542b74880
--- /dev/null
+++ b/sysutils/xlogmaster/files/patch-ae
@@ -0,0 +1,16 @@
+--- ../../original/doc/Makefile.in	Wed Mar 31 17:01:03 1999
++++ doc/Makefile.in	Fri Apr  2 06:56:30 1999
+@@ -173,13 +173,6 @@
+ 	  done; \
+ 	done
+ 	@$(POST_INSTALL)
+-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+-	  list='$(INFO_DEPS)'; \
+-	  for file in $$list; do \
+-	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
+-	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
+-	  done; \
+-	else : ; fi
+ 
+ uninstall-info:
+ 	$(PRE_UNINSTALL)
diff --git a/sysutils/xlogmaster/files/xlogmasterrc b/sysutils/xlogmaster/files/xlogmasterrc
new file mode 100644
index 000000000000..3fee25d4c43b
--- /dev/null
+++ b/sysutils/xlogmaster/files/xlogmasterrc
@@ -0,0 +1,14 @@
+TAIL{/var/log/messages,3,System Messages,Display /var/log/messages file...}
+RAISE{link(up)|(down)}
+TAIL{/home/aw1/Mail/Log,3,procmail log,mprocmail log}
+RUN{/bin/df -k,3/10000,df,disk space}
+TAIL{/var/log/maillog,3,Mail messages,View mail messages}
+RAISE{logfile turned}
+TAIL{/var/run/dmesg.boot,3,Bootup Messages,Display /var/run/dmesg.boot file...}
+TAIL{/var/log/samba.log,3,samba log,View /var/log/samba.log}
+TAIL{/var/log/ppp.log,3,PPP log,View /var/log/ppp.log}
+TAIL{/var/log/xferlog,3,FTP transfers,View /var/log/xferlog}
+TAIL{/var/log/httpd-error.log,3,WWW errors,View /var/log/httpd-error.log}
+TAIL{/var/log/httpd-access.log,3,WWW access,View /var/log/httpd-access.log}
+TAIL{/var/log/news/news.notice,3,news notices,/var/log/news/news.notice}
+CAT{/dev/sndstat,10000,Audio driver,Audio driver status}
diff --git a/sysutils/xlogmaster/pkg-plist b/sysutils/xlogmaster/pkg-plist
index 531d40546e06..95250b7501bf 100644
--- a/sysutils/xlogmaster/pkg-plist
+++ b/sysutils/xlogmaster/pkg-plist
@@ -1,9 +1,22 @@
 bin/xlogmaster
+etc/xlogmaster/database/cat.xlmgrp
+etc/xlogmaster/database/df.xlmrc
+etc/xlogmaster/database/mailq.xlmrc
+etc/xlogmaster/database/mem.xlmrc
+etc/xlogmaster/database/prg.xlmgrp
+etc/xlogmaster/database/pstree.xlmrc
+etc/xlogmaster/database/rtc.xlmrc
+etc/xlogmaster/database/syslog.xlmrc
+etc/xlogmaster/database/tail.xlmgrp
+etc/xlogmaster/database/w.xlmrc
+etc/xlogmaster/database/warn.xlmrc
 etc/xlogmaster/green.gtkrc
 etc/xlogmaster/hell.gtkrc
+etc/xlogmaster/output-plugins/dipshit
 etc/xlogmaster/scripts/README.usage
 etc/xlogmaster/scripts/xlm-halt
 etc/xlogmaster/scripts/xlm-mail
+etc/xlogmaster/scripts/xlm-mgetty-login-mail
 etc/xlogmaster/scripts/xlm-write
 etc/xlogmaster/simpsons.gtkrc
 etc/xlogmaster/sound/alert
@@ -14,13 +27,13 @@ etc/xlogmaster/sound/notice
 etc/xlogmaster/sound/uniconify
 etc/xlogmaster/steelblue.gtkrc
 etc/xlogmaster/xlogmaster.gtkrc
+etc/xlogmaster/xlogmasterrc
 @unexec install-info --delete %D/info/xlogmaster.info %D/info/dir
-@unexec install-info --delete %D/info/xlogmaster_faq.info %D/info/dir
 info/xlogmaster.info
-info/xlogmaster_faq.info
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/xlogmaster.info %D/info/dir
-@exec install-info %D/info/xlogmaster_faq.info %D/info/dir
+@dirrm etc/xlogmaster/database
+@dirrm etc/xlogmaster/output-plugins
 @dirrm etc/xlogmaster/scripts
 @dirrm etc/xlogmaster/sound
 @dirrm etc/xlogmaster