Move libs to alat dir like msyslog/audit defaults to.

Fix MANDIR, add two lost manpages.
Port is prefix-clean.

4 files changed, 29 insertions, 30 deletions

diff --git a/sysutils/msyslog/Makefile b/sysutils/msyslog/Makefile
index afd12aaedc5f..ee973d705098 100644
--- a/sysutils/msyslog/Makefile
+++ b/sysutils/msyslog/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--without-pgsql
 
 MAN5=	syslog.conf.5
 MAN8=	im_bsd.8 im_tcp.8 im_udp.8 im_unix.8 om_classic.8 om_tcp.8 om_peo.8 \
-	om_regex.8 peochk.8 syslogd.8
+	om_regex.8 peochk.8 syslogd.8 om_udp.8 im_file.8
 .if defined(WITH_MYSQL)
 MAN8+=	om_mysql.8
 .endif
@@ -45,8 +45,9 @@ MAN8+=	om_pgsql.8
 .endif
 MANCOMPRESSED=	yes
 INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/lib/alat
 
-DOCS=	AUTHORS src/TODO README NEWS doc/HOW_TO_WRITE_A_MODULE \
+DOCS=	AUTHORS COPYING src/TODO README NEWS doc/HOW_TO_WRITE_A_MODULE \
 	doc/HOW-TO-UPGRADE
 FIXPREFIX=	README src/man/om_peo.8 src/man/syslog.conf.5 \
 		src/man/syslogd.8 src/TODO src/syslogd.h
diff --git a/sysutils/msyslog/files/patch-configure.in b/sysutils/msyslog/files/patch-configure.in
index 1e87ad52261e..18cda749877d 100644
--- a/sysutils/msyslog/files/patch-configure.in
+++ b/sysutils/msyslog/files/patch-configure.in
@@ -1,5 +1,5 @@
 --- configure.in.orig	Wed Nov 21 07:49:36 2001
-+++ configure.in	Sat Mar 23 18:20:54 2002
++++ configure.in	Sun Mar 24 18:30:28 2002
 @@ -33,7 +33,7 @@
  AC_STRUCT_TM
  
@@ -18,16 +18,23 @@
  AC_DEFINE_UNQUOTED(MLIBNAME_STR, "$MLIBNAME")
  
  MANPAGES="syslog.conf.5 syslogd.8"
-@@ -74,7 +74,7 @@
- then
- 	prefix=$ac_default_prefix
- fi
--AC_DEFINE_UNQUOTED(INSTALL_LIBDIR, "$prefix/lib/alat")
-+AC_DEFINE_UNQUOTED(INSTALL_LIBDIR, "$prefix/lib")
+@@ -93,14 +93,7 @@
+ AC_MSG_RESULT(root-mode pid file will go in $dir)
+ AC_DEFINE_UNQUOTED(PID_DIR, "$dir")
  
- AC_MSG_CHECKING(wheter optreset is needed)
- AC_TRY_LINK([#include <unistd.h>],
-@@ -150,6 +150,12 @@
+-dnl search mandir for non bsd systems
+-for MANDIR in "/usr/share/man" "/usr/man"
+-do
+-	if test -d $MANDIR ; then
+-		mandir=$MANDIR;
+-		break;
+-	fi
+-done
++AC_DEFINE_UNQUOTED(MANDIR, "$prefix/man")
+ 
+ dnl Check underscore requirement for dlsym()
+ 
+@@ -150,6 +143,12 @@
  	AC_DEFINE_UNQUOTED(SYMBOL_PREFIX, "_")
  	SHARED_PARAMS="-Bshareable"
  	DCCFLAGS="-fPIC"
diff --git a/sysutils/msyslog/files/patch-modules-Makefile.in b/sysutils/msyslog/files/patch-modules-Makefile.in
deleted file mode 100644
index 54a14ccd5cd9..000000000000
--- a/sysutils/msyslog/files/patch-modules-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/Makefile.in.orig	Mon May 14 00:23:33 2001
-+++ src/modules/Makefile.in	Mon May 14 00:23:40 2001
-@@ -35,7 +35,7 @@
- CPPFLAGS=	-I.. @CPPFLAGS@
- 
- INSTALL=	@INSTALL@
--INSTALL_LIBDIR=	@prefix@/lib/alat
-+INSTALL_LIBDIR=	@prefix@/lib
- 
- MLIBNAME=	@MLIBNAME@
- MSRCS=		@MSRCS@
diff --git a/sysutils/msyslog/pkg-plist b/sysutils/msyslog/pkg-plist
index 494cbcf80d86..10d198b39017 100644
--- a/sysutils/msyslog/pkg-plist
+++ b/sysutils/msyslog/pkg-plist
@@ -1,13 +1,7 @@
 etc/rc.d/msyslog.sh.sample
-lib/libmsyslog.so.4
+lib/alat/libmsyslog.so.1
 sbin/peochk
 sbin/syslogd
-%%PORTDOCS%%share/doc/msyslog/AUTHORS
-%%PORTDOCS%%share/doc/msyslog/HOW-TO-UPGRADE
-%%PORTDOCS%%share/doc/msyslog/HOW_TO_WRITE_A_MODULE
-%%PORTDOCS%%share/doc/msyslog/NEWS
-%%PORTDOCS%%share/doc/msyslog/README
-%%PORTDOCS%%share/doc/msyslog/TODO
 share/examples/msyslog/im_mymodule.c
 share/examples/msyslog/om_mymodule.c
 share/examples/msyslog/syslog.conf.classic
@@ -16,4 +10,12 @@ share/examples/msyslog/syslog.conf.peo
 share/examples/msyslog/syslog.conf.pgsql
 share/examples/msyslog/syslog.conf.regex
 @dirrm share/examples/msyslog
+%%PORTDOCS%%share/doc/msyslog/AUTHORS
+%%PORTDOCS%%share/doc/msyslog/COPYING
+%%PORTDOCS%%share/doc/msyslog/HOW-TO-UPGRADE
+%%PORTDOCS%%share/doc/msyslog/HOW_TO_WRITE_A_MODULE
+%%PORTDOCS%%share/doc/msyslog/NEWS
+%%PORTDOCS%%share/doc/msyslog/README
+%%PORTDOCS%%share/doc/msyslog/TODO
 %%PORTDOCS%%@dirrm share/doc/msyslog
+@unexec rmdir %D/lib/alat 2>/dev/null || true