diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 6b204d03f93..926a024c681 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2001/09/13 20:35:34 todd Exp $
+# $OpenBSD: Makefile,v 1.7 2001/09/14 03:41:29 heko Exp $
 
 COMMENT=	"replacement library for Imlib"
 
@@ -32,13 +32,9 @@ CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
 
 .if ${FLAVOR:L:Mgnome}
 LIB_DEPENDS+=	gnome.36::x11/gnome/libs
-.endif 
-
-FLAVORS= gnome
-FLAVOR?=
-
-.if ${FLAVOR:L} == "gnome"
 CONFIGURE_ARGS+= --with-gnome
+.else
+CONFIGURE_ARGS+= --without-gnome
 .endif
 
 pre-patch:
@@ -47,3 +43,13 @@ pre-patch:
 		 s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g'
 
 .include <bsd.port.mk>
+
+# From PostgreSQL port Makefile.
+.if ${FLAVOR:L:Mgnome} && !defined(NO_SHARED_LIBS)
+SED_PLIST+=-e '/%%SHARED-gnome%%/r${PKGDIR}/PFRAG.gnome.shared' -e '//d'
+.elif ${FLAVOR:L:Mgnome} && defined(NO_SHARED_LIBS) && \
+	${NO_SHARED_LIBS:L} == "yes"
+SED_PLIST+=-e '/%%SHARED-gnome%%/d'
+.endif
+
+
diff --git a/graphics/gdk-pixbuf/pkg/PFRAG.gnome b/graphics/gdk-pixbuf/pkg/PFRAG.gnome
index 7f0335c5a4a..9ce073ebdce 100644
--- a/graphics/gdk-pixbuf/pkg/PFRAG.gnome
+++ b/graphics/gdk-pixbuf/pkg/PFRAG.gnome
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PFRAG.gnome,v 1.1 2001/09/13 20:35:34 todd Exp $
+@comment $OpenBSD: PFRAG.gnome,v 1.2 2001/09/14 03:41:29 heko Exp $
 include/gdk-pixbuf/gnome-canvas-pixbuf.h
+lib/gnomecanvaspixbufConf.sh
 lib/libgnomecanvaspixbuf.a
 lib/libgnomecanvaspixbuf.la
-lib/libgnomecanvaspixbuf.so.1.0
+%%SHARED-gnome%%
diff --git a/graphics/gdk-pixbuf/pkg/PFRAG.gnome.shared b/graphics/gdk-pixbuf/pkg/PFRAG.gnome.shared
new file mode 100644
index 00000000000..d9ee112bdcd
--- /dev/null
+++ b/graphics/gdk-pixbuf/pkg/PFRAG.gnome.shared
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.gnome.shared,v 1.1 2001/09/14 03:41:29 heko Exp $
+lib/libgnomecanvaspixbuf.so.1.0
diff --git a/graphics/gdk-pixbuf/pkg/PFRAG.shared b/graphics/gdk-pixbuf/pkg/PFRAG.shared
index d8ee8d015c3..58dacf8cfca 100644
--- a/graphics/gdk-pixbuf/pkg/PFRAG.shared
+++ b/graphics/gdk-pixbuf/pkg/PFRAG.shared
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2001/09/13 20:35:34 todd Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.4 2001/09/14 03:41:29 heko Exp $
 lib/libgdk_pixbuf.so.2.0
 lib/libgdk_pixbuf_xlib.so.2.0
-lib/libgnomecanvaspixbuf.so.1.0
 DYNLIBDIR(%D/lib)
diff --git a/graphics/gdk-pixbuf/pkg/PLIST b/graphics/gdk-pixbuf/pkg/PLIST
index f0473cd9326..1eae07c1fd7 100644
--- a/graphics/gdk-pixbuf/pkg/PLIST
+++ b/graphics/gdk-pixbuf/pkg/PLIST
@@ -1,20 +1,16 @@
-@comment $OpenBSD: PLIST,v 1.6 2001/09/13 20:35:34 todd Exp $
+@comment $OpenBSD: PLIST,v 1.7 2001/09/14 03:41:29 heko Exp $
 bin/gdk-pixbuf-config
 include/gdk-pixbuf/gdk-pixbuf-features.h
 include/gdk-pixbuf/gdk-pixbuf-loader.h
 include/gdk-pixbuf/gdk-pixbuf-xlib.h
 include/gdk-pixbuf/gdk-pixbuf-xlibrgb.h
 include/gdk-pixbuf/gdk-pixbuf.h
-include/gdk-pixbuf/gnome-canvas-pixbuf.h
 lib/gdk_pixbufConf.sh
 lib/gdk_pixbuf_xlibConf.sh
-lib/gnomecanvaspixbufConf.sh
 lib/libgdk_pixbuf.a
 lib/libgdk_pixbuf.la
 lib/libgdk_pixbuf_xlib.a
 lib/libgdk_pixbuf_xlib.la
-lib/libgnomecanvaspixbuf.a
-lib/libgnomecanvaspixbuf.la
 share/aclocal/gdk-pixbuf.m4
 share/html/gdk-pixbuf-decl.txt
 share/html/gdk-pixbuf-sections.txt