Reorganize .o installed

Build shared modules properly
Use separate dir for socket/pid

8 files changed, 47 insertions, 21 deletions

diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile
index 63bc7d85a2b9..31d9a7b9ff1a 100644
--- a/databases/msql3/Makefile
+++ b/databases/msql3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	msql
 PORTVERSION=    2.0.11
-PORTREVISION=   1
+PORTREVISION=   2
 CATEGORIES=	databases
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/msql3/files/patch-ad b/databases/msql3/files/patch-ad
index a5ca8a60afce..8b351b155e56 100644
--- a/databases/msql3/files/patch-ad
+++ b/databases/msql3/files/patch-ad
@@ -1,6 +1,6 @@
 --- scripts/make-install.orig	Thu Aug 19 07:33:07 1999
-+++ scripts/make-install	Sat Jan 27 10:52:17 2001
-@@ -1,16 +1,15 @@
++++ scripts/make-install	Sun Jan 28 10:51:13 2001
+@@ -1,16 +1,17 @@
  #!/bin/sh
  
 -INST_DIR=$1
@@ -18,12 +18,14 @@
 -scripts/mkinstalldirs 0755    $INST_DIR/makegen
 -scripts/mkinstalldirs 0755    $INST_DIR/modules
 +scripts/mkinstalldirs 0755    $INST_DIR/etc/msql2
++scripts/mkinstalldirs 0700    /var/spool/msql
 +scripts/mkinstalldirs 0700    /var/db/msqldb
 +scripts/mkinstalldirs 0700    /var/db/msqldb/.tmp
 +scripts/mkinstalldirs 0755    $INST_DIR/share/doc/msql
 +scripts/mkinstalldirs 0755    $INST_DIR/share/msql/misc
 +scripts/mkinstalldirs 0755    $INST_DIR/share/msql/www
 +scripts/mkinstalldirs 0755    $INST_DIR/share/msql/makegen
-+/usr/sbin/chown -R msql.msql /var/db/msqldb
++/usr/sbin/chown -R msql.msql /var/db/msqldb /var/spool/msql
++scripts/mkinstalldirs 0755    $INST_DIR/lib/msql
 +scripts/mkinstalldirs 0755    $INST_DIR/libexec/msql
  
diff --git a/databases/msql3/files/patch-aj b/databases/msql3/files/patch-aj
index dbde5e233f4f..b8fa906c7d1a 100644
--- a/databases/msql3/files/patch-aj
+++ b/databases/msql3/files/patch-aj
@@ -1,5 +1,5 @@
 --- misc/msql.conf.orig	Thu Aug 19 07:33:07 1999
-+++ misc/msql.conf	Sat Jan 27 07:56:32 2001
++++ misc/msql.conf	Sun Jan 28 10:58:01 2001
 @@ -18,12 +18,12 @@
  [general]
  
@@ -9,10 +9,19 @@
  mSQL_User = msql
  Admin_User = root
 -Pid_File = %I/msql2d.pid
-+Pid_File = %I/etc/msql2/msql2d.pid
++Pid_File = /var/spool/msql/msql2d.pid
  TCP_Port = 1114
 -UNIX_Port = %I/msql2.sock
-+UNIX_Port = %I/etc/msql2/msql2.sock
++UNIX_Port = /var/spool/msql/msql2.sock
  
  [system]
  
+@@ -33,7 +33,7 @@
+ Remote_Access = False
+ Local_Access = True
+ #Query_Log = False
+-#Query_Log_File = %I/query.log
++#Query_Log_File = /var/spool/msql/query.log
+ 
+ [w3-msql]
+ 
diff --git a/databases/msql3/files/patch-as b/databases/msql3/files/patch-as
index cfb42bc4b79d..0cb02b0b5910 100644
--- a/databases/msql3/files/patch-as
+++ b/databases/msql3/files/patch-as
@@ -1,20 +1,25 @@
 --- src/lite/Makefile.tmpl.orig	Thu Aug 19 07:33:12 1999
-+++ src/lite/Makefile.tmpl	Sat Jan 27 23:52:24 2001
-@@ -14,7 +14,7 @@
++++ src/lite/Makefile.tmpl	Sun Jan 28 10:44:59 2001
+@@ -13,8 +13,9 @@
+ !object mod_lite.o mod_lite.c
  !object modules.o modules.c
  
++!slibrary_unix 0 mod_lite.so mod_lite.c
  
 -!program lite mod_lite.o,../lang-common/mod_std.o,../lang-common/mod_msql.o,lite.o,lite_lex.o,modules.o,../msql/libmsql.a,../regexp/libregexp.a,../lang-common/liblite.a
 +!program lite mod_lite.o,../lang-common/mod_std.o,../lang-common/mod_msql.o,lite.o,lite_lex.o,modules.o -L../msql,-lmsql,-L../lang-common,-llite,-lcompat
  
  #
  # Debugging compilations
-@@ -33,7 +33,7 @@
+@@ -32,8 +33,9 @@
+ 
  
  !install lite $(INST_DIR)/bin/lite 0755
- !install lite_lex.o $(INST_DIR)/lib/lite_lex.o 0755
+-!install lite_lex.o $(INST_DIR)/lib/lite_lex.o 0755
 -!install mod_lite.o $(INST_DIR)/lib/mod_lite.o 0755
-+!install mod_lite.o $(INST_DIR)/libexec/msql/mod_lite.so 0755
++!install lite_lex.o $(INST_DIR)/lib/msql/lite_lex.o 0755
++!install mod_lite.o $(INST_DIR)/lib/msql/mod_lite.o 0755
++!install mod_lite.so $(INST_DIR)/libexec/msql/mod_lite.so 0755
  
  mod_lite.o: ../lang-common/lite.h 
  mod_lite.o: ../common/portability.h
diff --git a/databases/msql3/files/patch-ax b/databases/msql3/files/patch-ax
index 9efdeb865cbe..cf4c890be3dc 100644
--- a/databases/msql3/files/patch-ax
+++ b/databases/msql3/files/patch-ax
@@ -1,18 +1,23 @@
 --- src/lang-common/Makefile.tmpl.orig	Thu Aug 19 07:33:10 1999
-+++ src/lang-common/Makefile.tmpl	Sun Jan 28 00:17:00 2001
-@@ -19,11 +19,13 @@
++++ src/lang-common/Makefile.tmpl	Sun Jan 28 10:41:37 2001
+@@ -19,11 +19,18 @@
  !object mod_msql.o mod_msql.c
  
  !library_unix liblite.a symtab.c,types.c,code-gen.c,code-sim.c,extern.c,fcrypt.c,lib.c parser.o
 +!slibrary_unix 1 liblite.so symtab.c,types.c,code-gen.c,code-sim.c,extern.c,fcrypt.c,lib.c parser.o
  !dll_os2 lite symtab.c,types.c,code-sim.c,extern.c,fcrypt.c,lib.c,code-gen.c,parser.c ../regexp/libregexp.a
  
++!slibrary_unix 0 mod_std.so mod_std.c
++!slibrary_unix 0 mod_msql.so mod_msql.c
++
  !libinstall liblite.a $(INST_DIR)/lib/liblite.a 744 $(ROOT)
 -!install mod_std.o $(INST_DIR)/lib/mod_std.o 744 $(ROOT)
 -!install mod_msql.o $(INST_DIR)/lib/mod_msql.o 744 $(ROOT)
 +!slibinstall 1 liblite.so $(INST_DIR)/lib 744 $(ROOT)
-+!install mod_std.o $(INST_DIR)/libexec/msql/mod_std.so 744 $(ROOT)
-+!install mod_msql.o $(INST_DIR)/libexec/msql/mod_msql.so 744 $(ROOT)
++!install mod_std.o $(INST_DIR)/lib/msql/mod_std.o 744 $(ROOT)
++!install mod_msql.o $(INST_DIR)/lib/msql/mod_msql.o 744 $(ROOT)
++!install mod_std.so $(INST_DIR)/libexec/msql/mod_std.so 744 $(ROOT)
++!install mod_msql.so $(INST_DIR)/libexec/msql/mod_msql.so 744 $(ROOT)
  !install mod_std.h $(INST_DIR)/include/mod_std.h 744 $(ROOT)
  !install mod_msql.h $(INST_DIR)/include/mod_msql.h 744 $(ROOT)
  !install lite.h $(INST_DIR)/include/lite.h 744 $(ROOT)
diff --git a/databases/msql3/files/post-install-notes b/databases/msql3/files/post-install-notes
index 71ae6e0c0e3a..a6f896f7838c 100644
--- a/databases/msql3/files/post-install-notes
+++ b/databases/msql3/files/post-install-notes
@@ -39,8 +39,8 @@ Documentation states:			Port uses:
 =====================			==========================
 /usr/local/Hughes			/usr/local
 /usr/local/Hughes/msqldb		/var/db/msqldb
-/usr/local/Hughes/msql2.sock		/usr/local/etc/msql2/msql2.sock
-/usr/local/Hughes/msql2.pid		/usr/local/etc/msql2/msql2.pid
+/usr/local/Hughes/msql2.sock            /var/spool/msql/msql2.sock
+/usr/local/Hughes/msql2.pid             /var/spool/msql/msql2.pid
 /usr/local/Hughes/msql.conf		/usr/local/etc/msql2/msql.conf
 /usr/local/Hughes/msql.acl		/usr/local/etc/msql2/msql.acl
 
diff --git a/databases/msql3/pkg-descr b/databases/msql3/pkg-descr
index bd5dd7ef045a..5781136dfa3b 100644
--- a/databases/msql3/pkg-descr
+++ b/databases/msql3/pkg-descr
@@ -35,8 +35,8 @@ Documentation states:			Port uses:
 =====================			==========================
 /usr/local/Hughes			/usr/local
 /usr/local/Hughes/msqldb		/var/db/msqldb
-/usr/local/Hughes/msql2.sock		/usr/local/etc/msql2/msql2.sock
-/usr/local/Hughes/msql2.pid		/usr/local/etc/msql2/msql2.pid
+/usr/local/Hughes/msql2.sock            /var/spool/msql/msql2.sock
+/usr/local/Hughes/msql2.pid             /var/spool/msql/msql2.pid
 /usr/local/Hughes/msql.conf		/usr/local/etc/msql2/msql.conf
 /usr/local/Hughes/msql.acl		/usr/local/etc/msql2/msql.acl
 
diff --git a/databases/msql3/pkg-plist b/databases/msql3/pkg-plist
index a520c024efa2..14a2aa9cb962 100644
--- a/databases/msql3/pkg-plist
+++ b/databases/msql3/pkg-plist
@@ -25,7 +25,10 @@ lib/libmsql.a
 lib/libmsql.so.1
 @exec ln -sf %f %B/libmsql.so
 @unexec rm -f %B/libmsql.so
-lib/lite_lex.o
+lib/msql/lite_lex.o
+lib/msql/mod_lite.o
+lib/msql/mod_msql.o
+lib/msql/mod_std.o
 libexec/msql/mod_lite.so
 libexec/msql/mod_msql.so
 libexec/msql/mod_std.so
@@ -101,6 +104,8 @@ share/msql/www/graphics/user.gif
 share/msql/www/graphics/view.gif
 @dirrm etc/msql2
 @dirrm include/common
+@dirrm lib/msql
+@dirrm libexec/msql
 @dirrm share/doc/msql/manual-html
 @dirrm share/doc/msql
 @dirrm share/msql/makegen