5 files changed, 9 insertions, 63 deletions
diff --git a/databases/postgresql93/Makefile b/databases/postgresql93/Makefile
index cc68bd82857..c0abe7a6459 100644
--- a/databases/postgresql93/Makefile
+++ b/databases/postgresql93/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2014/02/12 23:17:44 tron Exp $
+# $NetBSD: Makefile,v 1.3 2014/02/23 11:25:54 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/93-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql93-client>=${PKGVERSION_NOREV}:../../databases/postgresql93-client
diff --git a/databases/postgresql93/Makefile.common b/databases/postgresql93/Makefile.common
index 2b030ffcf82..7a722a84488 100644
--- a/databases/postgresql93/Makefile.common
+++ b/databases/postgresql93/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2013/12/10 22:32:57 adam Exp $
+# $NetBSD: Makefile.common,v 1.5 2014/02/23 11:25:54 adam Exp $
 #
 # used by databases/postgresql93-adminpack/Makefile
 # used by databases/postgresql93-client/Makefile
@@ -21,7 +21,7 @@
 #	<lang>-postgresql	client-side interface to PostgreSQL
 #	postgresql-<lang>	server-side module for PostgreSQL backend
 
-DISTNAME=	postgresql-9.3.2
+DISTNAME=	postgresql-9.3.3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql93/distinfo b/databases/postgresql93/distinfo
index f80857c6de4..5df28d7363c 100644
--- a/databases/postgresql93/distinfo
+++ b/databases/postgresql93/distinfo
@@ -1,18 +1,17 @@
-$NetBSD: distinfo,v 1.5 2013/12/10 22:32:57 adam Exp $
+$NetBSD: distinfo,v 1.6 2014/02/23 11:25:54 adam Exp $
 
-SHA1 (postgresql-9.3.2.tar.bz2) = e1438f6cc8d387703dd1cca201316603266bd83a
-RMD160 (postgresql-9.3.2.tar.bz2) = 60373d8da2f138e713943ddb103b0ebf12379739
-Size (postgresql-9.3.2.tar.bz2) = 16878364 bytes
+SHA1 (postgresql-9.3.3.tar.bz2) = 66d07c89f6a00468d27d3bafb7fc0eb040355a99
+RMD160 (postgresql-9.3.3.tar.bz2) = d97011af9c9583d2fca7613aeedaba765f071518
+Size (postgresql-9.3.3.tar.bz2) = 16665845 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 3de7635fe18532a05a619941fecad7bcda6c51b9
 SHA1 (patch-contrib_dblink_Makefile) = 11620938ce93109311df90df675b1ad6f0c15212
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
 SHA1 (patch-src_Makefile.global.in) = 53e29e000d7fb71e2625aacd32324e9d7001b5b2
-SHA1 (patch-src_Makefile.shlib) = 6e6ec0ce0d61d047b1ecfcf21929ac96cfe8b064
+SHA1 (patch-src_Makefile.shlib) = 69f980184fd8dbd821221a1c6ac3a88408f2c4cf
 SHA1 (patch-src_backend_Makefile) = deba6bc07ba2e4b8ef8f04f20efb2bdd54cb917e
 SHA1 (patch-src_interfaces_libpq_Makefile) = 0066301bc8b31b9e26c79153427537bc3865ef4d
-SHA1 (patch-src_makefiles_Makefile.cygwin) = df75c763a4e478b10d9faa6cbf271e37059701a9
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
 SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
diff --git a/databases/postgresql93/patches/patch-src_Makefile.shlib b/databases/postgresql93/patches/patch-src_Makefile.shlib
index a7b5982acb1..0f97c529308 100644
--- a/databases/postgresql93/patches/patch-src_Makefile.shlib
+++ b/databases/postgresql93/patches/patch-src_Makefile.shlib
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Makefile.shlib,v 1.2 2013/10/04 18:23:40 joerg Exp $
+$NetBSD: patch-src_Makefile.shlib,v 1.3 2014/02/23 11:25:54 adam Exp $
 
 --- src/Makefile.shlib.orig	2013-09-02 20:53:17.000000000 +0000
 +++ src/Makefile.shlib
@@ -38,38 +38,6 @@ $NetBSD: patch-src_Makefile.shlib,v 1.2 2013/10/04 18:23:40 joerg Exp $
  ifeq ($(PORTNAME), hpux)
    ifdef SO_MAJOR_VERSION
      shlib			= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
-@@ -281,8 +286,9 @@ ifeq ($(PORTNAME), unixware)
- endif
- 
- ifeq ($(PORTNAME), cygwin)
-+  LINK.shared		= $(CC) -shared
-   ifdef SO_MAJOR_VERSION
--    shlib		= cyg$(NAME)$(DLSUFFIX)
-+    shlib		= cyg$(NAME)-$(SO_MAJOR_VERSION)$(DLSUFFIX)
-   endif
-   haslibarule   = yes
- endif
-@@ -371,6 +377,12 @@ else # PORTNAME == cygwin || PORTNAME ==
- 
- # If SHLIB_EXPORTS is set, the rules below will build a .def file from
- # that.  Else we build a temporary one here.
-+ifeq ($(PORTNAME), cygwin)
-+$(shlib) $(stlib): $(OBJS) | $(SHLIB_PREREQS)
-+	$(CC) $(CFLAGS)  -shared -o $(shlib)  -Wl,--out-implib=$(stlib) $(OBJS) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK) $(LIBS) $(LDAP_LIBS_BE)
-+
-+
-+else
- ifeq (,$(SHLIB_EXPORTS))
- DLL_DEFFILE = lib$(NAME)dll.def
- exports_file = $(DLL_DEFFILE)
-@@ -387,6 +399,7 @@ $(shlib): $(OBJS) $(DLL_DEFFILE) | $(SHL
- $(stlib): $(shlib) $(DLL_DEFFILE) | $(SHLIB_PREREQS)
- 	$(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(DLL_DEFFILE) --output-lib $@
- 
-+endif # PORTNAME == cygwin 
- endif # PORTNAME == cygwin || PORTNAME == win32
- 
- 
 @@ -467,8 +480,10 @@ ifdef soname
  # we don't install $(shlib) on AIX
  # (see http://archives.postgresql.org/message-id/52EF20B2E3209443BC37736D00C3C1380A6E79FE@EXADV1.host.magwien.gv.at)
diff --git a/databases/postgresql93/patches/patch-src_makefiles_Makefile.cygwin b/databases/postgresql93/patches/patch-src_makefiles_Makefile.cygwin
deleted file mode 100644
index 9504ab2c49c..00000000000
--- a/databases/postgresql93/patches/patch-src_makefiles_Makefile.cygwin
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_makefiles_Makefile.cygwin,v 1.1 2013/10/04 18:23:40 joerg Exp $
-
---- src/makefiles/Makefile.cygwin.orig	2013-09-02 20:53:17.000000000 +0000
-+++ src/makefiles/Makefile.cygwin
-@@ -1,6 +1,5 @@
--# src/makefiles/Makefile.cygwin
- DLLTOOL= dlltool
--DLLWRAP= dllwrap
-+# src/makefiles/Makefile.cygwin
- ifdef PGXS
- BE_DLLLIBS= -L$(libdir) -lpostgres
- else
-@@ -44,6 +43,4 @@ endif
- 
- # Rule for building a shared library from a single .o file
- %.dll: %.o
--	$(DLLTOOL) --export-all --output-def $*.def $<
--	$(DLLWRAP) -o $@ --def $*.def $< $(LDFLAGS) $(LDFLAGS_SL) $(BE_DLLLIBS)
--	rm -f $*.def
-+	 $(CC) $(CFLAGS)  -shared -o $@ $<  $(LDFLAGS) $(LDFLAGS_SL) $(BE_DLLLIBS)