cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove old pre-extract check

Browse Source 
- partially remove changes to a few of Gimp's Makefiles and instead modify
Gimp's autoconf script.
- few DESTDIR fixes for Gimp's Makefiles
- sort PLIST
This commit is contained in:
brad 2000-07-23 02:37:11 +00:00
parent 1ebdc954ca
commit 925595f69b
7 changed files with 143 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
graphics/gimp/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.49 2000/07/04 02:09:21 krw Exp $
# $OpenBSD: Makefile,v 1.50 2000/07/23 02:37:11 brad Exp $
DISTNAME= gimp-1.1.24
CATEGORIES= graphics
@ -31,25 +31,6 @@ CONFIGURE_ARGS+= --enable-static --disable-perl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
# 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.?.? -o \
-f ${LOCALBASE}/lib/libgimp.so.?.? ]; then \
echo "+-------------------"; \
echo "| ERROR: you MUST remove the existing gimp installation"; \
echo "| before compiling this version. To fully remove run"; \
echo "| these commands as user root"; \
echo "|"; \
echo "| pkg_delete -f `pkg_info -e 'gimp-*'`"; \
echo "| ldconfig -R"; \
echo "|"; \
echo "+-------------------"; \
exit 1; \
fi
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal
${INSTALL_DATA} ${WRKSRC}/gimp.m4 ${PREFIX}/share/aclocal

31
graphics/gimp/patches/patch-af
View File

@ -1,14 +1,5 @@
--- po/Makefile.in.in.orig Fri Feb 11 19:31:57 2000
+++ po/Makefile.in.in Wed Mar 8 02:20:42 2000
@@ -18,7 +18,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = $(prefix)/share
localedir = $(datadir)/locale
gnulocaledir = $(prefix)/share/locale
gettextsrcdir = $(prefix)/share/gettext/po
--- po/Makefile.in.in.orig Thu Jun 22 16:48:49 2000
+++ po/Makefile.in.in Sat Jul 22 15:35:19 2000
@@ -111,9 +111,9 @@
install-data-no: all
install-data-yes: all
@ -46,3 +37,21 @@
else \
: ; \
fi
@@ -171,12 +171,12 @@
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
done
- rm -f $(gettextsrcdir)/po-Makefile.in.in
+ rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
check: all

50
graphics/gimp/patches/patch-ag
View File

@ -1,5 +1,5 @@
--- po-plug-ins/Makefile.in.in.orig Sat Jun 5 17:20:18 1999
+++ po-plug-ins/Makefile.in.in Thu Jul 22 00:40:35 1999
--- po-plug-ins/Makefile.in.in.orig Thu Feb 3 19:19:34 2000
+++ po-plug-ins/Makefile.in.in Sat Jul 22 15:30:48 2000
@@ -18,7 +18,7 @@
prefix = @prefix@
@ -9,3 +9,49 @@
localedir = $(datadir)/locale
gnulocaledir = $(prefix)/share/locale
gettextsrcdir = $(prefix)/share/gettext/po
@@ -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 \
@@ -153,12 +153,12 @@
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(gettextsrcdir)/Makefile.in.in; \
+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
@@ -171,12 +171,12 @@
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
done
- rm -f $(gettextsrcdir)/po-Makefile.in.in
+ rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
check: all

29
graphics/gimp/patches/patch-aj
View File

@ -1,11 +1,20 @@
--- configure.orig Thu Jun 22 16:49:05 2000
+++ configure Tue Jun 27 14:55:45 2000
@@ -7150,7 +7150,7 @@
gimpdatadir=$datadir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
-localedir='${prefix}/${DATADIRNAME}/locale'
+localedir='${prefix}/share/locale'
brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
+++ configure Sat Jul 22 15:14:01 2000
@@ -3478,7 +3478,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
rm -f conftest*
INSTOBJEXT=.mo
@@ -3740,7 +3740,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//'`

40
graphics/gimp/patches/patch-al
View File

@ -1,15 +1,5 @@
--- po-script-fu/Makefile.in.in.orig Thu Apr 27 21:56:32 2000
+++ po-script-fu/Makefile.in.in Sun May 21 10:07:19 2000
@@ -18,7 +18,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = $(prefix)/share
localedir = $(datadir)/locale
gnulocaledir = $(prefix)/share/locale
gettextsrcdir = $(prefix)/share/gettext/po
--- po-script-fu/Makefile.in.in.orig Tue Jun 13 13:58:32 2000
+++ po-script-fu/Makefile.in.in Sat Jul 22 15:33:14 2000
@@ -118,9 +118,9 @@
install-data-no: all
install-data-yes: all
@ -31,7 +21,7 @@
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
@@ -160,9 +160,9 @@
@@ -160,12 +160,12 @@
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \
@ -42,4 +32,26 @@
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(gettextsrcdir)/Makefile.in.in; \
- $(gettextsrcdir)/Makefile.in.in; \
+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
@@ -178,12 +178,12 @@
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
done
- rm -f $(gettextsrcdir)/po-Makefile.in.in
+ rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
check: all

40
graphics/gimp/patches/patch-am
View File

@ -1,15 +1,5 @@
--- po-libgimp/Makefile.in.in.orig Thu Jan 27 07:46:58 2000
+++ po-libgimp/Makefile.in.in Sun May 21 10:52:20 2000
@@ -18,7 +18,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = $(prefix)/share
localedir = $(datadir)/locale
gnulocaledir = $(prefix)/share/locale
gettextsrcdir = $(prefix)/share/gettext/po
--- po-libgimp/Makefile.in.in.orig Thu Jan 27 05:46:58 2000
+++ po-libgimp/Makefile.in.in Sat Jul 22 15:32:25 2000
@@ -111,9 +111,9 @@
install-data-no: all
install-data-yes: all
@ -31,7 +21,7 @@
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
@@ -153,9 +153,9 @@
@@ -153,12 +153,12 @@
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \
@ -42,4 +32,26 @@
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(gettextsrcdir)/Makefile.in.in; \
- $(gettextsrcdir)/Makefile.in.in; \
+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
@@ -171,12 +171,12 @@
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
done
- rm -f $(gettextsrcdir)/po-Makefile.in.in
+ rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
check: all

6
graphics/gimp/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.22 2000/06/28 02:15:55 brad Exp $
@comment $OpenBSD: PLIST,v 1.23 2000/07/23 02:37:12 brad Exp $
bin/gimp
bin/gimp-config
bin/gimptool
@ -72,11 +72,11 @@ include/libgimp/gimptile.h
include/libgimp/gimptools_pdb.h
include/libgimp/gimptypes.h
include/libgimp/gimpui.h
include/libgimp/gimpundo_pdb.h
include/libgimp/gimpunit.h
include/libgimp/gimpunit_pdb.h
include/libgimp/gimpunitmenu.h
include/libgimp/gimputils.h
include/libgimp/gimpundo_pdb.h
include/libgimp/gimpvector.h
include/libgimp/gimpwidgets.h
lib/gimp/1.1/modules/libcdisplay_gamma.a
@ -365,9 +365,9 @@ share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimptexttool.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimptile.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimptools.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpui.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpundo.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpunit.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimputils.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpundo.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpvector.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpwidgets.html
share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpwire.html