7 files changed, 18 insertions, 111 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 6043a456b1a..c79d1af2eb6 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.11 1996/10/31 07:25:15 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.12 1996/11/01 01:46:00 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -64,11 +64,11 @@ LDADD+= -lln
 endif
 
 ifeq ($(PORTNAME), bsdi)
-LDADD+= -ldld -lipc
-endif
-
-ifeq ($(PORTNAME), bsdi_2_1)
-LDADD+= -ldl -lipc
+  ifeq ($(PRE_BSDI_2_1), N)
+    LDADD+= -ldl -lipc
+  else
+    LDADD+= -ldld -lipc
+  endif
 endif
 
 ifeq ($(PORTNAME), hpux)
diff --git a/src/backend/port/bsdi/Makefile b/src/backend/port/bsdi/Makefile
index 4e79822f7dd..093a9a2614b 100644
--- a/src/backend/port/bsdi/Makefile
+++ b/src/backend/port/bsdi/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for port/bsdi
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.1 1996/10/27 09:49:44 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.2 1996/11/01 01:46:21 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,7 +17,7 @@ INCLUDE_OPT = -I../.. \
 
 CFLAGS+=$(INCLUDE_OPT)
 
-OBJS = dynloader.o
+OBJS = dynloader.o port.o
 
 all: SUBSYS.o
 
diff --git a/src/backend/port/bsdi/port-protos.h b/src/backend/port/bsdi/port-protos.h
index 6583571d356..072ad8ddf61 100644
--- a/src/backend/port/bsdi/port-protos.h
+++ b/src/backend/port/bsdi/port-protos.h
@@ -18,14 +18,17 @@
 
 /* dynloader.c */
 
-#ifndef LINUX_ELF
-#define pg_dlsym(handle, funcname)	((func_ptr) dld_get_func((funcname)))
-#define pg_dlclose(handle)		({ dld_unlink_by_file(handle, 1); free(handle); })
+#include <sys/param.h>
+
+#if _BSDI_VERSION >= 199510
+#  include <dlfcn.h>
+#  define	pg_dlopen(f)	dlopen(f, 1)
+#  define	pg_dlsym	dlsym
+#  define	pg_dlclose	dlclose
+#  define	pg_dlerror	dlerror
 #else
-#define	pg_dlopen(f)	dlopen(f, 1)
-#define	pg_dlsym	dlsym
-#define	pg_dlclose	dlclose
-#define	pg_dlerror	dlerror
+#  define pg_dlsym(handle, funcname)	((func_ptr) dld_get_func((funcname)))
+#  define pg_dlclose(handle)		({ dld_unlink_by_file(handle, 1); free(handle); })
 #endif
 
 /* port.c */
diff --git a/src/backend/port/bsdi_2_1/Makefile b/src/backend/port/bsdi_2_1/Makefile
deleted file mode 100644
index b5bb21445c1..00000000000
--- a/src/backend/port/bsdi_2_1/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile--
-#    Makefile for port/bsdi_2_1
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/bsdi_2_1/Attic/Makefile,v 1.1 1996/10/27 09:49:50 bryanh Exp $
-#
-#-------------------------------------------------------------------------
-
-SRCDIR = ../../..
-include ../../../Makefile.global
-
-INCLUDE_OPT = -I../.. \
-              -I../../include \
-              -I../../../include
-
-CFLAGS+=$(INCLUDE_OPT)
-
-OBJS = port.o
-
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-	$(LD) -r -o SUBSYS.o $(OBJS)
-
-depend dep:
-	$(CC) -MM $(INCLUDE_OPT) *.c >depend
-
-clean: 
-	rm -f SUBSYS.o $(OBJS)
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
-
diff --git a/src/backend/port/bsdi_2_1/machine.h b/src/backend/port/bsdi_2_1/machine.h
deleted file mode 100644
index d53defbfd4c..00000000000
--- a/src/backend/port/bsdi_2_1/machine.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * machine.h--
- *    
- *
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- * machine.h,v 1.1.1.1 1994/11/07 05:19:37 andrew Exp
- *
- *-------------------------------------------------------------------------
- */
-#ifndef MACHINE_H
-#define MACHINE_H
-
-#define BLCKSZ	8192
-
-#endif
diff --git a/src/backend/port/bsdi_2_1/port-protos.h b/src/backend/port/bsdi_2_1/port-protos.h
deleted file mode 100644
index 5aab562a4b7..00000000000
--- a/src/backend/port/bsdi_2_1/port-protos.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * port-protos.h--
- *    port-specific prototypes for SunOS 4
- *
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- * port-protos.h,v 1.2 1995/05/25 22:51:03 andrew Exp
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PORT_PROTOS_H
-#define PORT_PROTOS_H
-
-#include <dlfcn.h>
-#include "fmgr.h"			/* for func_ptr */
-#include "utils/dynamic_loader.h"
-
-/* dynloader.c */
-
-#define	pg_dlopen(f)	dlopen(f, 1)
-#define	pg_dlsym	dlsym
-#define	pg_dlclose	dlclose
-#define	pg_dlerror	dlerror
-
-/* port.c */
-
-#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/bsdi_2_1/port.c b/src/backend/port/bsdi_2_1/port.c
deleted file mode 100644
index 8819b1a6481..00000000000
--- a/src/backend/port/bsdi_2_1/port.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * port.c--
- *    Linux-specific routines
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- *
- * IDENTIFICATION
- *    /usr/local/devel/pglite/cvs/src/backend/port/linux/port.c,v 1.1.1.1 1994/11/07 05:19:38 andrew Exp
- *
- *-------------------------------------------------------------------------
- */