From 62ddea4cde67fabd15fa6c0fa3591f2180f85559 Mon Sep 17 00:00:00 2001 From: brad Date: Sat, 12 Aug 2000 12:37:18 +0000 Subject: [PATCH] upgrade to gqview 0.8.2 --- graphics/gqview/Makefile | 30 ++++++++----------- graphics/gqview/files/md5 | 6 ++-- graphics/gqview/patches/patch-Makefile.in | 11 +++++++ graphics/gqview/patches/patch-aa | 19 ------------ graphics/gqview/patches/patch-configure | 20 +++++++++++++ .../gqview/patches/patch-po_Makefile.in.in | 23 ++++++++++++++ graphics/gqview/pkg/PLIST | 10 +++++++ 7 files changed, 80 insertions(+), 39 deletions(-) create mode 100644 graphics/gqview/patches/patch-Makefile.in delete mode 100644 graphics/gqview/patches/patch-aa create mode 100644 graphics/gqview/patches/patch-configure create mode 100644 graphics/gqview/patches/patch-po_Makefile.in.in diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile index 1db2659b18c..d0d7f758219 100644 --- a/graphics/gqview/Makefile +++ b/graphics/gqview/Makefile @@ -1,33 +1,29 @@ -# $OpenBSD: Makefile,v 1.11 2000/04/09 17:36:40 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2000/08/12 12:37:18 brad Exp $ # $FreeBSD: Makefile,v 1.15 1999/08/25 06:14:08 obrien Exp $ -DISTNAME= gqview-0.7.0.src -PKGNAME= gqview-0.7.0 +DISTNAME= gqview-0.8.2 CATEGORIES= graphics -NEED_VERSION= 1.230 -FAKE=No -MASTER_SITES= http://gqview.netpedia.net/ \ - http://www.geocities.com/SiliconValley/Haven/5235/ +NEED_VERSION= 1.310 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= gqview + +LIB_DEPENDS= gdk_imlib.19::graphics/imlib MAINTAINER= brad@openbsd.org -LICENSE_TYPE= GPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -LIB_DEPENDS= glib.1.2::devel/glib \ - gtk.1.2::x11/gtk+ \ - gdk_imlib.19::graphics/imlib +CONFIGURE_STYLE= gnu +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" -USE_X11= Yes - -ALL_TARGET= gqview -WRKDIST= ${WRKDIR}/${PKGNAME} +DOCS= README post-install: - @mkdir -p ${PREFIX}/share/doc/gqview - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gqview/README + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gqview + cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/gqview .include diff --git a/graphics/gqview/files/md5 b/graphics/gqview/files/md5 index d33e6370582..b85b08a7ae1 100644 --- a/graphics/gqview/files/md5 +++ b/graphics/gqview/files/md5 @@ -1,3 +1,3 @@ -MD5 (gqview-0.7.0.src.tar.gz) = d8adab5af9f0272de3a20bafd21b4350 -RMD160 (gqview-0.7.0.src.tar.gz) = aee499c323294f547272f933382f86fc23950bac -SHA1 (gqview-0.7.0.src.tar.gz) = 64f5f5269eadbee205bde3992884007d461f3e7e +MD5 (gqview-0.8.2.tar.gz) = 198f3d9458a02e01745423026b15a334 +RMD160 (gqview-0.8.2.tar.gz) = 8572c9bfd39d07b36c2fb05e466e9dc9d435ce33 +SHA1 (gqview-0.8.2.tar.gz) = 17ca0c14e290afcb58eb83938853c8b08dd0c5e3 diff --git a/graphics/gqview/patches/patch-Makefile.in b/graphics/gqview/patches/patch-Makefile.in new file mode 100644 index 00000000000..022e719e1d4 --- /dev/null +++ b/graphics/gqview/patches/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sat Aug 12 07:45:10 2000 ++++ Makefile.in Sat Aug 12 07:49:55 2000 +@@ -376,7 +376,7 @@ + install-data: install-data-recursive + + install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am + install: install-recursive + uninstall-am: uninstall-desktopDATA uninstall-iconDATA + uninstall: uninstall-recursive diff --git a/graphics/gqview/patches/patch-aa b/graphics/gqview/patches/patch-aa deleted file mode 100644 index bf17a344ef9..00000000000 --- a/graphics/gqview/patches/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ ---- Makefile.orig Sat Jul 3 08:25:34 1999 -+++ Makefile Tue Sep 7 20:05:07 1999 -@@ -1,13 +1,13 @@ - --PREFIX=/usr/local -+#PREFIX=/usr/local - - GTK_INCLUDE = `gtk-config --cflags` - GTK_LIB = `gtk-config --libs` - IMLIB_INCLUDE = `imlib-config --cflags-gdk` - IMLIB_LIB = `imlib-config --libs-gdk` --CFLAGS = $(GTK_INCLUDE) $(IMLIB_INCLUDE) -+CFLAGS += -Wall $(GTK_INCLUDE) $(IMLIB_INCLUDE) - LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) --CC = gcc -Wall -+#CC = gcc -Wall - - GNOME_PREFIX = `gnome-config --prefix` - diff --git a/graphics/gqview/patches/patch-configure b/graphics/gqview/patches/patch-configure new file mode 100644 index 00000000000..adfa21c22ca --- /dev/null +++ b/graphics/gqview/patches/patch-configure @@ -0,0 +1,20 @@ +--- configure.orig Sat Aug 12 07:14:21 2000 ++++ configure Sat Aug 12 07:15:13 2000 +@@ -3324,7 +3324,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo +@@ -3586,7 +3586,7 @@ + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.cat + INSTOBJEXT=.cat +- DATADIRNAME=lib ++ DATADIRNAME=share + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` diff --git a/graphics/gqview/patches/patch-po_Makefile.in.in b/graphics/gqview/patches/patch-po_Makefile.in.in new file mode 100644 index 00000000000..d4e3e6e3549 --- /dev/null +++ b/graphics/gqview/patches/patch-po_Makefile.in.in @@ -0,0 +1,23 @@ +--- po/Makefile.in.in.orig Sat Aug 12 07:17:05 2000 ++++ po/Makefile.in.in Sat Aug 12 07:19:25 2000 +@@ -111,9 +111,9 @@ + install-data-no: all + install-data-yes: all + if test -r "$(MKINSTALLDIRS)"; then \ +- $(MKINSTALLDIRS) $(datadir); \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + else \ +- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ ++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ +@@ -123,7 +123,7 @@ + *) destdir=$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ +- dir=$$destdir/$$lang/LC_MESSAGES; \ ++ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $$dir; \ + else \ diff --git a/graphics/gqview/pkg/PLIST b/graphics/gqview/pkg/PLIST index 6ffe0ee1c6d..67acecb3a46 100644 --- a/graphics/gqview/pkg/PLIST +++ b/graphics/gqview/pkg/PLIST @@ -1,3 +1,13 @@ bin/gqview share/doc/gqview/README +share/locale/de/LC_MESSAGES/gqview.mo +share/locale/es/LC_MESSAGES/gqview.mo +share/locale/fr/LC_MESSAGES/gqview.mo +share/locale/it/LC_MESSAGES/gqview.mo +share/locale/ja/LC_MESSAGES/gqview.mo +share/locale/pt_BR/LC_MESSAGES/gqview.mo +share/locale/ru/LC_MESSAGES/gqview.mo +share/locale/sk/LC_MESSAGES/gqview.mo +share/locale/tr/LC_MESSAGES/gqview.mo +share/locale/zh_TW.Big5/LC_MESSAGES/gqview.mo @dirrm share/doc/gqview