Date: Sun, 28 Mar 1999 10:00:01 -0800 (PST) From: MANTANI Nobutaka <nobutaka@nobutaka.com> To: freebsd-ports@FreeBSD.org Subject: Re: ports/10838: Update port: graphics/gimp1-i18n Message-ID: <199903281800.KAA56732@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/10838; it has been noted by GNATS. From: MANTANI Nobutaka <nobutaka@nobutaka.com> To: nobutaka@nobutaka.com Cc: FreeBSD-gnats-submit@FreeBSD.ORG Subject: Re: ports/10838: Update port: graphics/gimp1-i18n Date: Mon, 29 Mar 1999 02:51:30 +0900 I have forgotten changing MASTER_SITES in Makefile. Please apply this patch instead of the patch in the PR. --- MANTANI Nobutaka <nobutaka@nobutaka.com> Cluster II, Faculty of Engineering, Hiroshima University, Japan diff -urN gimp1-i18n.orig/Makefile gimp1-i18n/Makefile --- gimp1-i18n.orig/Makefile Sun Mar 28 04:12:14 1999 +++ gimp1-i18n/Makefile Mon Mar 29 02:24:29 1999 @@ -6,12 +6,12 @@ # $Id: Makefile,v 1.55 1999/03/19 04:39:53 nectar Exp $ # -DISTNAME= gimp-1.1.2 -PKGNAME= gimp-i18n-1.1.2 +DISTNAME= gimp-1.1.3 +PKGNAME= gimp-i18n-1.1.3 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.2/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v1.1.2/ \ - http://www.ameth.org/gimp/pub/gimp/unstable/v1.1.2/ +MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.3/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v1.1.3/ \ + http://www.ameth.org/gimp/pub/gimp/unstable/v1.1.3/ MAINTAINER= nobutaka@nobutaka.com @@ -34,8 +34,11 @@ MAN1= gimp.1 gimptool.1 MAN3= gpc.3 +MAN5= gimprc.5 post-install: + @${INSTALL_DATA} ${WRKSRC}/plug-ins/gpc/gpc.h ${PREFIX}/include + @${INSTALL_DATA} ${WRKSRC}/plug-ins/megawidget/megawidget.h ${PREFIX}/include @${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib @${CAT} ${PKGDIR}/MESSAGE diff -urN gimp1-i18n.orig/files/md5 gimp1-i18n/files/md5 --- gimp1-i18n.orig/files/md5 Sun Mar 28 04:12:13 1999 +++ gimp1-i18n/files/md5 Fri Mar 26 16:57:07 1999 @@ -1 +1 @@ -MD5 (gimp-1.1.2.tar.gz) = 806e4cca53e056a0d78492ba436fd8ac +MD5 (gimp-1.1.3.tar.gz) = d0d8a9e32441b971eb7fadf98224eb94 diff -urN gimp1-i18n.orig/patches/patch-ac gimp1-i18n/patches/patch-ac --- gimp1-i18n.orig/patches/patch-ac Sun Mar 28 04:12:13 1999 +++ gimp1-i18n/patches/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,246 +0,0 @@ ---- plug-ins/gpc/Makefile.am.orig Wed Nov 18 06:14:51 1998 -+++ plug-ins/gpc/Makefile.am Sat Feb 20 17:31:16 1999 -@@ -1,11 +1,14 @@ - ## Process this file with automake to produce Makefile.in - - pluginlibdir = $(libdir) -+gimpincludedir = $(includedir) - - pluginlib_LIBRARIES = libgpc.a - - libgpc_a_SOURCES = \ -- gpc.c \ -+ gpc.c -+ -+gimpinclude_HEADERS = \ - gpc.h - - INCLUDES = \ ---- plug-ins/gpc/Makefile.in.orig Thu Feb 4 11:21:25 1999 -+++ plug-ins/gpc/Makefile.in Sat Feb 20 17:33:30 1999 -@@ -162,10 +162,14 @@ - prefix = @prefix@ - - pluginlibdir = $(libdir) -+gimpincludedir = $(includedir) - - pluginlib_LIBRARIES = libgpc.a - --libgpc_a_SOURCES = gpc.c gpc.h -+libgpc_a_SOURCES = gpc.c -+ -+ -+gimpinclude_HEADERS = gpc.h - - - INCLUDES = -I$(top_srcdir) $(GTK_CFLAGS) -I$(includedir) -@@ -201,6 +205,8 @@ - MANS = $(man_MANS) - - NROFF = nroff -+HEADERS = $(gimpinclude_HEADERS) -+ - DIST_COMMON = Makefile.am Makefile.in - - -@@ -208,6 +214,7 @@ - - TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/gpc.P - SOURCES = $(libgpc_a_SOURCES) - OBJECTS = $(libgpc_a_OBJECTS) - -@@ -215,9 +222,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .s - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gpc/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gpc/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -254,9 +261,6 @@ - rm -f $(DESTDIR)$(pluginlibdir)/$$p; \ - done - --.c.o: -- $(COMPILE) -c $< -- - .s.o: - $(COMPILE) -c $< - -@@ -273,9 +277,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -336,6 +337,21 @@ - @$(NORMAL_UNINSTALL) - $(MAKE) $(AM_MAKEFLAGS) uninstall-man3 - -+install-gimpincludeHEADERS: $(gimpinclude_HEADERS) -+ @$(NORMAL_INSTALL) -+ $(mkinstalldirs) $(DESTDIR)$(gimpincludedir) -+ @list='$(gimpinclude_HEADERS)'; for p in $$list; do \ -+ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ -+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gimpincludedir)/$$p"; \ -+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gimpincludedir)/$$p; \ -+ done -+ -+uninstall-gimpincludeHEADERS: -+ @$(NORMAL_UNINSTALL) -+ list='$(gimpinclude_HEADERS)'; for p in $$list; do \ -+ rm -f $(DESTDIR)$(gimpincludedir)/$$p; \ -+ done -+ - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) -@@ -370,6 +386,11 @@ - subdir = plug-ins/gpc - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu plug-ins/gpc/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -380,10 +401,38 @@ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done --gpc.o: gpc.c ../../libgimp/gimp.h ../../libgimp/gimpenums.h \ -- ../../libgimp/gimpfeatures.h ../../libgimp/parasite.h \ -- ../../libgimp/parasiteF.h ../../libgimp/parasiteP.h - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -395,20 +444,23 @@ - install-exec-am: - install-exec: install-exec-am - --install-data-am: install-pluginlibLIBRARIES install-man -+install-data-am: install-pluginlibLIBRARIES install-man \ -+ install-gimpincludeHEADERS - install-data: install-data-am - - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-am --uninstall-am: uninstall-pluginlibLIBRARIES uninstall-man -+uninstall-am: uninstall-pluginlibLIBRARIES uninstall-man \ -+ uninstall-gimpincludeHEADERS - uninstall: uninstall-am --all-am: Makefile $(LIBRARIES) $(MANS) -+all-am: Makefile $(LIBRARIES) $(MANS) $(HEADERS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 -+ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 \ -+ $(DESTDIR)$(gimpincludedir) - - - mostlyclean-generic: -@@ -421,27 +473,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-pluginlibLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-pluginlibLIBRARIES clean-compile clean-libtool \ -- clean-tags clean-generic mostlyclean-am -+ clean-tags clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-pluginlibLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-pluginlibLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -453,13 +505,15 @@ - mostlyclean-compile distclean-compile clean-compile \ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ - clean-libtool maintainer-clean-libtool install-man3 uninstall-man3 \ --install-man uninstall-man tags mostlyclean-tags distclean-tags \ --clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ --check-am installcheck-am installcheck install-exec-am install-exec \ --install-data-am install-data install-am install uninstall-am uninstall \ --all-redirect all-am all installdirs mostlyclean-generic \ --distclean-generic clean-generic maintainer-clean-generic clean \ --mostlyclean distclean maintainer-clean -+install-man uninstall-man uninstall-gimpincludeHEADERS \ -+install-gimpincludeHEADERS tags mostlyclean-tags distclean-tags \ -+clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -+distclean-depend clean-depend maintainer-clean-depend info-am info \ -+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -+install-exec install-data-am install-data install-am install \ -+uninstall-am uninstall all-redirect all-am all installdirs \ -+mostlyclean-generic distclean-generic clean-generic \ -+maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - - .PHONY: files diff -urN gimp1-i18n.orig/patches/patch-ad gimp1-i18n/patches/patch-ad --- gimp1-i18n.orig/patches/patch-ad Sun Mar 28 04:12:13 1999 +++ gimp1-i18n/patches/patch-ad Fri Mar 26 17:27:23 1999 @@ -1,16 +1,16 @@ ---- app/Makefile.in.orig Sat Feb 20 18:05:08 1999 -+++ app/Makefile.in Sat Feb 20 18:07:40 1999 +--- app/Makefile.in.orig Tue Mar 9 09:58:40 1999 ++++ app/Makefile.in Fri Mar 26 17:20:32 1999 @@ -174,7 +174,7 @@ - EXTRA_DIST = tools/anchor.xpm tools/channel.xbm tools/delete.xpm tools/duplicate.xpm tools/eye.xbm tools/layer.xbm tools/linked.xbm tools/lower.xpm tools/mask.xbm tools/new.xpm tools/raise.xpm + EXTRA_DIST = tools/anchor.xpm tools/channel.xbm tools/delete.xpm tools/duplicate.xpm tools/eye.xbm tools/layer.xbm tools/linked.xbm tools/lower.xpm tools/mask.xbm tools/new.xpm tools/raise.xpm tools/penadd.xpm tools/pendel.xpm tools/penedit.xpm tools/pennorm.xpm tools/penstroke.xpm tools/ptoselection.xpm makefile.msc gimp.def gimp.rc wilber.ico --CPPFLAGS = -DLIBDIR=\""$(gimpplugindir)"\" -DDATADIR=\""$(gimpdatadir)"\" -DGIMPDIR=\""$(gimpdir)"\" -DLOCALEDIR=\""$(localedir)"\" -DREGEX_MALLOC @GIMP_THREAD_FLAGS@ -+CPPFLAGS = -DLIBDIR=\""$(gimpplugindir)"\" -DDATADIR=\""$(gimpdatadir)"\" -DGIMPDIR=\""$(gimpdir)"\" -DLOCALEDIR=\""$(localedir)"\" -DREGEX_MALLOC @GIMP_THREAD_FLAGS@ -I/usr/local/include +-CPPFLAGS = -DLIBDIR=\""$(gimpplugindir)"\" -DLOCALEDIR=\""$(localedir)"\" -DREGEX_MALLOC @GIMP_THREAD_FLAGS@ ++CPPFLAGS = -DLIBDIR=\""$(gimpplugindir)"\" -DLOCALEDIR=\""$(localedir)"\" -DREGEX_MALLOC @GIMP_THREAD_FLAGS@ -I/usr/local/include INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/intl $(GTK_CFLAGS) -I$(includedir) ---- po/Makefile.in.in.orig Sat Feb 20 23:41:05 1999 -+++ po/Makefile.in.in Sat Feb 20 23:41:18 1999 +--- po/Makefile.in.in.orig Fri Mar 26 17:26:20 1999 ++++ po/Makefile.in.in Fri Mar 26 17:26:58 1999 @@ -18,7 +18,7 @@ prefix = @prefix@ diff -urN gimp1-i18n.orig/patches/patch-ah gimp1-i18n/patches/patch-ah --- gimp1-i18n.orig/patches/patch-ah Sun Mar 28 04:12:14 1999 +++ gimp1-i18n/patches/patch-ah Sat Mar 27 04:31:00 1999 @@ -1,28 +1,32 @@ ---- configure.in.orig Thu Feb 4 08:37:10 1999 -+++ configure.in Sun Feb 21 00:11:35 1999 -@@ -441,7 +441,7 @@ +--- configure.in.orig Tue Mar 9 05:07:41 1999 ++++ configure.in Sat Mar 27 04:29:04 1999 +@@ -449,8 +449,8 @@ fi gimpdatadir=$datadir/gimp -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION +-localedir='${prefix}/${DATADIRNAME}/locale' +gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION - localedir=$datadir/locale ++localedir='${prefix}/share/locale' brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` ---- configure.orig Thu Feb 4 08:38:47 1999 -+++ configure Sun Feb 21 00:11:46 1999 -@@ -7254,7 +7254,7 @@ + gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile` +--- configure.orig Tue Mar 9 06:22:49 1999 ++++ configure Sat Mar 27 04:29:44 1999 +@@ -7459,8 +7459,8 @@ fi gimpdatadir=$datadir/gimp -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION +-localedir='${prefix}/${DATADIRNAME}/locale' +gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION - localedir=$datadir/locale ++localedir='${prefix}/share/locale' brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` ---- Makefile.in.orig Sat Feb 20 23:45:16 1999 -+++ Makefile.in Sun Feb 21 00:12:00 1999 -@@ -530,7 +530,7 @@ + gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile` +--- Makefile.in.orig Tue Mar 9 09:58:27 1999 ++++ Makefile.in Sat Mar 27 02:30:37 1999 +@@ -566,7 +566,7 @@ install-exec: install-exec-recursive install-data-am: install-gimpdataSCRIPTS install-man \ diff -urN gimp1-i18n.orig/patches/patch-ai gimp1-i18n/patches/patch-ai --- gimp1-i18n.orig/patches/patch-ai Sun Mar 28 04:12:14 1999 +++ gimp1-i18n/patches/patch-ai Thu Jan 1 09:00:00 1970 @@ -1,234 +0,0 @@ ---- plug-ins/megawidget/Makefile.am.orig Mon Sep 21 07:02:58 1998 -+++ plug-ins/megawidget/Makefile.am Sat Feb 20 17:35:15 1999 -@@ -1,11 +1,14 @@ - ## Process this file with automake to produce Makefile.in - - pluginlibdir = $(libdir) -+gimpincludedir = $(includedir) - - pluginlib_LIBRARIES = libmegawidget.a - - libmegawidget_a_SOURCES = \ -- megawidget.c \ -+ megawidget.c -+ -+gimpinclude_HEADERS = \ - megawidget.h - - INCLUDES = \ ---- plug-ins/megawidget/Makefile.in.orig Thu Feb 4 11:21:21 1999 -+++ plug-ins/megawidget/Makefile.in Sat Feb 20 17:35:33 1999 -@@ -162,10 +162,14 @@ - prefix = @prefix@ - - pluginlibdir = $(libdir) -+gimpincludedir = $(includedir) - - pluginlib_LIBRARIES = libmegawidget.a - --libmegawidget_a_SOURCES = megawidget.c megawidget.h -+libmegawidget_a_SOURCES = megawidget.c -+ -+ -+gimpinclude_HEADERS = megawidget.h - - - INCLUDES = -I$(top_srcdir) $(GTK_CFLAGS) -I$(includedir) -@@ -193,6 +197,8 @@ - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+HEADERS = $(gimpinclude_HEADERS) -+ - DIST_COMMON = Makefile.am Makefile.in - - -@@ -200,6 +206,7 @@ - - TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/megawidget.P - SOURCES = $(libmegawidget_a_SOURCES) - OBJECTS = $(libmegawidget_a_OBJECTS) - -@@ -207,9 +214,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .s - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/megawidget/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/megawidget/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -246,9 +253,6 @@ - rm -f $(DESTDIR)$(pluginlibdir)/$$p; \ - done - --.c.o: -- $(COMPILE) -c $< -- - .s.o: - $(COMPILE) -c $< - -@@ -265,9 +269,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -289,6 +290,21 @@ - $(AR) cru libmegawidget.a $(libmegawidget_a_OBJECTS) $(libmegawidget_a_LIBADD) - $(RANLIB) libmegawidget.a - -+install-gimpincludeHEADERS: $(gimpinclude_HEADERS) -+ @$(NORMAL_INSTALL) -+ $(mkinstalldirs) $(DESTDIR)$(gimpincludedir) -+ @list='$(gimpinclude_HEADERS)'; for p in $$list; do \ -+ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ -+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gimpincludedir)/$$p"; \ -+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gimpincludedir)/$$p; \ -+ done -+ -+uninstall-gimpincludeHEADERS: -+ @$(NORMAL_UNINSTALL) -+ list='$(gimpinclude_HEADERS)'; for p in $$list; do \ -+ rm -f $(DESTDIR)$(gimpincludedir)/$$p; \ -+ done -+ - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) -@@ -323,6 +339,11 @@ - subdir = plug-ins/megawidget - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu plug-ins/megawidget/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -333,11 +354,38 @@ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done --megawidget.o: megawidget.c ../../libgimp/gimp.h \ -- ../../libgimp/gimpenums.h ../../libgimp/gimpfeatures.h \ -- ../../libgimp/parasite.h ../../libgimp/parasiteF.h \ -- ../../libgimp/parasiteP.h megawidget.h - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -349,20 +397,20 @@ - install-exec-am: - install-exec: install-exec-am - --install-data-am: install-pluginlibLIBRARIES -+install-data-am: install-pluginlibLIBRARIES install-gimpincludeHEADERS - install-data: install-data-am - - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-am --uninstall-am: uninstall-pluginlibLIBRARIES -+uninstall-am: uninstall-pluginlibLIBRARIES uninstall-gimpincludeHEADERS - uninstall: uninstall-am --all-am: Makefile $(LIBRARIES) -+all-am: Makefile $(LIBRARIES) $(HEADERS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) -+ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) $(DESTDIR)$(gimpincludedir) - - - mostlyclean-generic: -@@ -375,27 +423,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-pluginlibLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-pluginlibLIBRARIES clean-compile clean-libtool \ -- clean-tags clean-generic mostlyclean-am -+ clean-tags clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-pluginlibLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-pluginlibLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -406,8 +454,10 @@ - uninstall-pluginlibLIBRARIES install-pluginlibLIBRARIES \ - mostlyclean-compile distclean-compile clean-compile \ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ --clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ --distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -+clean-libtool maintainer-clean-libtool uninstall-gimpincludeHEADERS \ -+install-gimpincludeHEADERS tags mostlyclean-tags distclean-tags \ -+clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -+distclean-depend clean-depend maintainer-clean-depend info-am info \ - dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ - install-exec install-data-am install-data install-am install \ - uninstall-am uninstall all-redirect all-am all installdirs \ diff -urN gimp1-i18n.orig/patches/patch-ap gimp1-i18n/patches/patch-ap --- gimp1-i18n.orig/patches/patch-ap Thu Jan 1 09:00:00 1970 +++ gimp1-i18n/patches/patch-ap Fri Mar 26 18:54:13 1999 @@ -0,0 +1,20 @@ +--- libgimp/Makefile.in.orig Fri Mar 26 17:45:23 1999 ++++ libgimp/Makefile.in Fri Mar 26 18:51:33 1999 +@@ -165,7 +165,7 @@ + CPPFLAGS = -DGIMPDIR=\""$(gimpdir)"\" -DDATADIR=\""$(gimpdatadir)"\" @GIMP_THREAD_FLAGS@ + + +-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/intl -I../intl $(GTK_CFLAGS) -I$(includedir) ++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/intl -I../intl $(GTK_CFLAGS) -I$(includedir) -I/usr/local/include + + + EXTRA_DIST = chain.xpm gimpfeatures.h.in makefile.msc gimp.def gimpi.def gimpui.def gimpfeatures.h.win32 +@@ -190,7 +190,7 @@ + + libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) + +-libgimp_la_LIBADD = $(GLIB_LIBS) -lm ++libgimp_la_LIBADD = $(GTK_LIBS) -lm + + libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) + diff -urN gimp1-i18n.orig/pkg/PLIST gimp1-i18n/pkg/PLIST --- gimp1-i18n.orig/pkg/PLIST Sun Mar 28 04:12:13 1999 +++ gimp1-i18n/pkg/PLIST Sun Mar 28 04:10:57 1999 @@ -14,38 +14,41 @@ include/gck/gckvector.h include/libgimp/color_selector.h include/libgimp/gimp.h -include/libgimp/gimpentry.h +include/libgimp/gimpchainbutton.h include/libgimp/gimpenums.h +include/libgimp/gimpenv.h include/libgimp/gimpfeatures.h include/libgimp/gimpintl.h include/libgimp/gimpmatrix.h include/libgimp/gimpmenu.h include/libgimp/gimpmodule.h +include/libgimp/gimpsizeentry.h include/libgimp/gimpui.h +include/libgimp/gimpunit.h +include/libgimp/gimpunitmenu.h include/libgimp/gserialize.h include/libgimp/parasite.h include/libgimp/parasiteF.h include/libgimp/parasiteP.h -lib/libgck-1.1.so.2 +lib/libgck-1.1.so.3 lib/libgck.a lib/libgck.la -lib/libgck.so.2 -lib/libgimp-1.1.so.2 +lib/libgimp-1.1.so.3 lib/libgimp.a lib/libgimp.la -lib/libgimp.so.2 -lib/libgimpui-1.1.so.2 +lib/libgimpui-1.1.so.3 lib/libgimpui.a lib/libgimpui.la -lib/libgimpui.so.2 lib/libgpc.a lib/libmegawidget.a @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B libexec/gimp/1.1/modules/libcolorsel_gtk.a libexec/gimp/1.1/modules/libcolorsel_gtk.la +libexec/gimp/1.1/modules/libcolorsel_gtk.so.0 libexec/gimp/1.1/modules/libcolorsel_triangle.a libexec/gimp/1.1/modules/libcolorsel_triangle.la +libexec/gimp/1.1/modules/libcolorsel_triangle.so.0 libexec/gimp/1.1/plug-ins/AlienMap libexec/gimp/1.1/plug-ins/CEL libexec/gimp/1.1/plug-ins/CML_explorer @@ -232,6 +235,7 @@ share/gimp/gfig/sprial share/gimp/gfig/star2 share/gimp/gfig/stars +share/gimp/gimprc.5 share/gimp/gradients/Abstract_1 share/gimp/gradients/Abstract_2 share/gimp/gradients/Abstract_3 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199903281800.KAA56732>