From 1e79d3c936f9f8e58f8fe2ae44845ce752c048a9 Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Mon, 25 Feb 2002 18:39:41 +0000 Subject: [PATCH] - remove some unnecessary patches - when trying to remove lib/gdk-pixbuf deal with it in a more graceful manner if the user has added some files to the directory --- graphics/gdk-pixbuf/Makefile | 11 +++++++---- graphics/gdk-pixbuf/patches/patch-doc_Makefile_am | 12 ------------ .../gdk-pixbuf/patches/patch-gdk-pixbuf_Makefile_am | 12 ------------ graphics/gdk-pixbuf/pkg/PFRAG.shared | 4 ++-- graphics/gdk-pixbuf/pkg/PLIST | 10 +++++----- 5 files changed, 14 insertions(+), 35 deletions(-) delete mode 100644 graphics/gdk-pixbuf/patches/patch-doc_Makefile_am delete mode 100644 graphics/gdk-pixbuf/patches/patch-gdk-pixbuf_Makefile_am diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index bb0779b0e8..9d5860cd29 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -1,17 +1,18 @@ -# $OpenBSD: Makefile,v 1.10 2001/12/10 21:29:16 naddy Exp $ +# $OpenBSD: Makefile,v 1.11 2002/02/25 18:39:41 brad Exp $ COMMENT= "replacement library for Imlib" PKGNAME= ${DISTNAME}p1 DISTNAME= gdk-pixbuf-0.10.1 CATEGORIES= graphics -NEED_VERSION= 1.475 +NEED_VERSION= 1.500 MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gdk-pixbuf HOMEPAGE= http://developer.gnome.org/arch/imaging/gdkpixbuf.html -LIB_DEPENDS= png.2::graphics/png \ +LIB_DEPENDS= jpeg.62::graphics/jpeg \ + png.2::graphics/png \ tiff.35.::graphics/tiff \ gtk.1.2,gdk.1.2::x11/gtk+ @@ -31,7 +32,9 @@ PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltconfig \ SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static --disable-modules +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} +CONFIGURE_ARGS+= --enable-static \ + --disable-modules CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/gdk-pixbuf/patches/patch-doc_Makefile_am b/graphics/gdk-pixbuf/patches/patch-doc_Makefile_am deleted file mode 100644 index fccdf204c6..0000000000 --- a/graphics/gdk-pixbuf/patches/patch-doc_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-doc_Makefile_am,v 1.1 2001/03/27 11:45:10 naddy Exp $ ---- doc/Makefile.am.orig Wed Mar 14 09:51:24 2001 -+++ doc/Makefile.am Wed Mar 14 09:52:01 2001 -@@ -97,8 +97,6 @@ install-data-local: - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ -- echo '-- Installing $(srcdir)/html/index.sgml' ; \ -- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ - echo '-- Fixing Crossreferences' ; \ - gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \ - fi) diff --git a/graphics/gdk-pixbuf/patches/patch-gdk-pixbuf_Makefile_am b/graphics/gdk-pixbuf/patches/patch-gdk-pixbuf_Makefile_am deleted file mode 100644 index 47dabff45a..0000000000 --- a/graphics/gdk-pixbuf/patches/patch-gdk-pixbuf_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-gdk-pixbuf_Makefile_am,v 1.1 2001/04/01 20:18:07 naddy Exp $ ---- gdk-pixbuf/Makefile.am.orig Thu Mar 1 00:05:34 2001 -+++ gdk-pixbuf/Makefile.am Sat Mar 31 21:39:32 2001 -@@ -220,7 +220,7 @@ libgdk_pixbuf_xlib_la_SOURCES = \ - gdk-pixbuf-parse-color.c \ - $(extra_sources) - --libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS) -+libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS) $(LIBPNG) $(LIBJPEG) $(LIBTIFF) - libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la - - diff --git a/graphics/gdk-pixbuf/pkg/PFRAG.shared b/graphics/gdk-pixbuf/pkg/PFRAG.shared index 58dacf8cfc..46541387ca 100644 --- a/graphics/gdk-pixbuf/pkg/PFRAG.shared +++ b/graphics/gdk-pixbuf/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.4 2001/09/14 03:41:29 heko Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.5 2002/02/25 18:39:41 brad Exp $ lib/libgdk_pixbuf.so.2.0 lib/libgdk_pixbuf_xlib.so.2.0 -DYNLIBDIR(%D/lib) +DYNLIBDIR(%B) diff --git a/graphics/gdk-pixbuf/pkg/PLIST b/graphics/gdk-pixbuf/pkg/PLIST index 5dc8263425..b43b41cd63 100644 --- a/graphics/gdk-pixbuf/pkg/PLIST +++ b/graphics/gdk-pixbuf/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.8 2001/09/29 20:45:39 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.9 2002/02/25 18:39:41 brad Exp $ bin/gdk-pixbuf-config include/gdk-pixbuf/gdk-pixbuf-features.h include/gdk-pixbuf/gdk-pixbuf-loader.h @@ -11,6 +11,8 @@ lib/libgdk_pixbuf.a lib/libgdk_pixbuf.la lib/libgdk_pixbuf_xlib.a lib/libgdk_pixbuf_xlib.la +%%gnome%% +%%SHARED%% share/aclocal/gdk-pixbuf.m4 share/html/gdk-pixbuf-decl.txt share/html/gdk-pixbuf-sections.txt @@ -54,11 +56,9 @@ share/html/gdk-pixbuf/x3723.html share/html/gdk-pixbuf/x3735.html share/html/gdk-pixbuf/x3765.html share/html/gdk-pixbuf/x3787.html -%%gnome%% -%%SHARED%% @dirrm share/html/gdk-pixbuf @dirrm share/html @exec mkdir -p %D/lib/gdk-pixbuf/loaders -@dirrm lib/gdk-pixbuf/loaders -@dirrm lib/gdk-pixbuf +@unexec rmdir %D/lib/gdk-pixbuf/loaders 2>/dev/null || true +@unexec rmdir %D/lib/gdk-pixbuf 2>/dev/null || true @dirrm include/gdk-pixbuf