update to 1.1.23; remove jpeg from dependecies since needs to be already

installed for tiff; check for any previous version of the libraries
instead a specific major/minor, this is better, and will avoid problems
in the future.
This commit is contained in:
fgsch 2000-06-01 22:34:00 +00:00
parent 7b9d1b5044
commit 4d6efcc9ae
5 changed files with 31 additions and 42 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.42 2000/05/31 22:02:29 marc Exp $
# $OpenBSD: Makefile,v 1.43 2000/06/01 22:34:00 fgsch Exp $
DISTNAME= gimp-1.1.22
DISTNAME= gimp-1.1.23
CATEGORIES= graphics
NEED_VERSION= 1.230
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/old/v1.1.22/ \
ftp://ftp.sunet.se/pub/gnu/gimp/unstable/old/v1.1.22/ \
ftp://ftp.cs.umn.edu/pub/gimp/unstable/old/v1.1.22/
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v1.1/v1.1.23/ \
ftp://ftp.sunet.se/pub/gnu/gimp/v1.1/v1.1.23/ \
ftp://ftp.cs.umn.edu/pub/gimp/v1.1/v1.1.23/
MAINTAINER= brad@openbsd.org
@ -17,7 +17,6 @@ PERMIT_DISTFILES_FTP= Yes
LIB_DEPENDS= gtk.1.2::x11/gtk+ \
aa.1.3::graphics/aalib \
jpeg.62::graphics/jpeg \
mpeg.13::graphics/mpeg-lib \
png.1.6::graphics/png \
tiff.35::graphics/tiff
@ -31,18 +30,16 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
GTK_CONFIG="${LOCALBASE}/bin/gtk-config"
# People that installed an older version of gimp 1.1.x wound up with
# shared libs with a major/minor of 1.3 or 1.4 ... these files
# MUST be removed as the version was incorrect (it came from 1.1.x
# sources). Check that out here (and bitch if necessary).
# People that installed a previous version of gimp wound up with
# shared libs that might not contain all the functions needed to
# link the current objects.
# Check that out here (and bitch if necessary).
pre-extract:
@if [ -f ${X11BASE}/lib/libgimp.so.1.3 -o \
-f ${X11BASE}/lib/libgimp.so.1.4 -o \
-f ${LOCALBASE}/lib/libgimp.so.1.3 -o \
-f ${LOCALBASE}/lib/libgimp.so.1.4 ]; then \
@if [ -f ${X11BASE}/lib/libgimp.so.?.? -o \
-f ${LOCALBASE}/lib/libgimp.so.?.? ]; then \
echo "+-------------------"; \
echo "| ERROR: you MUST remove the existing gimp installation"; \
echo "| before installing this version. To fully remove run"; \
echo "| before compiling this version. To fully remove run"; \
echo "| these commands as user root"; \
echo "|"; \
echo "| pkg_delete -f `pkg_info -e 'gimp-*'`"; \

View File

@ -1,3 +1,3 @@
MD5 (gimp-1.1.22.tar.gz) = 01cd2da7fe8a520b6a7b32ef54149786
RMD160 (gimp-1.1.22.tar.gz) = b459f253cfea7fc3e8f48974daa931e322ddd55c
SHA1 (gimp-1.1.22.tar.gz) = 9eadce50ef785402c4eb400bb232e6fccb841228
MD5 (gimp-1.1.23.tar.gz) = ad3200194a90470efd38e393da668e1c
RMD160 (gimp-1.1.23.tar.gz) = afe70654721fc02c49dcaad24b35b4a74a8e3192
SHA1 (gimp-1.1.23.tar.gz) = d6db41feb68d561b6da17e546e90a8e911298087

View File

@ -1,12 +0,0 @@
--- modules/Makefile.in.orig Fri Feb 11 13:42:53 2000
+++ modules/Makefile.in Mon Feb 14 22:08:22 2000
@@ -184,8 +184,7 @@
CPPFLAGS = -DMODULE_COMPILATION
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/intl $(GTK_CFLAGS) -I$(includedir)
-
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/intl $(GTK_CFLAGS) -I$(includedir) -I/usr/local/include
EXTRA_DIST = makefile.cygwin makefile.msc module.def modregister.c modregister.h

View File

@ -2,11 +2,11 @@ bin/gimp
bin/gimp-config
bin/gimptool
include/gck/gck.h
include/libgimp/color_display.h
include/libgimp/color_selector.h
include/libgimp/gimp.h
include/libgimp/gimpchainbutton.h
include/libgimp/gimpcolorbutton.h
include/libgimp/gimpcolordisplay.h
include/libgimp/gimpcolorselector.h
include/libgimp/gimpcolorspace.h
include/libgimp/gimpcompat.h
include/libgimp/gimpdialog.h
@ -22,6 +22,8 @@ include/libgimp/gimpmath.h
include/libgimp/gimpmatrix.h
include/libgimp/gimpmenu.h
include/libgimp/gimpmodule.h
include/libgimp/gimpparasite.h
include/libgimp/gimpparasiteio.h
include/libgimp/gimppatheditor.h
include/libgimp/gimppixmap.h
include/libgimp/gimpquerybox.h
@ -33,10 +35,6 @@ include/libgimp/gimpunitmenu.h
include/libgimp/gimputils.h
include/libgimp/gimpvector.h
include/libgimp/gimpwidgets.h
include/libgimp/parasite.h
include/libgimp/parasiteF.h
include/libgimp/parasiteP.h
include/libgimp/parasiteio.h
lib/gimp/1.1/modules/libcdisplay_gamma.a
lib/gimp/1.1/modules/libcdisplay_gamma.la
lib/gimp/1.1/modules/libcdisplay_gamma.so.0.0
@ -282,6 +280,8 @@ share/gimp/1.1/devel-docs/html/libgimp/index.sgml
share/gimp/1.1/devel-docs/html/libgimp/libgimp-color-display.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-color-selector.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimp.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpcolordisplay.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpcolorselector.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpcolorspace.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpcompat.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpdialog.html
@ -295,6 +295,8 @@ share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpmath.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpmatrix.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpmenu.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpmodule.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpparasite.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpparasiteio.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpprotocol.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpquerybox.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpsignal.html

View File

@ -2,11 +2,11 @@ bin/gimp
bin/gimp-config
bin/gimptool
include/gck/gck.h
include/libgimp/color_display.h
include/libgimp/color_selector.h
include/libgimp/gimp.h
include/libgimp/gimpchainbutton.h
include/libgimp/gimpcolorbutton.h
include/libgimp/gimpcolordisplay.h
include/libgimp/gimpcolorselector.h
include/libgimp/gimpcolorspace.h
include/libgimp/gimpcompat.h
include/libgimp/gimpdialog.h
@ -22,6 +22,8 @@ include/libgimp/gimpmath.h
include/libgimp/gimpmatrix.h
include/libgimp/gimpmenu.h
include/libgimp/gimpmodule.h
include/libgimp/gimpparasite.h
include/libgimp/gimpparasiteio.h
include/libgimp/gimppatheditor.h
include/libgimp/gimppixmap.h
include/libgimp/gimpquerybox.h
@ -33,10 +35,6 @@ include/libgimp/gimpunitmenu.h
include/libgimp/gimputils.h
include/libgimp/gimpvector.h
include/libgimp/gimpwidgets.h
include/libgimp/parasite.h
include/libgimp/parasiteF.h
include/libgimp/parasiteP.h
include/libgimp/parasiteio.h
lib/gimp/1.1/modules/libcdisplay_gamma.a
lib/gimp/1.1/modules/libcdisplay_gamma.la
lib/gimp/1.1/modules/libcdisplay_highcontrast.a
@ -272,6 +270,8 @@ share/gimp/1.1/devel-docs/html/libgimp/index.sgml
share/gimp/1.1/devel-docs/html/libgimp/libgimp-color-display.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-color-selector.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimp.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpcolordisplay.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpcolorselector.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpcolorspace.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpcompat.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpdialog.html
@ -285,6 +285,8 @@ share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpmath.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpmatrix.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpmenu.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpmodule.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpparasite.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpparasiteio.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpprotocol.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpquerybox.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpsignal.html