--- postgresql-8.0.0cvs/src/Makefile.global.orig	2004-10-07 04:46:04.409784800 +0200
+++ postgresql-8.0.0cvs/src/Makefile.global	2004-10-09 14:46:47.034467200 +0200
@@ -302,6 +302,11 @@
 endif
 
 libpq = -L$(libpq_builddir) -lpq
+ifeq ($(PORTNAME), cygwin)
+libpq_a=  $(libpq_builddir)/libpq.dll.a
+else
+libpq_a = $(libpq_builddir)/libpq.a
+endif
 
 submake-libpq:
 	$(MAKE) -C $(libpq_builddir) all
--- postgresql-8.0.0cvs/src/bin/initdb/Makefile.orig	2004-08-29 06:13:01.000000000 +0200
+++ postgresql-8.0.0cvs/src/bin/initdb/Makefile	2004-10-09 14:29:31.766468800 +0200
@@ -19,8 +19,8 @@
 
 all: submake-libpq submake-libpgport initdb
 
-initdb: $(OBJS) $(libpq_builddir)/libpq.a
-	$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
+initdb: $(OBJS) $(libpq_a)
+	$(CC) $(CFLAGS) $(OBJS) $(libpq_a) $(LDFLAGS) $(LIBS) -o $@$(X)
 
 dirmod.c: % : $(top_srcdir)/src/port/%
 	rm -f $@ && $(LN_S) $< .
--- postgresql-8.0.0cvs/src/interfaces/libpq/Makefile.orig	2004-09-26 04:14:47.000000000 +0200
+++ postgresql-8.0.0cvs/src/interfaces/libpq/Makefile	2004-10-09 14:52:14.827146400 +0200
@@ -27,6 +27,10 @@
 	dllist.o md5.o ip.o wchar.o encnames.o noblock.o pgstrcasecmp.o thread.o \
 	$(filter crypt.o getaddrinfo.o inet_aton.o open.o snprintf.o strerror.o, $(LIBOBJS))
 
+ifeq ($(PORTNAME), cygwin)
+override shlib = cyg$(NAME)$(DLSUFFIX)
+endif
+
 ifeq ($(PORTNAME), win32)
 OBJS+=win32.o libpqrc.o
 libpqrc.o: libpq.rc
@@ -54,6 +58,13 @@
 include $(top_srcdir)/src/Makefile.shlib
 backend_src = $(top_srcdir)/src/backend
 
+ifeq ($(PORTNAME), cygwin)
+$(shlib) lib$(NAME).dll.a: $(OBJS) $(DLLINIT)
+	$(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --dllname $(shlib) --output-def $(NAME).def $(OBJS)
+	$(DLLWRAP) -Wl,--major-image-version,$(SO_MAJOR_VERSION) -Wl,--minor-image-version,$(SO_MINOR_VERSION) \
+	  -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(DLLINIT) $(SHLIB_LINK)
+	$(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).dll.a
+endif
 
 # We use several backend modules verbatim, but since we need to
 # compile with appropriate options to build a shared lib, we can't