upgrade to Gimp 1.2.5

This commit is contained in:
brad 2003-12-27 00:26:17 +00:00
parent 8429734f55
commit 3b95b40581
21 changed files with 1547 additions and 1741 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2002/07/28 21:55:10 brad Exp $
# $OpenBSD: Makefile,v 1.2 2003/12/27 00:26:17 brad Exp $
COMMENT= "GNU Image Manipulation Program"
VERSION= 1.2.3
VERSION= 1.2.5
DISTNAME= gimp-${VERSION}
CATEGORIES= graphics
DIR= gimp/v1.2/v${VERSION}
@ -23,30 +23,20 @@ RUN_DEPENDS= :wget-*:net/wget
MAINTAINER= Brad Smith <brad@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFDIR= ${SYSCONFDIR}/gimp/1.2
SUBST_VARS= CONFDIR
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static --disable-perl
CONFIGURE_ARGS+= --disable-perl --disable-print
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
pre-extract:
@if [ -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
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (gimp-1.2.3.tar.gz) = ab0cf46dd680acb7e293ecf554d5d743
RMD160 (gimp-1.2.3.tar.gz) = eba1c92242d6a9509b3554ed1198917f4b953c32
SHA1 (gimp-1.2.3.tar.gz) = 747a5ea2469d41898564cdd2a15cc9e9dce16d6c
MD5 (gimp-1.2.5.tar.gz) = 77a1aa0ed6c98e130432d412fd4a53a5
RMD160 (gimp-1.2.5.tar.gz) = f3328fa43fb823ed986552c80a1b328d46391963
SHA1 (gimp-1.2.5.tar.gz) = 5768d9b4d4ee59be38ca8fd384b60ca128aa194e

View File

@ -1,40 +0,0 @@
$OpenBSD: patch-Makefile.in,v 1.1.1.1 2002/07/28 21:55:10 brad Exp $
--- Makefile.in.orig Mon Feb 11 16:45:59 2002
+++ Makefile.in Sun Jul 28 15:20:12 2002
@@ -429,21 +429,21 @@ uninstall-gimpdataDATA:
install-gimpsysconfDATA: $(gimpsysconf_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(gimpsysconfdir)
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/gimp
@list='$(gimpsysconf_DATA)'; for p in $$list; do \
if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gimpsysconfdir)/$$p"; \
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gimpsysconfdir)/$$p; \
+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/examples/gimp/$$p-sample"; \
+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/examples/gimp/$$p-sample; \
else if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gimpsysconfdir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(gimpsysconfdir)/$$p; \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/examples/gimp/$$p-sample"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/examples/gimp/$$p-sample; \
fi; fi; \
done
uninstall-gimpsysconfDATA:
@$(NORMAL_UNINSTALL)
list='$(gimpsysconf_DATA)'; for p in $$list; do \
- rm -f $(DESTDIR)$(gimpsysconfdir)/$$p; \
+ rm -f $(DESTDIR)$(datadir)/examples/gimp/$$p-sample; \
done
install-m4dataDATA: $(m4data_DATA)
@@ -655,7 +655,7 @@ installdirs: installdirs-recursive
installdirs-am:
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(gimpdatadir) \
$(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 \
- $(DESTDIR)$(gimpdatadir) $(DESTDIR)$(gimpsysconfdir) \
+ $(DESTDIR)$(gimpdatadir) $(DESTDIR)$(datadir)/examples/gimp \
$(DESTDIR)$(m4datadir)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.1 2003/12/27 00:26:17 brad Exp $
--- Makefile.in.orig Mon May 19 19:07:20 2003
+++ Makefile.in Thu May 22 00:27:32 2003
@@ -172,7 +172,7 @@ brushdata = @brushdata@
gimpdatadir = @gimpdatadir@
gimpdir = @gimpdir@
gimpplugindir = @gimpplugindir@
-gimpsysconfdir = @gimpsysconfdir@
+gimpsysconfdir = $(datadir)/examples/gimp/1.2
gradientdata = @gradientdata@
localedir = @localedir@
ms_librarian = @ms_librarian@

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-app_plug_in_c,v 1.1.1.1 2002/07/28 21:55:10 brad Exp $
--- app/plug_in.c.orig Wed Jun 12 09:14:05 2002
+++ app/plug_in.c Wed Jun 12 09:14:19 2002
@@ -224,7 +224,7 @@ plug_in_init_shm (void)
*/
#ifdef HAVE_SHM_H
- shm_ID = shmget (IPC_PRIVATE, TILE_WIDTH * TILE_HEIGHT * 4, IPC_CREAT | 0777);
+ shm_ID = shmget (IPC_PRIVATE, TILE_WIDTH * TILE_HEIGHT * 4, IPC_CREAT | 0600);
if (shm_ID == -1)
g_message ("shmget() failed: Disabling shared memory tile transport.");

View File

@ -1,47 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2002/07/28 21:55:10 brad Exp $
--- configure.orig Sun Feb 10 01:21:30 2002
+++ configure Sun Jul 28 15:38:55 2002
@@ -3774,8 +3774,8 @@ else
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
export_dynamic_flag_spec='${wl}-E'
else
case "$host_os" in
@@ -3784,8 +3784,8 @@ else
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
;;
esac
fi
@@ -10102,7 +10102,7 @@ else
{
int id;
char *shmaddr;
- id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0777);
+ id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0600);
if (id == -1)
exit (2);
shmaddr = shmat (id, 0, 0);
@@ -11957,9 +11957,9 @@ fi
fi
-gimpdatadir=$datadir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
-gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
-gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
+gimpdatadir=$datadir/$PACKAGE
+gimpplugindir=$libdir/$PACKAGE
+gimpsysconfdir=$sysconfdir/$PACKAGE
localedir='${prefix}/${DATADIRNAME}/locale'

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gimptool-1_2_in,v 1.1.1.1 2002/07/28 21:55:12 brad Exp $
--- gimptool-1.2.in.orig Sun Jul 28 15:06:45 2002
+++ gimptool-1.2.in Sun Jul 28 15:10:31 2002
@@ -227,27 +227,27 @@ while test $# -gt 0; do
$OpenBSD: patch-gimptool-1_2_in,v 1.2 2003/12/27 00:26:17 brad Exp $
--- gimptool-1.2.in.orig Tue Oct 29 06:29:28 2002
+++ gimptool-1.2.in Fri Feb 14 21:29:34 2003
@@ -227,19 +227,19 @@ while test $# -gt 0; do
| --uninstall-script | --uninstall-admin-script )
case $1 in
--*install-bin)
@ -25,13 +25,3 @@ $OpenBSD: patch-gimptool-1_2_in,v 1.1.1.1 2002/07/28 21:55:12 brad Exp $
install_dir="$gimpplugindir/plug-ins"
;;
--*install-script)
- install_cmd="@INSTALL_DATA@"
+ install_cmd="@INSTALL_SCRIPT@"
install_dir="$HOME/@gimpdir@/scripts"
;;
--*install-admin-script)
- install_cmd="@INSTALL_DATA@"
+ install_cmd="@INSTALL_SCRIPT@"
install_dir="$gimpdatadir/scripts"
;;
esac

View File

@ -1,19 +1,28 @@
$OpenBSD: patch-libgimp_Makefile.in,v 1.1.1.1 2002/07/28 21:55:10 brad Exp $
--- libgimp/Makefile.in.orig Mon Feb 11 16:46:08 2002
+++ libgimp/Makefile.in Sun Jul 28 17:00:41 2002
@@ -225,13 +225,13 @@ libgimpui_la_SOURCES = gimpmenu.c gi
$OpenBSD: patch-libgimp_Makefile_in,v 1.1 2003/12/27 00:26:17 brad Exp $
--- libgimp/Makefile.in.orig Mon May 19 19:07:25 2003
+++ libgimp/Makefile.in Thu May 22 09:16:49 2003
@@ -192,7 +192,7 @@ prefix = @prefix@
@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gimp.lib gimpui.lib
-gimpincludedir = $(includedir)/libgimp
+gimpincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimp
AM_CPPFLAGS = -DPREFIX=\""$(prefix)"\" -DGIMPDIR=\""$(gimpdir)"\" -DDATADIR=\""$(gimpdatadir)"\" -DSYSCONFDIR=\""$(gimpsysconfdir)"\" -DG_LOG_DOMAIN=\"LibGimp\" @GIMP_THREAD_FLAGS@
@@ -226,13 +226,13 @@ libgimpui_la_SOURCES = gimpmenu.c gi
gimpinclude_HEADERS = gimp.h ${PDB_WRAPPERS_H} gimpchainbutton.h gimpchannel.h gimpcolorbutton.h gimpcolordisplay.h gimpcolorselector.h gimpcolorspace.h gimpcompat.h gimpdrawable.h gimpdialog.h gimpenums.h gimpenv.h gimpexport.h gimpfeatures.h gimpfileselection.h gimpgradientselect.h gimphelpui.h gimpimage.h gimplayer.h gimplimits.h gimpmath.h gimpmatrix.h gimpmenu.h gimpmodule.h gimpparasite.h gimpparasiteio.h gimppatheditor.h gimppixelrgn.h gimppixmap.h gimpproceduraldb.h gimpquerybox.h gimpselection.h gimpsignal.h gimpsizeentry.h gimptile.h gimptypes.h gimpui.h gimpunit.h gimpunitmenu.h gimputils.h gimpvector.h gimpwidgets.h gimpintl.h
-libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimp_export_symbols)
+libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimp_export_symbols)
+libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimp_export_symbols)
libgimp_la_LIBADD = $(GLIB_LIBS) -lm
libgimp_la_LIBADD = $(GLIB_LIBS) $(libmath)
libgimp_la_DEPENDENCIES = $(gimp_def)
-libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimpui_export_symbols)
+libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimpui_export_symbols)
+libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimpui_export_symbols)
libgimpui_la_LIBADD = $(GTK_LIBS) $(conditional_libgimp_la)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ltmain.sh,v 1.1.1.1 2002/07/28 21:55:10 brad Exp $
--- ltmain.sh.orig Sun Jul 28 15:41:41 2002
+++ ltmain.sh Sun Jul 28 15:45:42 2002
@@ -1062,6 +1062,17 @@ compiler."
$OpenBSD: patch-ltmain_sh,v 1.1 2003/12/27 00:26:17 brad Exp $
--- ltmain.sh.orig Mon May 19 18:45:50 2003
+++ ltmain.sh Thu May 22 00:27:33 2003
@@ -1082,6 +1082,17 @@ compiler."
continue
;;
@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain.sh,v 1.1.1.1 2002/07/28 21:55:10 brad Exp $
-module)
module=yes
continue
@@ -1747,11 +1758,6 @@ compiler."
@@ -1767,11 +1778,6 @@ compiler."
continue
fi
@ -31,7 +31,7 @@ $OpenBSD: patch-ltmain.sh,v 1.1.1.1 2002/07/28 21:55:10 brad Exp $
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
@@ -4491,40 +4497,6 @@ relink_command=\"$relink_command\""
@@ -4569,40 +4575,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-plug-ins_common_gz_c,v 1.1 2002/12/29 00:10:47 pvalchev Exp $
--- plug-ins/common/gz.c.orig Sat Dec 28 14:57:34 2002
+++ plug-ins/common/gz.c Sat Dec 28 14:57:49 2002
$OpenBSD: patch-plug-ins_common_gz_c,v 1.2 2003/12/27 00:26:17 brad Exp $
--- plug-ins/common/gz.c.orig Tue Sep 10 10:19:52 2002
+++ plug-ins/common/gz.c Fri Feb 14 21:19:28 2003
@@ -368,7 +368,7 @@ save_image (gchar *filename,
g_message ("gz: dup2 failed: %s\n", g_strerror (errno));
@ -10,7 +10,7 @@ $OpenBSD: patch-plug-ins_common_gz_c,v 1.1 2002/12/29 00:10:47 pvalchev Exp $
g_message ("gz: exec failed: gzip: %s\n", g_strerror (errno));
g_free (tmpname);
_exit(127);
@@ -486,7 +486,7 @@ load_image (gchar *filename,
@@ -488,7 +488,7 @@ load_image (gchar *filename,
}
/* and unzip into it */

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plug-ins_libgck_gck_Makefile.in,v 1.1.1.1 2002/07/28 21:55:10 brad Exp $
--- plug-ins/libgck/gck/Makefile.in.orig Mon Feb 11 16:46:23 2002
+++ plug-ins/libgck/gck/Makefile.in Sun Jul 28 17:05:52 2002
@@ -193,7 +193,7 @@ libgck_la_SOURCES = gckcolor.c
gckinclude_HEADERS = gck.h
-libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined)
+libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined)
INCLUDES = -I.. -I$(srcdir)/.. -I$(top_srcdir) $(GTK_CFLAGS) -I$(includedir)

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-plug-ins_libgck_gck_Makefile_in,v 1.1 2003/12/27 00:26:17 brad Exp $
--- plug-ins/libgck/gck/Makefile.in.orig Mon May 19 19:07:32 2003
+++ plug-ins/libgck/gck/Makefile.in Thu May 22 09:17:41 2003
@@ -182,7 +182,7 @@ prefix = @prefix@
@OS_WIN32_TRUE@no_undefined = -no-undefined
-gckincludedir = $(includedir)/gck
+gckincludedir = $(includedir)/gimp-$(LT_RELEASE)/gck
lib_LTLIBRARIES = libgck.la
@@ -192,7 +192,7 @@ libgck_la_SOURCES = gckcolor.c
gckinclude_HEADERS = gck.h
-libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined)
+libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined)
INCLUDES = -I.. -I$(srcdir)/.. -I$(top_srcdir) $(GTK_CFLAGS) -I$(includedir)

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-plug-ins_print_print_c,v 1.1 2003/03/01 05:11:23 pvalchev Exp $
--- plug-ins/print/print.c.orig Fri Feb 28 19:57:52 2003
+++ plug-ins/print/print.c Fri Feb 28 19:58:03 2003
@@ -571,7 +571,7 @@ run (char *name, /* I - Name of print
$OpenBSD: patch-plug-ins_print_print_c,v 1.2 2003/12/27 00:26:17 brad Exp $
--- plug-ins/print/print.c.orig Fri Jul 19 20:35:02 2002
+++ plug-ins/print/print.c Tue May 20 23:56:58 2003
@@ -451,7 +451,7 @@ run (char *name, /* I - Name of print
dup2 (pipefd[0], 0);
close (pipefd[0]);
close (pipefd[1]);
- execl("/bin/sh", "/bin/sh", "-c", vars.output_to, NULL);
+ execl("/bin/sh", "/bin/sh", "-c", vars.output_to, (void *)NULL);
- execl("/bin/sh", "/bin/sh", "-c", stp_get_output_to(vars), NULL);
+ execl("/bin/sh", "/bin/sh", "-c", stp_get_output_to(vars), (void *)NULL);
/* NOTREACHED */
exit (1);
} else {

View File

@ -1,58 +0,0 @@
$OpenBSD: patch-po-libgimp_Makefile.in.in,v 1.1.1.1 2002/07/28 21:55:10 brad Exp $
--- po-libgimp/Makefile.in.in.orig Thu Jan 27 05:46:58 2000
+++ po-libgimp/Makefile.in.in Sun Jul 28 15:20:12 2002
@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
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 @@ install-data-yes: all
*) 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 \
@@ -153,12 +153,12 @@ install-data-yes: all
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 @@ uninstall:
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

View File

@ -1,58 +0,0 @@
$OpenBSD: patch-po-plug-ins_Makefile.in.in,v 1.1.1.1 2002/07/28 21:55:10 brad Exp $
--- po-plug-ins/Makefile.in.in.orig Thu Feb 3 19:19:34 2000
+++ po-plug-ins/Makefile.in.in Sun Jul 28 15:20:12 2002
@@ -18,7 +18,7 @@ VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = $(prefix)/share
localedir = $(datadir)/locale
gnulocaledir = $(prefix)/share/locale
gettextsrcdir = $(prefix)/share/gettext/po
@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
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 @@ install-data-yes: all
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 @@ uninstall:
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

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-po-plug-ins_Makefile_in_in,v 1.1 2003/12/27 00:26:17 brad Exp $
--- po-plug-ins/Makefile.in.in.orig Thu May 8 18:05:39 2003
+++ po-plug-ins/Makefile.in.in Thu May 22 00:27:33 2003
@@ -18,7 +18,7 @@ VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = $(prefix)/share
localedir = $(datadir)/locale
gnulocaledir = $(prefix)/share/locale
gettextsrcdir = $(prefix)/share/gettext/po

View File

@ -1,58 +0,0 @@
$OpenBSD: patch-po-script-fu_Makefile.in.in,v 1.1.1.1 2002/07/28 21:55:12 brad Exp $
--- po-script-fu/Makefile.in.in.orig Sat Jun 24 06:46:57 2000
+++ po-script-fu/Makefile.in.in Sun Jul 28 15:20:12 2002
@@ -118,9 +118,9 @@ install-data: install-data-@USE_NLS@
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 \
@@ -130,7 +130,7 @@ install-data-yes: all
*) 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 \
@@ -160,12 +160,12 @@ install-data-yes: all
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
@@ -178,12 +178,12 @@ uninstall:
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

View File

@ -1,14 +1,13 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.1.1.1 2002/07/28 21:55:12 brad Exp $
# $OpenBSD: DEINSTALL,v 1.2 2003/12/27 00:26:17 brad Exp $
#
# gimp de-installation
# Gimp de-installation
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=${SYSCONFDIR}/gimp
CONFIG_DIR=${CONFDIR}
if [ -d $CONFIG_DIR ]; then
if [ "$PKG_DELETE_EXTRA" != Yes -a -d $CONFIG_DIR ]; then
echo
echo "+---------------"
echo "| To completely deinstall the $1 package you need to perform"

View File

@ -1,15 +1,12 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.1.1.1 2002/07/28 21:55:12 brad Exp $
# $OpenBSD: INSTALL,v 1.2 2003/12/27 00:26:17 brad Exp $
#
# Pre/post-installation setup of gimp
# Pre/post-installation setup of Gimp
# exit on errors, use a sane path and install prefix
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=${SYSCONFDIR}/gimp
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/gimp
CONFIG_DIR=${CONFDIR}
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/gimp/1.2
do_notice()
{
@ -26,12 +23,12 @@ do_notice()
do_install()
{
install -d -o root -g wheel -m 755 $CONFIG_DIR
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/gimprc-sample $CONFIG_DIR/gimprc
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/gimprc_user-sample $CONFIG_DIR/gimprc_user
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/gtkrc-sample $CONFIG_DIR/gtkrc
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/gtkrc_user-sample $CONFIG_DIR/gtkrc_user
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/ps-menurc-sample $CONFIG_DIR/ps-menurc
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/unitrc-sample $CONFIG_DIR/unitrc
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/gimprc $CONFIG_DIR
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/gimprc_user $CONFIG_DIR
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/gtkrc $CONFIG_DIR
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/gtkrc_user $CONFIG_DIR
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/ps-menurc $CONFIG_DIR
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/unitrc $CONFIG_DIR
echo
echo "+---------------"
echo "| The $1 configuration files have been installed into"
@ -41,15 +38,11 @@ do_install()
echo
}
# verify proper execution
#
if [ $# -ne 2 ]; then
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
fi
# Verify/process the command
#
case $2 in
PRE-INSTALL)
: nothing to pre-install for this port

View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2002/07/28 21:55:19 brad Exp $
lib/gimp/modules/libcolorsel_gtk.so
lib/gimp/modules/libcolorsel_triangle.so
lib/gimp/modules/libcolorsel_water.so
lib/libgck.so.0.3
lib/libgimp.so.0.3
lib/libgimpui.so.0.3
DYNLIBDIR(%B)
@comment $OpenBSD: PFRAG.shared,v 1.2 2003/12/27 00:26:17 brad Exp $
lib/gimp/1.2/modules/libcolorsel_gtk.so
lib/gimp/1.2/modules/libcolorsel_triangle.so
lib/gimp/1.2/modules/libcolorsel_water.so
lib/libgck.so.0.5
lib/libgimp.so.0.5
lib/libgimpui.so.0.5
DYNLIBDIR(%D/lib)

File diff suppressed because it is too large Load Diff