diff options
| author | vanilla <vanilla@FreeBSD.org> | 1998-05-28 02:36:05 +0800 |
|---|---|---|
| committer | vanilla <vanilla@FreeBSD.org> | 1998-05-28 02:36:05 +0800 |
| commit | f03f149bd0ec12ad6327ba98c67a9eb72c2cf91a (patch) | |
| tree | fd308a5b64ab631bee9c48ac5d15a1c49d960eb0 | |
| parent | 2731b9a019078be34e453c8980eef74311b89fb0 (diff) | |
| download | freebsd-ports-gnome-f03f149bd0ec12ad6327ba98c67a9eb72c2cf91a.tar.gz freebsd-ports-gnome-f03f149bd0ec12ad6327ba98c67a9eb72c2cf91a.tar.zst freebsd-ports-gnome-f03f149bd0ec12ad6327ba98c67a9eb72c2cf91a.zip | |
1. Merge patch-ah & patch-ai to one file.
2. Add two manpages (gimptool.1 & gpc.3)
3. Remove tiff34 configure patch.
4. Correct pkg/PLIST.
5. Remove LIB_DEPENDS on xdelta, because we can't compile it on current.
24 files changed, 2244 insertions, 906 deletions
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile index 8e2419dec35d..ea01d9bf4c35 100644 --- a/graphics/gimp-app-devel/Makefile +++ b/graphics/gimp-app-devel/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Nov 18 21:28:43 CST 1996 # Whom: erich@FreeBSD.org # -# $Id: Makefile,v 1.31 1998/05/19 03:09:09 jdp Exp $ +# $Id: Makefile,v 1.32 1998/05/21 21:28:51 mph Exp $ # MAJOR= 0 @@ -26,11 +26,11 @@ MAINTAINER= erich@FreeBSD.org LIB_DEPENDS+= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm LIB_DEPENDS+= aa\\.1\\.:${PORTSDIR}/graphics/aalib LIB_DEPENDS+= jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg -LIB_DEPENDS+= gtk\\.1\\.2:${PORTSDIR}/x11/gtk +LIB_DEPENDS+= gtk\\.1\\.3:${PORTSDIR}/x11/gtk LIB_DEPENDS+= mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib LIB_DEPENDS+= png\\.2\\.:${PORTSDIR}/graphics/png LIB_DEPENDS+= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 -LIB_DEPENDS+= xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta +#LIB_DEPENDS+= xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta USE_X11= yes GNU_CONFIGURE= yes @@ -40,7 +40,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/tiff34" \ LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755' -MAN1= gimp.1 +MAN1= gimp.1 gimptool.1 +MAN3= gpc.3 DATASTUFF= brushes palettes gradients patterns diff --git a/graphics/gimp-app-devel/files/patch-ac b/graphics/gimp-app-devel/files/patch-ac new file mode 100644 index 000000000000..29a131ca3e9f --- /dev/null +++ b/graphics/gimp-app-devel/files/patch-ac @@ -0,0 +1,225 @@ +--- plug-ins/gpc/Makefile.am.orig Wed May 27 23:47:43 1998 ++++ plug-ins/gpc/Makefile.am Wed May 27 23:48:43 1998 +@@ -1,11 +1,15 @@ + ## Process this file with automake to produce Makefile.in + +-pluginlibdir = $(gimpplugindir)/plug-ins ++pluginlibdir = $(libdir) ++gimpincludedir = $(includedir) + + pluginlib_LIBRARIES = libgpc.a + + libgpc_a_SOURCES = \ +- gpc.c gpc.h ++ gpc.c ++ ++gimpinclude_HEADERS = \ ++ gpc.h + + INCLUDES = \ + $(X_CFLAGS) \ +--- plug-ins/gpc/Makefile.in.orig Wed May 27 23:47:45 1998 ++++ plug-ins/gpc/Makefile.in Wed May 27 23:48:52 1998 +@@ -115,12 +115,16 @@ + palettedata = @palettedata@ + patterndata = @patterndata@ + +-pluginlibdir = $(gimpplugindir)/plug-ins ++pluginlibdir = $(libdir) ++gimpincludedir = $(includedir) + + pluginlib_LIBRARIES = libgpc.a + + libgpc_a_SOURCES = \ +- gpc.c gpc.h ++ gpc.c ++ ++gimpinclude_HEADERS = \ ++ gpc.h + + INCLUDES = \ + $(X_CFLAGS) \ +@@ -163,6 +167,8 @@ + MANS = $(man_MANS) + + NROFF = nroff ++HEADERS = $(gimpinclude_HEADERS) ++ + DIST_COMMON = Makefile.am Makefile.in + + +@@ -170,17 +176,18 @@ + + TAR = tar + GZIP = --best ++DEP_FILES = .deps/gpc.P + SOURCES = $(libgpc_a_SOURCES) + OBJECTS = $(libgpc_a_OBJECTS) + +-all: Makefile $(LIBRARIES) $(MANS) ++all: Makefile $(LIBRARIES) $(MANS) $(HEADERS) + + .SUFFIXES: + .SUFFIXES: .S .c .lo .o .s + $(srcdir)/Makefile.in: @MAINT@ 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 + +@@ -217,9 +224,6 @@ + rm -f $(DESTDIR)$(pluginlibdir)/$$p; \ + done + +-.c.o: +- $(COMPILE) -c $< +- + .s.o: + $(COMPILE) -c $< + +@@ -236,9 +240,6 @@ + + maintainer-clean-compile: + +-.c.lo: +- $(LIBTOOL) --mode=compile $(COMPILE) -c $< +- + .s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +@@ -299,6 +300,21 @@ + @$(NORMAL_UNINSTALL) + $(MAKE) 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) +@@ -329,6 +345,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); \ + test -f $(distdir)/$$file \ +@@ -336,6 +357,29 @@ + || cp -p $$d/$$file $(distdir)/$$file; \ + done + ++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) ++ ++-include $(DEP_FILES) ++ ++mostlyclean-depend: ++ ++clean-depend: ++ ++distclean-depend: ++ ++maintainer-clean-depend: ++ -rm -rf .deps ++ ++%.o: %.c ++ @echo '$(COMPILE) -c $<'; \ ++ $(COMPILE) -Wp,-MD,.deps/$(*F).P -c $< ++ ++%.lo: %.c ++ @echo '$(LTCOMPILE) -c $<'; \ ++ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $< ++ @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \ ++ < .deps/$(*F).p > .deps/$(*F).P ++ @-rm -f .deps/$(*F).p + info: + dvi: + check: all +@@ -344,18 +388,19 @@ + install-exec: + @$(NORMAL_INSTALL) + +-install-data: install-pluginlibLIBRARIES install-man ++install-data: install-pluginlibLIBRARIES install-man install-gimpincludeHEADERS + @$(NORMAL_INSTALL) + + install: install-exec install-data all + @: + +-uninstall: uninstall-pluginlibLIBRARIES uninstall-man ++uninstall: uninstall-pluginlibLIBRARIES uninstall-man uninstall-gimpincludeHEADERS + + install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + installdirs: +- $(mkinstalldirs) $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 ++ $(mkinstalldirs) $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 \ ++ $(DATADIR)$(gimpincludedir) + + + mostlyclean-generic: +@@ -373,22 +418,22 @@ + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + mostlyclean: mostlyclean-pluginlibLIBRARIES mostlyclean-compile \ +- mostlyclean-libtool mostlyclean-tags \ ++ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic + + clean: clean-pluginlibLIBRARIES clean-compile clean-libtool clean-tags \ +- clean-generic mostlyclean ++ clean-depend clean-generic mostlyclean + + distclean: distclean-pluginlibLIBRARIES distclean-compile \ +- distclean-libtool distclean-tags distclean-generic \ +- clean ++ distclean-libtool distclean-tags distclean-depend \ ++ distclean-generic clean + -rm -f config.status + -rm -f libtool + + maintainer-clean: maintainer-clean-pluginlibLIBRARIES \ + maintainer-clean-compile maintainer-clean-libtool \ +- maintainer-clean-tags maintainer-clean-generic \ +- distclean ++ maintainer-clean-tags maintainer-clean-depend \ ++ maintainer-clean-generic distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +@@ -398,10 +443,12 @@ + 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 dvi installcheck \ +-install-exec install-data install uninstall all installdirs \ +-mostlyclean-generic distclean-generic clean-generic \ ++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 dvi \ ++installcheck install-exec install-data install uninstall all \ ++installdirs mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + diff --git a/graphics/gimp-app-devel/files/patch-ah b/graphics/gimp-app-devel/files/patch-ah index a019dd5a4238..b5a2a29dcd04 100644 --- a/graphics/gimp-app-devel/files/patch-ah +++ b/graphics/gimp-app-devel/files/patch-ah @@ -1,29 +1,22 @@ ---- configure.in.orig Sun May 17 01:16:39 1998 -+++ configure.in Sun May 17 16:04:23 1998 -@@ -117,13 +117,13 @@ - - dnl Test for libtiff - if test -z "$LIBTIFF_LIB"; then -- AC_CHECK_LIB(tiff, TIFFReadScanline, -+ AC_CHECK_LIB(tiff34, TIFFReadScanline, - AC_CHECK_HEADER(tiffio.h, -- TIFF='tiff'; LIBTIFF_LIB='-ltiff', -+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34', - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)), -- AC_CHECK_LIB(tiff, TIFFWriteScanline, -+ AC_CHECK_LIB(tiff34, TIFFWriteScanline, - AC_CHECK_HEADER(tiffio.h, -- TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz', -+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz', - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)), - AC_CHECK_LIB(tiff34, TIFFFlushData, - AC_CHECK_HEADER(tiffio.h, +--- configure.in.orig Wed May 27 23:32:15 1998 ++++ configure.in Wed May 27 23:32:30 1998 @@ -306,7 +306,7 @@ LIBS="$gimp_save_LIBS" gimpdatadir=$datadir/gimp -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION -++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER ++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION + + brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` + gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile` +--- configure.orig Wed May 27 23:32:17 1998 ++++ configure Wed May 27 23:32:38 1998 +@@ -4146,7 +4146,7 @@ + LIBS="$gimp_save_LIBS" + + gimpdatadir=$datadir/gimp +-gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION ++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile` diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist index 5339ab517bc3..8dd716d230c0 100644 --- a/graphics/gimp-app-devel/pkg-plist +++ b/graphics/gimp-app-devel/pkg-plist @@ -1,4 +1,6 @@ bin/gimp +bin/gimptool +include/gpc.h include/megawidget.h include/gck/gck.h include/gck/gckcolor.h @@ -25,133 +27,134 @@ lib/libgimpui.a lib/libgimpui.la lib/libgimpui.so lib/libgimpui.so.1.0 +lib/libgpc.a lib/libmegawidget.a -libexec/gimp/plug-ins/AlienMap -libexec/gimp/plug-ins/CEL -libexec/gimp/plug-ins/CML_explorer -libexec/gimp/plug-ins/MapObject -libexec/gimp/plug-ins/aa -libexec/gimp/plug-ins/align_layers -libexec/gimp/plug-ins/animationplay -libexec/gimp/plug-ins/animoptimize -libexec/gimp/plug-ins/apply_lens -libexec/gimp/plug-ins/autocrop -libexec/gimp/plug-ins/autostretch_hsv -libexec/gimp/plug-ins/blinds -libexec/gimp/plug-ins/blur -libexec/gimp/plug-ins/bmp -libexec/gimp/plug-ins/bumpmap -libexec/gimp/plug-ins/bz2 -libexec/gimp/plug-ins/c_astretch -libexec/gimp/plug-ins/checkerboard -libexec/gimp/plug-ins/colorify -libexec/gimp/plug-ins/compose -libexec/gimp/plug-ins/convmatrix -libexec/gimp/plug-ins/cubism -libexec/gimp/plug-ins/dbbrowser -libexec/gimp/plug-ins/decompose -libexec/gimp/plug-ins/deinterlace -libexec/gimp/plug-ins/depthmerge -libexec/gimp/plug-ins/despeckle -libexec/gimp/plug-ins/destripe -libexec/gimp/plug-ins/diffraction -libexec/gimp/plug-ins/displace -libexec/gimp/plug-ins/edge -libexec/gimp/plug-ins/emboss -libexec/gimp/plug-ins/engrave -libexec/gimp/plug-ins/exchange -libexec/gimp/plug-ins/faxg3 -libexec/gimp/plug-ins/film -libexec/gimp/plug-ins/fits -libexec/gimp/plug-ins/flame -libexec/gimp/plug-ins/flarefx -libexec/gimp/plug-ins/fractaltrace -libexec/gimp/plug-ins/gauss_iir -libexec/gimp/plug-ins/gauss_rle -libexec/gimp/plug-ins/gbr -libexec/gimp/plug-ins/gfig -libexec/gimp/plug-ins/gfli -libexec/gimp/plug-ins/gee -libexec/gimp/plug-ins/gicon -libexec/gimp/plug-ins/gif -libexec/gimp/plug-ins/glasstile -libexec/gimp/plug-ins/gqbist -libexec/gimp/plug-ins/gradmap -libexec/gimp/plug-ins/grid -libexec/gimp/plug-ins/gtm -libexec/gimp/plug-ins/gz -libexec/gimp/plug-ins/header -libexec/gimp/plug-ins/hot -libexec/gimp/plug-ins/hrz -libexec/gimp/plug-ins/ifscompose -libexec/gimp/plug-ins/illusion -libexec/gimp/plug-ins/iwarp -libexec/gimp/plug-ins/jpeg -libexec/gimp/plug-ins/laplace -libexec/gimp/plug-ins/libgpc.a -libexec/gimp/plug-ins/mail -libexec/gimp/plug-ins/max_rgb -libexec/gimp/plug-ins/maze -libexec/gimp/plug-ins/mblur -libexec/gimp/plug-ins/mosaic -libexec/gimp/plug-ins/mpeg -libexec/gimp/plug-ins/nlfilt -libexec/gimp/plug-ins/noisify -libexec/gimp/plug-ins/normalize -libexec/gimp/plug-ins/nova -libexec/gimp/plug-ins/oilify -libexec/gimp/plug-ins/pagecurl -libexec/gimp/plug-ins/palette -libexec/gimp/plug-ins/papertile -libexec/gimp/plug-ins/pat -libexec/gimp/plug-ins/pcx -libexec/gimp/plug-ins/pix -libexec/gimp/plug-ins/pixelize -libexec/gimp/plug-ins/plasma -libexec/gimp/plug-ins/png -libexec/gimp/plug-ins/pnm -libexec/gimp/plug-ins/polar -libexec/gimp/plug-ins/print -libexec/gimp/plug-ins/ps -libexec/gimp/plug-ins/psd -libexec/gimp/plug-ins/randomize -libexec/gimp/plug-ins/ripple -libexec/gimp/plug-ins/rotate -libexec/gimp/plug-ins/rotators -libexec/gimp/plug-ins/scatter_hsv -libexec/gimp/plug-ins/screenshot -libexec/gimp/plug-ins/script-fu -libexec/gimp/plug-ins/semiflatten -libexec/gimp/plug-ins/sgi -libexec/gimp/plug-ins/sharpen -libexec/gimp/plug-ins/shift -libexec/gimp/plug-ins/sinus -libexec/gimp/plug-ins/smooth_palette -libexec/gimp/plug-ins/snoise -libexec/gimp/plug-ins/snp -libexec/gimp/plug-ins/sobel -libexec/gimp/plug-ins/sparkle -libexec/gimp/plug-ins/spread -libexec/gimp/plug-ins/struc -libexec/gimp/plug-ins/sunras -libexec/gimp/plug-ins/tga -libexec/gimp/plug-ins/threshold_alpha -libexec/gimp/plug-ins/tiff -libexec/gimp/plug-ins/tile -libexec/gimp/plug-ins/tileit -libexec/gimp/plug-ins/tiler -libexec/gimp/plug-ins/url -libexec/gimp/plug-ins/video -libexec/gimp/plug-ins/vinvert -libexec/gimp/plug-ins/vpropagate -libexec/gimp/plug-ins/waves -libexec/gimp/plug-ins/webbrowser -libexec/gimp/plug-ins/whirlpinch -libexec/gimp/plug-ins/xd -libexec/gimp/plug-ins/xpm -libexec/gimp/plug-ins/xwd -libexec/gimp/plug-ins/zealouscrop +libexec/gimp/0.99/plug-ins/AlienMap +libexec/gimp/0.99/plug-ins/CEL +libexec/gimp/0.99/plug-ins/CML_explorer +libexec/gimp/0.99/plug-ins/MapObject +libexec/gimp/0.99/plug-ins/aa +libexec/gimp/0.99/plug-ins/align_layers +libexec/gimp/0.99/plug-ins/animationplay +libexec/gimp/0.99/plug-ins/animoptimize +libexec/gimp/0.99/plug-ins/apply_lens +libexec/gimp/0.99/plug-ins/autocrop +libexec/gimp/0.99/plug-ins/autostretch_hsv +libexec/gimp/0.99/plug-ins/blinds +libexec/gimp/0.99/plug-ins/blur +libexec/gimp/0.99/plug-ins/bmp +libexec/gimp/0.99/plug-ins/bumpmap +libexec/gimp/0.99/plug-ins/bz2 +libexec/gimp/0.99/plug-ins/c_astretch +libexec/gimp/0.99/plug-ins/checkerboard +libexec/gimp/0.99/plug-ins/colorify +libexec/gimp/0.99/plug-ins/compose +libexec/gimp/0.99/plug-ins/convmatrix +libexec/gimp/0.99/plug-ins/cubism +libexec/gimp/0.99/plug-ins/dbbrowser +libexec/gimp/0.99/plug-ins/decompose +libexec/gimp/0.99/plug-ins/deinterlace +libexec/gimp/0.99/plug-ins/depthmerge +libexec/gimp/0.99/plug-ins/despeckle +libexec/gimp/0.99/plug-ins/destripe +libexec/gimp/0.99/plug-ins/diffraction +libexec/gimp/0.99/plug-ins/displace +libexec/gimp/0.99/plug-ins/edge +libexec/gimp/0.99/plug-ins/emboss +libexec/gimp/0.99/plug-ins/engrave +libexec/gimp/0.99/plug-ins/exchange +libexec/gimp/0.99/plug-ins/faxg3 +libexec/gimp/0.99/plug-ins/film +libexec/gimp/0.99/plug-ins/fits +libexec/gimp/0.99/plug-ins/flame +libexec/gimp/0.99/plug-ins/flarefx +libexec/gimp/0.99/plug-ins/fractaltrace +libexec/gimp/0.99/plug-ins/gauss_iir +libexec/gimp/0.99/plug-ins/gauss_rle +libexec/gimp/0.99/plug-ins/gbr +libexec/gimp/0.99/plug-ins/gfig +libexec/gimp/0.99/plug-ins/gfli +libexec/gimp/0.99/plug-ins/gee +libexec/gimp/0.99/plug-ins/gicon +libexec/gimp/0.99/plug-ins/gif +libexec/gimp/0.99/plug-ins/glasstile +libexec/gimp/0.99/plug-ins/gqbist +libexec/gimp/0.99/plug-ins/gradmap +libexec/gimp/0.99/plug-ins/grid +libexec/gimp/0.99/plug-ins/gtm +libexec/gimp/0.99/plug-ins/gz +libexec/gimp/0.99/plug-ins/header +libexec/gimp/0.99/plug-ins/hot +libexec/gimp/0.99/plug-ins/hrz +libexec/gimp/0.99/plug-ins/ifscompose +libexec/gimp/0.99/plug-ins/illusion +libexec/gimp/0.99/plug-ins/iwarp +libexec/gimp/0.99/plug-ins/jpeg +libexec/gimp/0.99/plug-ins/laplace +libexec/gimp/0.99/plug-ins/mail +libexec/gimp/0.99/plug-ins/max_rgb +libexec/gimp/0.99/plug-ins/maze +libexec/gimp/0.99/plug-ins/mblur +libexec/gimp/0.99/plug-ins/mosaic +libexec/gimp/0.99/plug-ins/mpeg +libexec/gimp/0.99/plug-ins/nlfilt +libexec/gimp/0.99/plug-ins/noisify +libexec/gimp/0.99/plug-ins/normalize +libexec/gimp/0.99/plug-ins/nova +libexec/gimp/0.99/plug-ins/oilify +libexec/gimp/0.99/plug-ins/pagecurl +libexec/gimp/0.99/plug-ins/palette +libexec/gimp/0.99/plug-ins/papertile +libexec/gimp/0.99/plug-ins/pat +libexec/gimp/0.99/plug-ins/pcx +libexec/gimp/0.99/plug-ins/pix +libexec/gimp/0.99/plug-ins/pixelize +libexec/gimp/0.99/plug-ins/plasma +libexec/gimp/0.99/plug-ins/png +libexec/gimp/0.99/plug-ins/pnm +libexec/gimp/0.99/plug-ins/polar +libexec/gimp/0.99/plug-ins/print +libexec/gimp/0.99/plug-ins/ps +libexec/gimp/0.99/plug-ins/psd +libexec/gimp/0.99/plug-ins/randomize +libexec/gimp/0.99/plug-ins/ripple +libexec/gimp/0.99/plug-ins/rotate +libexec/gimp/0.99/plug-ins/rotators +libexec/gimp/0.99/plug-ins/scatter_hsv +libexec/gimp/0.99/plug-ins/screenshot +libexec/gimp/0.99/plug-ins/script-fu +libexec/gimp/0.99/plug-ins/semiflatten +libexec/gimp/0.99/plug-ins/sgi +libexec/gimp/0.99/plug-ins/sharpen +libexec/gimp/0.99/plug-ins/shift +libexec/gimp/0.99/plug-ins/sinus +libexec/gimp/0.99/plug-ins/smooth_palette +libexec/gimp/0.99/plug-ins/snoise +libexec/gimp/0.99/plug-ins/snp +libexec/gimp/0.99/plug-ins/sobel +libexec/gimp/0.99/plug-ins/sparkle +libexec/gimp/0.99/plug-ins/spread +libexec/gimp/0.99/plug-ins/struc +libexec/gimp/0.99/plug-ins/sunras +libexec/gimp/0.99/plug-ins/tga +libexec/gimp/0.99/plug-ins/threshold_alpha +libexec/gimp/0.99/plug-ins/tiff +libexec/gimp/0.99/plug-ins/tile +libexec/gimp/0.99/plug-ins/tileit +libexec/gimp/0.99/plug-ins/tiler +libexec/gimp/0.99/plug-ins/url +libexec/gimp/0.99/plug-ins/video +libexec/gimp/0.99/plug-ins/vinvert +libexec/gimp/0.99/plug-ins/vpropagate +libexec/gimp/0.99/plug-ins/waves +libexec/gimp/0.99/plug-ins/webbrowser +libexec/gimp/0.99/plug-ins/whirlpinch +libexec/gimp/0.99/plug-ins/xpm +libexec/gimp/0.99/plug-ins/xwd +libexec/gimp/0.99/plug-ins/zealouscrop man/man1/gimp.1.gz +man/man1/gimptool.1.gz +man/man3/gpc.3.gz share/gimp/brushes/10x10square.gbr share/gimp/brushes/10x10squareBlur.gbr share/gimp/brushes/11circle.gbr @@ -627,7 +630,8 @@ share/gimp/gimp_logo.ppm share/gimp/gimp_splash.ppm share/gimp/gimp_tips.txt share/gimp/ps-menurc -@dirrm libexec/gimp/plug-ins +@dirrm libexec/gimp/0.99/plug-ins +@dirrm libexec/gimp/0.99 @dirrm libexec/gimp @dirrm include/libgimp @dirrm include/gck diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 8e2419dec35d..ea01d9bf4c35 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Nov 18 21:28:43 CST 1996 # Whom: erich@FreeBSD.org # -# $Id: Makefile,v 1.31 1998/05/19 03:09:09 jdp Exp $ +# $Id: Makefile,v 1.32 1998/05/21 21:28:51 mph Exp $ # MAJOR= 0 @@ -26,11 +26,11 @@ MAINTAINER= erich@FreeBSD.org LIB_DEPENDS+= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm LIB_DEPENDS+= aa\\.1\\.:${PORTSDIR}/graphics/aalib LIB_DEPENDS+= jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg -LIB_DEPENDS+= gtk\\.1\\.2:${PORTSDIR}/x11/gtk +LIB_DEPENDS+= gtk\\.1\\.3:${PORTSDIR}/x11/gtk LIB_DEPENDS+= mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib LIB_DEPENDS+= png\\.2\\.:${PORTSDIR}/graphics/png LIB_DEPENDS+= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 -LIB_DEPENDS+= xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta +#LIB_DEPENDS+= xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta USE_X11= yes GNU_CONFIGURE= yes @@ -40,7 +40,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/tiff34" \ LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755' -MAN1= gimp.1 +MAN1= gimp.1 gimptool.1 +MAN3= gpc.3 DATASTUFF= brushes palettes gradients patterns diff --git a/graphics/gimp-app/files/patch-ac b/graphics/gimp-app/files/patch-ac new file mode 100644 index 000000000000..29a131ca3e9f --- /dev/null +++ b/graphics/gimp-app/files/patch-ac @@ -0,0 +1,225 @@ +--- plug-ins/gpc/Makefile.am.orig Wed May 27 23:47:43 1998 ++++ plug-ins/gpc/Makefile.am Wed May 27 23:48:43 1998 +@@ -1,11 +1,15 @@ + ## Process this file with automake to produce Makefile.in + +-pluginlibdir = $(gimpplugindir)/plug-ins ++pluginlibdir = $(libdir) ++gimpincludedir = $(includedir) + + pluginlib_LIBRARIES = libgpc.a + + libgpc_a_SOURCES = \ +- gpc.c gpc.h ++ gpc.c ++ ++gimpinclude_HEADERS = \ ++ gpc.h + + INCLUDES = \ + $(X_CFLAGS) \ +--- plug-ins/gpc/Makefile.in.orig Wed May 27 23:47:45 1998 ++++ plug-ins/gpc/Makefile.in Wed May 27 23:48:52 1998 +@@ -115,12 +115,16 @@ + palettedata = @palettedata@ + patterndata = @patterndata@ + +-pluginlibdir = $(gimpplugindir)/plug-ins ++pluginlibdir = $(libdir) ++gimpincludedir = $(includedir) + + pluginlib_LIBRARIES = libgpc.a + + libgpc_a_SOURCES = \ +- gpc.c gpc.h ++ gpc.c ++ ++gimpinclude_HEADERS = \ ++ gpc.h + + INCLUDES = \ + $(X_CFLAGS) \ +@@ -163,6 +167,8 @@ + MANS = $(man_MANS) + + NROFF = nroff ++HEADERS = $(gimpinclude_HEADERS) ++ + DIST_COMMON = Makefile.am Makefile.in + + +@@ -170,17 +176,18 @@ + + TAR = tar + GZIP = --best ++DEP_FILES = .deps/gpc.P + SOURCES = $(libgpc_a_SOURCES) + OBJECTS = $(libgpc_a_OBJECTS) + +-all: Makefile $(LIBRARIES) $(MANS) ++all: Makefile $(LIBRARIES) $(MANS) $(HEADERS) + + .SUFFIXES: + .SUFFIXES: .S .c .lo .o .s + $(srcdir)/Makefile.in: @MAINT@ 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 + +@@ -217,9 +224,6 @@ + rm -f $(DESTDIR)$(pluginlibdir)/$$p; \ + done + +-.c.o: +- $(COMPILE) -c $< +- + .s.o: + $(COMPILE) -c $< + +@@ -236,9 +240,6 @@ + + maintainer-clean-compile: + +-.c.lo: +- $(LIBTOOL) --mode=compile $(COMPILE) -c $< +- + .s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +@@ -299,6 +300,21 @@ + @$(NORMAL_UNINSTALL) + $(MAKE) 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) +@@ -329,6 +345,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); \ + test -f $(distdir)/$$file \ +@@ -336,6 +357,29 @@ + || cp -p $$d/$$file $(distdir)/$$file; \ + done + ++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) ++ ++-include $(DEP_FILES) ++ ++mostlyclean-depend: ++ ++clean-depend: ++ ++distclean-depend: ++ ++maintainer-clean-depend: ++ -rm -rf .deps ++ ++%.o: %.c ++ @echo '$(COMPILE) -c $<'; \ ++ $(COMPILE) -Wp,-MD,.deps/$(*F).P -c $< ++ ++%.lo: %.c ++ @echo '$(LTCOMPILE) -c $<'; \ ++ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $< ++ @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \ ++ < .deps/$(*F).p > .deps/$(*F).P ++ @-rm -f .deps/$(*F).p + info: + dvi: + check: all +@@ -344,18 +388,19 @@ + install-exec: + @$(NORMAL_INSTALL) + +-install-data: install-pluginlibLIBRARIES install-man ++install-data: install-pluginlibLIBRARIES install-man install-gimpincludeHEADERS + @$(NORMAL_INSTALL) + + install: install-exec install-data all + @: + +-uninstall: uninstall-pluginlibLIBRARIES uninstall-man ++uninstall: uninstall-pluginlibLIBRARIES uninstall-man uninstall-gimpincludeHEADERS + + install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + installdirs: +- $(mkinstalldirs) $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 ++ $(mkinstalldirs) $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 \ ++ $(DATADIR)$(gimpincludedir) + + + mostlyclean-generic: +@@ -373,22 +418,22 @@ + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + mostlyclean: mostlyclean-pluginlibLIBRARIES mostlyclean-compile \ +- mostlyclean-libtool mostlyclean-tags \ ++ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic + + clean: clean-pluginlibLIBRARIES clean-compile clean-libtool clean-tags \ +- clean-generic mostlyclean ++ clean-depend clean-generic mostlyclean + + distclean: distclean-pluginlibLIBRARIES distclean-compile \ +- distclean-libtool distclean-tags distclean-generic \ +- clean ++ distclean-libtool distclean-tags distclean-depend \ ++ distclean-generic clean + -rm -f config.status + -rm -f libtool + + maintainer-clean: maintainer-clean-pluginlibLIBRARIES \ + maintainer-clean-compile maintainer-clean-libtool \ +- maintainer-clean-tags maintainer-clean-generic \ +- distclean ++ maintainer-clean-tags maintainer-clean-depend \ ++ maintainer-clean-generic distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +@@ -398,10 +443,12 @@ + 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 dvi installcheck \ +-install-exec install-data install uninstall all installdirs \ +-mostlyclean-generic distclean-generic clean-generic \ ++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 dvi \ ++installcheck install-exec install-data install uninstall all \ ++installdirs mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + diff --git a/graphics/gimp-app/files/patch-ah b/graphics/gimp-app/files/patch-ah index a019dd5a4238..b5a2a29dcd04 100644 --- a/graphics/gimp-app/files/patch-ah +++ b/graphics/gimp-app/files/patch-ah @@ -1,29 +1,22 @@ ---- configure.in.orig Sun May 17 01:16:39 1998 -+++ configure.in Sun May 17 16:04:23 1998 -@@ -117,13 +117,13 @@ - - dnl Test for libtiff - if test -z "$LIBTIFF_LIB"; then -- AC_CHECK_LIB(tiff, TIFFReadScanline, -+ AC_CHECK_LIB(tiff34, TIFFReadScanline, - AC_CHECK_HEADER(tiffio.h, -- TIFF='tiff'; LIBTIFF_LIB='-ltiff', -+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34', - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)), -- AC_CHECK_LIB(tiff, TIFFWriteScanline, -+ AC_CHECK_LIB(tiff34, TIFFWriteScanline, - AC_CHECK_HEADER(tiffio.h, -- TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz', -+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz', - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)), - AC_CHECK_LIB(tiff34, TIFFFlushData, - AC_CHECK_HEADER(tiffio.h, +--- configure.in.orig Wed May 27 23:32:15 1998 ++++ configure.in Wed May 27 23:32:30 1998 @@ -306,7 +306,7 @@ LIBS="$gimp_save_LIBS" gimpdatadir=$datadir/gimp -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION -++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER ++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION + + brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` + gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile` +--- configure.orig Wed May 27 23:32:17 1998 ++++ configure Wed May 27 23:32:38 1998 +@@ -4146,7 +4146,7 @@ + LIBS="$gimp_save_LIBS" + + gimpdatadir=$datadir/gimp +-gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION ++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile` diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist index 5339ab517bc3..8dd716d230c0 100644 --- a/graphics/gimp-app/pkg-plist +++ b/graphics/gimp-app/pkg-plist @@ -1,4 +1,6 @@ bin/gimp +bin/gimptool +include/gpc.h include/megawidget.h include/gck/gck.h include/gck/gckcolor.h @@ -25,133 +27,134 @@ lib/libgimpui.a lib/libgimpui.la lib/libgimpui.so lib/libgimpui.so.1.0 +lib/libgpc.a lib/libmegawidget.a -libexec/gimp/plug-ins/AlienMap -libexec/gimp/plug-ins/CEL -libexec/gimp/plug-ins/CML_explorer -libexec/gimp/plug-ins/MapObject -libexec/gimp/plug-ins/aa -libexec/gimp/plug-ins/align_layers -libexec/gimp/plug-ins/animationplay -libexec/gimp/plug-ins/animoptimize -libexec/gimp/plug-ins/apply_lens -libexec/gimp/plug-ins/autocrop -libexec/gimp/plug-ins/autostretch_hsv -libexec/gimp/plug-ins/blinds -libexec/gimp/plug-ins/blur -libexec/gimp/plug-ins/bmp -libexec/gimp/plug-ins/bumpmap -libexec/gimp/plug-ins/bz2 -libexec/gimp/plug-ins/c_astretch -libexec/gimp/plug-ins/checkerboard -libexec/gimp/plug-ins/colorify -libexec/gimp/plug-ins/compose -libexec/gimp/plug-ins/convmatrix -libexec/gimp/plug-ins/cubism -libexec/gimp/plug-ins/dbbrowser -libexec/gimp/plug-ins/decompose -libexec/gimp/plug-ins/deinterlace -libexec/gimp/plug-ins/depthmerge -libexec/gimp/plug-ins/despeckle -libexec/gimp/plug-ins/destripe -libexec/gimp/plug-ins/diffraction -libexec/gimp/plug-ins/displace -libexec/gimp/plug-ins/edge -libexec/gimp/plug-ins/emboss -libexec/gimp/plug-ins/engrave -libexec/gimp/plug-ins/exchange -libexec/gimp/plug-ins/faxg3 -libexec/gimp/plug-ins/film -libexec/gimp/plug-ins/fits -libexec/gimp/plug-ins/flame -libexec/gimp/plug-ins/flarefx -libexec/gimp/plug-ins/fractaltrace -libexec/gimp/plug-ins/gauss_iir -libexec/gimp/plug-ins/gauss_rle -libexec/gimp/plug-ins/gbr -libexec/gimp/plug-ins/gfig -libexec/gimp/plug-ins/gfli -libexec/gimp/plug-ins/gee -libexec/gimp/plug-ins/gicon -libexec/gimp/plug-ins/gif -libexec/gimp/plug-ins/glasstile -libexec/gimp/plug-ins/gqbist -libexec/gimp/plug-ins/gradmap -libexec/gimp/plug-ins/grid -libexec/gimp/plug-ins/gtm -libexec/gimp/plug-ins/gz -libexec/gimp/plug-ins/header -libexec/gimp/plug-ins/hot -libexec/gimp/plug-ins/hrz -libexec/gimp/plug-ins/ifscompose -libexec/gimp/plug-ins/illusion -libexec/gimp/plug-ins/iwarp -libexec/gimp/plug-ins/jpeg -libexec/gimp/plug-ins/laplace -libexec/gimp/plug-ins/libgpc.a -libexec/gimp/plug-ins/mail -libexec/gimp/plug-ins/max_rgb -libexec/gimp/plug-ins/maze -libexec/gimp/plug-ins/mblur -libexec/gimp/plug-ins/mosaic -libexec/gimp/plug-ins/mpeg -libexec/gimp/plug-ins/nlfilt -libexec/gimp/plug-ins/noisify -libexec/gimp/plug-ins/normalize -libexec/gimp/plug-ins/nova -libexec/gimp/plug-ins/oilify -libexec/gimp/plug-ins/pagecurl -libexec/gimp/plug-ins/palette -libexec/gimp/plug-ins/papertile -libexec/gimp/plug-ins/pat -libexec/gimp/plug-ins/pcx -libexec/gimp/plug-ins/pix -libexec/gimp/plug-ins/pixelize -libexec/gimp/plug-ins/plasma -libexec/gimp/plug-ins/png -libexec/gimp/plug-ins/pnm -libexec/gimp/plug-ins/polar -libexec/gimp/plug-ins/print -libexec/gimp/plug-ins/ps -libexec/gimp/plug-ins/psd -libexec/gimp/plug-ins/randomize -libexec/gimp/plug-ins/ripple -libexec/gimp/plug-ins/rotate -libexec/gimp/plug-ins/rotators -libexec/gimp/plug-ins/scatter_hsv -libexec/gimp/plug-ins/screenshot -libexec/gimp/plug-ins/script-fu -libexec/gimp/plug-ins/semiflatten -libexec/gimp/plug-ins/sgi -libexec/gimp/plug-ins/sharpen -libexec/gimp/plug-ins/shift -libexec/gimp/plug-ins/sinus -libexec/gimp/plug-ins/smooth_palette -libexec/gimp/plug-ins/snoise -libexec/gimp/plug-ins/snp -libexec/gimp/plug-ins/sobel -libexec/gimp/plug-ins/sparkle -libexec/gimp/plug-ins/spread -libexec/gimp/plug-ins/struc -libexec/gimp/plug-ins/sunras -libexec/gimp/plug-ins/tga -libexec/gimp/plug-ins/threshold_alpha -libexec/gimp/plug-ins/tiff -libexec/gimp/plug-ins/tile -libexec/gimp/plug-ins/tileit -libexec/gimp/plug-ins/tiler -libexec/gimp/plug-ins/url -libexec/gimp/plug-ins/video -libexec/gimp/plug-ins/vinvert -libexec/gimp/plug-ins/vpropagate -libexec/gimp/plug-ins/waves -libexec/gimp/plug-ins/webbrowser -libexec/gimp/plug-ins/whirlpinch -libexec/gimp/plug-ins/xd -libexec/gimp/plug-ins/xpm -libexec/gimp/plug-ins/xwd -libexec/gimp/plug-ins/zealouscrop +libexec/gimp/0.99/plug-ins/AlienMap +libexec/gimp/0.99/plug-ins/CEL +libexec/gimp/0.99/plug-ins/CML_explorer +libexec/gimp/0.99/plug-ins/MapObject +libexec/gimp/0.99/plug-ins/aa +libexec/gimp/0.99/plug-ins/align_layers +libexec/gimp/0.99/plug-ins/animationplay +libexec/gimp/0.99/plug-ins/animoptimize +libexec/gimp/0.99/plug-ins/apply_lens +libexec/gimp/0.99/plug-ins/autocrop +libexec/gimp/0.99/plug-ins/autostretch_hsv +libexec/gimp/0.99/plug-ins/blinds +libexec/gimp/0.99/plug-ins/blur +libexec/gimp/0.99/plug-ins/bmp +libexec/gimp/0.99/plug-ins/bumpmap +libexec/gimp/0.99/plug-ins/bz2 +libexec/gimp/0.99/plug-ins/c_astretch +libexec/gimp/0.99/plug-ins/checkerboard +libexec/gimp/0.99/plug-ins/colorify +libexec/gimp/0.99/plug-ins/compose +libexec/gimp/0.99/plug-ins/convmatrix +libexec/gimp/0.99/plug-ins/cubism +libexec/gimp/0.99/plug-ins/dbbrowser +libexec/gimp/0.99/plug-ins/decompose +libexec/gimp/0.99/plug-ins/deinterlace +libexec/gimp/0.99/plug-ins/depthmerge +libexec/gimp/0.99/plug-ins/despeckle +libexec/gimp/0.99/plug-ins/destripe +libexec/gimp/0.99/plug-ins/diffraction +libexec/gimp/0.99/plug-ins/displace +libexec/gimp/0.99/plug-ins/edge +libexec/gimp/0.99/plug-ins/emboss +libexec/gimp/0.99/plug-ins/engrave +libexec/gimp/0.99/plug-ins/exchange +libexec/gimp/0.99/plug-ins/faxg3 +libexec/gimp/0.99/plug-ins/film +libexec/gimp/0.99/plug-ins/fits +libexec/gimp/0.99/plug-ins/flame +libexec/gimp/0.99/plug-ins/flarefx +libexec/gimp/0.99/plug-ins/fractaltrace +libexec/gimp/0.99/plug-ins/gauss_iir +libexec/gimp/0.99/plug-ins/gauss_rle +libexec/gimp/0.99/plug-ins/gbr +libexec/gimp/0.99/plug-ins/gfig +libexec/gimp/0.99/plug-ins/gfli +libexec/gimp/0.99/plug-ins/gee +libexec/gimp/0.99/plug-ins/gicon +libexec/gimp/0.99/plug-ins/gif +libexec/gimp/0.99/plug-ins/glasstile +libexec/gimp/0.99/plug-ins/gqbist +libexec/gimp/0.99/plug-ins/gradmap +libexec/gimp/0.99/plug-ins/grid +libexec/gimp/0.99/plug-ins/gtm +libexec/gimp/0.99/plug-ins/gz +libexec/gimp/0.99/plug-ins/header +libexec/gimp/0.99/plug-ins/hot +libexec/gimp/0.99/plug-ins/hrz +libexec/gimp/0.99/plug-ins/ifscompose +libexec/gimp/0.99/plug-ins/illusion +libexec/gimp/0.99/plug-ins/iwarp +libexec/gimp/0.99/plug-ins/jpeg +libexec/gimp/0.99/plug-ins/laplace +libexec/gimp/0.99/plug-ins/mail +libexec/gimp/0.99/plug-ins/max_rgb +libexec/gimp/0.99/plug-ins/maze +libexec/gimp/0.99/plug-ins/mblur +libexec/gimp/0.99/plug-ins/mosaic +libexec/gimp/0.99/plug-ins/mpeg +libexec/gimp/0.99/plug-ins/nlfilt +libexec/gimp/0.99/plug-ins/noisify +libexec/gimp/0.99/plug-ins/normalize +libexec/gimp/0.99/plug-ins/nova +libexec/gimp/0.99/plug-ins/oilify +libexec/gimp/0.99/plug-ins/pagecurl +libexec/gimp/0.99/plug-ins/palette +libexec/gimp/0.99/plug-ins/papertile +libexec/gimp/0.99/plug-ins/pat +libexec/gimp/0.99/plug-ins/pcx +libexec/gimp/0.99/plug-ins/pix +libexec/gimp/0.99/plug-ins/pixelize +libexec/gimp/0.99/plug-ins/plasma +libexec/gimp/0.99/plug-ins/png +libexec/gimp/0.99/plug-ins/pnm +libexec/gimp/0.99/plug-ins/polar +libexec/gimp/0.99/plug-ins/print +libexec/gimp/0.99/plug-ins/ps +libexec/gimp/0.99/plug-ins/psd +libexec/gimp/0.99/plug-ins/randomize +libexec/gimp/0.99/plug-ins/ripple +libexec/gimp/0.99/plug-ins/rotate +libexec/gimp/0.99/plug-ins/rotators +libexec/gimp/0.99/plug-ins/scatter_hsv +libexec/gimp/0.99/plug-ins/screenshot +libexec/gimp/0.99/plug-ins/script-fu +libexec/gimp/0.99/plug-ins/semiflatten +libexec/gimp/0.99/plug-ins/sgi +libexec/gimp/0.99/plug-ins/sharpen +libexec/gimp/0.99/plug-ins/shift +libexec/gimp/0.99/plug-ins/sinus +libexec/gimp/0.99/plug-ins/smooth_palette +libexec/gimp/0.99/plug-ins/snoise +libexec/gimp/0.99/plug-ins/snp +libexec/gimp/0.99/plug-ins/sobel +libexec/gimp/0.99/plug-ins/sparkle +libexec/gimp/0.99/plug-ins/spread +libexec/gimp/0.99/plug-ins/struc +libexec/gimp/0.99/plug-ins/sunras +libexec/gimp/0.99/plug-ins/tga +libexec/gimp/0.99/plug-ins/threshold_alpha +libexec/gimp/0.99/plug-ins/tiff +libexec/gimp/0.99/plug-ins/tile +libexec/gimp/0.99/plug-ins/tileit +libexec/gimp/0.99/plug-ins/tiler +libexec/gimp/0.99/plug-ins/url +libexec/gimp/0.99/plug-ins/video +libexec/gimp/0.99/plug-ins/vinvert +libexec/gimp/0.99/plug-ins/vpropagate +libexec/gimp/0.99/plug-ins/waves +libexec/gimp/0.99/plug-ins/webbrowser +libexec/gimp/0.99/plug-ins/whirlpinch +libexec/gimp/0.99/plug-ins/xpm +libexec/gimp/0.99/plug-ins/xwd +libexec/gimp/0.99/plug-ins/zealouscrop man/man1/gimp.1.gz +man/man1/gimptool.1.gz +man/man3/gpc.3.gz share/gimp/brushes/10x10square.gbr share/gimp/brushes/10x10squareBlur.gbr share/gimp/brushes/11circle.gbr @@ -627,7 +630,8 @@ share/gimp/gimp_logo.ppm share/gimp/gimp_splash.ppm share/gimp/gimp_tips.txt share/gimp/ps-menurc -@dirrm libexec/gimp/plug-ins +@dirrm libexec/gimp/0.99/plug-ins +@dirrm libexec/gimp/0.99 @dirrm libexec/gimp @dirrm include/libgimp @dirrm include/gck diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile index 8e2419dec35d..ea01d9bf4c35 100644 --- a/graphics/gimp-devel/Makefile +++ b/graphics/gimp-devel/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Nov 18 21:28:43 CST 1996 # Whom: erich@FreeBSD.org # -# $Id: Makefile,v 1.31 1998/05/19 03:09:09 jdp Exp $ +# $Id: Makefile,v 1.32 1998/05/21 21:28:51 mph Exp $ # MAJOR= 0 @@ -26,11 +26,11 @@ MAINTAINER= erich@FreeBSD.org LIB_DEPENDS+= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm LIB_DEPENDS+= aa\\.1\\.:${PORTSDIR}/graphics/aalib LIB_DEPENDS+= jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg -LIB_DEPENDS+= gtk\\.1\\.2:${PORTSDIR}/x11/gtk +LIB_DEPENDS+= gtk\\.1\\.3:${PORTSDIR}/x11/gtk LIB_DEPENDS+= mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib LIB_DEPENDS+= png\\.2\\.:${PORTSDIR}/graphics/png LIB_DEPENDS+= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 -LIB_DEPENDS+= xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta +#LIB_DEPENDS+= xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta USE_X11= yes GNU_CONFIGURE= yes @@ -40,7 +40,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/tiff34" \ LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755' -MAN1= gimp.1 +MAN1= gimp.1 gimptool.1 +MAN3= gpc.3 DATASTUFF= brushes palettes gradients patterns diff --git a/graphics/gimp-devel/files/patch-ac b/graphics/gimp-devel/files/patch-ac new file mode 100644 index 000000000000..29a131ca3e9f --- /dev/null +++ b/graphics/gimp-devel/files/patch-ac @@ -0,0 +1,225 @@ +--- plug-ins/gpc/Makefile.am.orig Wed May 27 23:47:43 1998 ++++ plug-ins/gpc/Makefile.am Wed May 27 23:48:43 1998 +@@ -1,11 +1,15 @@ + ## Process this file with automake to produce Makefile.in + +-pluginlibdir = $(gimpplugindir)/plug-ins ++pluginlibdir = $(libdir) ++gimpincludedir = $(includedir) + + pluginlib_LIBRARIES = libgpc.a + + libgpc_a_SOURCES = \ +- gpc.c gpc.h ++ gpc.c ++ ++gimpinclude_HEADERS = \ ++ gpc.h + + INCLUDES = \ + $(X_CFLAGS) \ +--- plug-ins/gpc/Makefile.in.orig Wed May 27 23:47:45 1998 ++++ plug-ins/gpc/Makefile.in Wed May 27 23:48:52 1998 +@@ -115,12 +115,16 @@ + palettedata = @palettedata@ + patterndata = @patterndata@ + +-pluginlibdir = $(gimpplugindir)/plug-ins ++pluginlibdir = $(libdir) ++gimpincludedir = $(includedir) + + pluginlib_LIBRARIES = libgpc.a + + libgpc_a_SOURCES = \ +- gpc.c gpc.h ++ gpc.c ++ ++gimpinclude_HEADERS = \ ++ gpc.h + + INCLUDES = \ + $(X_CFLAGS) \ +@@ -163,6 +167,8 @@ + MANS = $(man_MANS) + + NROFF = nroff ++HEADERS = $(gimpinclude_HEADERS) ++ + DIST_COMMON = Makefile.am Makefile.in + + +@@ -170,17 +176,18 @@ + + TAR = tar + GZIP = --best ++DEP_FILES = .deps/gpc.P + SOURCES = $(libgpc_a_SOURCES) + OBJECTS = $(libgpc_a_OBJECTS) + +-all: Makefile $(LIBRARIES) $(MANS) ++all: Makefile $(LIBRARIES) $(MANS) $(HEADERS) + + .SUFFIXES: + .SUFFIXES: .S .c .lo .o .s + $(srcdir)/Makefile.in: @MAINT@ 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 + +@@ -217,9 +224,6 @@ + rm -f $(DESTDIR)$(pluginlibdir)/$$p; \ + done + +-.c.o: +- $(COMPILE) -c $< +- + .s.o: + $(COMPILE) -c $< + +@@ -236,9 +240,6 @@ + + maintainer-clean-compile: + +-.c.lo: +- $(LIBTOOL) --mode=compile $(COMPILE) -c $< +- + .s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +@@ -299,6 +300,21 @@ + @$(NORMAL_UNINSTALL) + $(MAKE) 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) +@@ -329,6 +345,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); \ + test -f $(distdir)/$$file \ +@@ -336,6 +357,29 @@ + || cp -p $$d/$$file $(distdir)/$$file; \ + done + ++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) ++ ++-include $(DEP_FILES) ++ ++mostlyclean-depend: ++ ++clean-depend: ++ ++distclean-depend: ++ ++maintainer-clean-depend: ++ -rm -rf .deps ++ ++%.o: %.c ++ @echo '$(COMPILE) -c $<'; \ ++ $(COMPILE) -Wp,-MD,.deps/$(*F).P -c $< ++ ++%.lo: %.c ++ @echo '$(LTCOMPILE) -c $<'; \ ++ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $< ++ @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \ ++ < .deps/$(*F).p > .deps/$(*F).P ++ @-rm -f .deps/$(*F).p + info: + dvi: + check: all +@@ -344,18 +388,19 @@ + install-exec: + @$(NORMAL_INSTALL) + +-install-data: install-pluginlibLIBRARIES install-man ++install-data: install-pluginlibLIBRARIES install-man install-gimpincludeHEADERS + @$(NORMAL_INSTALL) + + install: install-exec install-data all + @: + +-uninstall: uninstall-pluginlibLIBRARIES uninstall-man ++uninstall: uninstall-pluginlibLIBRARIES uninstall-man uninstall-gimpincludeHEADERS + + install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + installdirs: +- $(mkinstalldirs) $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 ++ $(mkinstalldirs) $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 \ ++ $(DATADIR)$(gimpincludedir) + + + mostlyclean-generic: +@@ -373,22 +418,22 @@ + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + mostlyclean: mostlyclean-pluginlibLIBRARIES mostlyclean-compile \ +- mostlyclean-libtool mostlyclean-tags \ ++ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic + + clean: clean-pluginlibLIBRARIES clean-compile clean-libtool clean-tags \ +- clean-generic mostlyclean ++ clean-depend clean-generic mostlyclean + + distclean: distclean-pluginlibLIBRARIES distclean-compile \ +- distclean-libtool distclean-tags distclean-generic \ +- clean ++ distclean-libtool distclean-tags distclean-depend \ ++ distclean-generic clean + -rm -f config.status + -rm -f libtool + + maintainer-clean: maintainer-clean-pluginlibLIBRARIES \ + maintainer-clean-compile maintainer-clean-libtool \ +- maintainer-clean-tags maintainer-clean-generic \ +- distclean ++ maintainer-clean-tags maintainer-clean-depend \ ++ maintainer-clean-generic distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +@@ -398,10 +443,12 @@ + 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 dvi installcheck \ +-install-exec install-data install uninstall all installdirs \ +-mostlyclean-generic distclean-generic clean-generic \ ++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 dvi \ ++installcheck install-exec install-data install uninstall all \ ++installdirs mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + diff --git a/graphics/gimp-devel/files/patch-ah b/graphics/gimp-devel/files/patch-ah index a019dd5a4238..b5a2a29dcd04 100644 --- a/graphics/gimp-devel/files/patch-ah +++ b/graphics/gimp-devel/files/patch-ah @@ -1,29 +1,22 @@ ---- configure.in.orig Sun May 17 01:16:39 1998 -+++ configure.in Sun May 17 16:04:23 1998 -@@ -117,13 +117,13 @@ - - dnl Test for libtiff - if test -z "$LIBTIFF_LIB"; then -- AC_CHECK_LIB(tiff, TIFFReadScanline, -+ AC_CHECK_LIB(tiff34, TIFFReadScanline, - AC_CHECK_HEADER(tiffio.h, -- TIFF='tiff'; LIBTIFF_LIB='-ltiff', -+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34', - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)), -- AC_CHECK_LIB(tiff, TIFFWriteScanline, -+ AC_CHECK_LIB(tiff34, TIFFWriteScanline, - AC_CHECK_HEADER(tiffio.h, -- TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz', -+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz', - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)), - AC_CHECK_LIB(tiff34, TIFFFlushData, - AC_CHECK_HEADER(tiffio.h, +--- configure.in.orig Wed May 27 23:32:15 1998 ++++ configure.in Wed May 27 23:32:30 1998 @@ -306,7 +306,7 @@ LIBS="$gimp_save_LIBS" gimpdatadir=$datadir/gimp -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION -++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER ++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION + + brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` + gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile` +--- configure.orig Wed May 27 23:32:17 1998 ++++ configure Wed May 27 23:32:38 1998 +@@ -4146,7 +4146,7 @@ + LIBS="$gimp_save_LIBS" + + gimpdatadir=$datadir/gimp +-gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION ++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile` diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist index 5339ab517bc3..8dd716d230c0 100644 --- a/graphics/gimp-devel/pkg-plist +++ b/graphics/gimp-devel/pkg-plist @@ -1,4 +1,6 @@ bin/gimp +bin/gimptool +include/gpc.h include/megawidget.h include/gck/gck.h include/gck/gckcolor.h @@ -25,133 +27,134 @@ lib/libgimpui.a lib/libgimpui.la lib/libgimpui.so lib/libgimpui.so.1.0 +lib/libgpc.a lib/libmegawidget.a -libexec/gimp/plug-ins/AlienMap -libexec/gimp/plug-ins/CEL -libexec/gimp/plug-ins/CML_explorer -libexec/gimp/plug-ins/MapObject -libexec/gimp/plug-ins/aa -libexec/gimp/plug-ins/align_layers -libexec/gimp/plug-ins/animationplay -libexec/gimp/plug-ins/animoptimize -libexec/gimp/plug-ins/apply_lens -libexec/gimp/plug-ins/autocrop -libexec/gimp/plug-ins/autostretch_hsv -libexec/gimp/plug-ins/blinds -libexec/gimp/plug-ins/blur -libexec/gimp/plug-ins/bmp -libexec/gimp/plug-ins/bumpmap -libexec/gimp/plug-ins/bz2 -libexec/gimp/plug-ins/c_astretch -libexec/gimp/plug-ins/checkerboard -libexec/gimp/plug-ins/colorify -libexec/gimp/plug-ins/compose -libexec/gimp/plug-ins/convmatrix -libexec/gimp/plug-ins/cubism -libexec/gimp/plug-ins/dbbrowser -libexec/gimp/plug-ins/decompose -libexec/gimp/plug-ins/deinterlace -libexec/gimp/plug-ins/depthmerge -libexec/gimp/plug-ins/despeckle -libexec/gimp/plug-ins/destripe -libexec/gimp/plug-ins/diffraction -libexec/gimp/plug-ins/displace -libexec/gimp/plug-ins/edge -libexec/gimp/plug-ins/emboss -libexec/gimp/plug-ins/engrave -libexec/gimp/plug-ins/exchange -libexec/gimp/plug-ins/faxg3 -libexec/gimp/plug-ins/film -libexec/gimp/plug-ins/fits -libexec/gimp/plug-ins/flame -libexec/gimp/plug-ins/flarefx -libexec/gimp/plug-ins/fractaltrace -libexec/gimp/plug-ins/gauss_iir -libexec/gimp/plug-ins/gauss_rle -libexec/gimp/plug-ins/gbr -libexec/gimp/plug-ins/gfig -libexec/gimp/plug-ins/gfli -libexec/gimp/plug-ins/gee -libexec/gimp/plug-ins/gicon -libexec/gimp/plug-ins/gif -libexec/gimp/plug-ins/glasstile -libexec/gimp/plug-ins/gqbist -libexec/gimp/plug-ins/gradmap -libexec/gimp/plug-ins/grid -libexec/gimp/plug-ins/gtm -libexec/gimp/plug-ins/gz -libexec/gimp/plug-ins/header -libexec/gimp/plug-ins/hot -libexec/gimp/plug-ins/hrz -libexec/gimp/plug-ins/ifscompose -libexec/gimp/plug-ins/illusion -libexec/gimp/plug-ins/iwarp -libexec/gimp/plug-ins/jpeg -libexec/gimp/plug-ins/laplace -libexec/gimp/plug-ins/libgpc.a -libexec/gimp/plug-ins/mail -libexec/gimp/plug-ins/max_rgb -libexec/gimp/plug-ins/maze -libexec/gimp/plug-ins/mblur -libexec/gimp/plug-ins/mosaic -libexec/gimp/plug-ins/mpeg -libexec/gimp/plug-ins/nlfilt -libexec/gimp/plug-ins/noisify -libexec/gimp/plug-ins/normalize -libexec/gimp/plug-ins/nova -libexec/gimp/plug-ins/oilify -libexec/gimp/plug-ins/pagecurl -libexec/gimp/plug-ins/palette -libexec/gimp/plug-ins/papertile -libexec/gimp/plug-ins/pat -libexec/gimp/plug-ins/pcx -libexec/gimp/plug-ins/pix -libexec/gimp/plug-ins/pixelize -libexec/gimp/plug-ins/plasma -libexec/gimp/plug-ins/png -libexec/gimp/plug-ins/pnm -libexec/gimp/plug-ins/polar -libexec/gimp/plug-ins/print -libexec/gimp/plug-ins/ps -libexec/gimp/plug-ins/psd -libexec/gimp/plug-ins/randomize -libexec/gimp/plug-ins/ripple -libexec/gimp/plug-ins/rotate -libexec/gimp/plug-ins/rotators -libexec/gimp/plug-ins/scatter_hsv -libexec/gimp/plug-ins/screenshot -libexec/gimp/plug-ins/script-fu -libexec/gimp/plug-ins/semiflatten -libexec/gimp/plug-ins/sgi -libexec/gimp/plug-ins/sharpen -libexec/gimp/plug-ins/shift -libexec/gimp/plug-ins/sinus -libexec/gimp/plug-ins/smooth_palette -libexec/gimp/plug-ins/snoise -libexec/gimp/plug-ins/snp -libexec/gimp/plug-ins/sobel -libexec/gimp/plug-ins/sparkle -libexec/gimp/plug-ins/spread -libexec/gimp/plug-ins/struc -libexec/gimp/plug-ins/sunras -libexec/gimp/plug-ins/tga -libexec/gimp/plug-ins/threshold_alpha -libexec/gimp/plug-ins/tiff -libexec/gimp/plug-ins/tile -libexec/gimp/plug-ins/tileit -libexec/gimp/plug-ins/tiler -libexec/gimp/plug-ins/url -libexec/gimp/plug-ins/video -libexec/gimp/plug-ins/vinvert -libexec/gimp/plug-ins/vpropagate -libexec/gimp/plug-ins/waves -libexec/gimp/plug-ins/webbrowser -libexec/gimp/plug-ins/whirlpinch -libexec/gimp/plug-ins/xd -libexec/gimp/plug-ins/xpm -libexec/gimp/plug-ins/xwd -libexec/gimp/plug-ins/zealouscrop +libexec/gimp/0.99/plug-ins/AlienMap +libexec/gimp/0.99/plug-ins/CEL +libexec/gimp/0.99/plug-ins/CML_explorer +libexec/gimp/0.99/plug-ins/MapObject +libexec/gimp/0.99/plug-ins/aa +libexec/gimp/0.99/plug-ins/align_layers +libexec/gimp/0.99/plug-ins/animationplay +libexec/gimp/0.99/plug-ins/animoptimize +libexec/gimp/0.99/plug-ins/apply_lens +libexec/gimp/0.99/plug-ins/autocrop +libexec/gimp/0.99/plug-ins/autostretch_hsv +libexec/gimp/0.99/plug-ins/blinds +libexec/gimp/0.99/plug-ins/blur +libexec/gimp/0.99/plug-ins/bmp +libexec/gimp/0.99/plug-ins/bumpmap +libexec/gimp/0.99/plug-ins/bz2 +libexec/gimp/0.99/plug-ins/c_astretch +libexec/gimp/0.99/plug-ins/checkerboard +libexec/gimp/0.99/plug-ins/colorify +libexec/gimp/0.99/plug-ins/compose +libexec/gimp/0.99/plug-ins/convmatrix +libexec/gimp/0.99/plug-ins/cubism +libexec/gimp/0.99/plug-ins/dbbrowser +libexec/gimp/0.99/plug-ins/decompose +libexec/gimp/0.99/plug-ins/deinterlace +libexec/gimp/0.99/plug-ins/depthmerge +libexec/gimp/0.99/plug-ins/despeckle +libexec/gimp/0.99/plug-ins/destripe +libexec/gimp/0.99/plug-ins/diffraction +libexec/gimp/0.99/plug-ins/displace +libexec/gimp/0.99/plug-ins/edge +libexec/gimp/0.99/plug-ins/emboss +libexec/gimp/0.99/plug-ins/engrave +libexec/gimp/0.99/plug-ins/exchange +libexec/gimp/0.99/plug-ins/faxg3 +libexec/gimp/0.99/plug-ins/film +libexec/gimp/0.99/plug-ins/fits +libexec/gimp/0.99/plug-ins/flame +libexec/gimp/0.99/plug-ins/flarefx +libexec/gimp/0.99/plug-ins/fractaltrace +libexec/gimp/0.99/plug-ins/gauss_iir +libexec/gimp/0.99/plug-ins/gauss_rle +libexec/gimp/0.99/plug-ins/gbr +libexec/gimp/0.99/plug-ins/gfig +libexec/gimp/0.99/plug-ins/gfli +libexec/gimp/0.99/plug-ins/gee +libexec/gimp/0.99/plug-ins/gicon +libexec/gimp/0.99/plug-ins/gif +libexec/gimp/0.99/plug-ins/glasstile +libexec/gimp/0.99/plug-ins/gqbist +libexec/gimp/0.99/plug-ins/gradmap +libexec/gimp/0.99/plug-ins/grid +libexec/gimp/0.99/plug-ins/gtm +libexec/gimp/0.99/plug-ins/gz +libexec/gimp/0.99/plug-ins/header +libexec/gimp/0.99/plug-ins/hot +libexec/gimp/0.99/plug-ins/hrz +libexec/gimp/0.99/plug-ins/ifscompose +libexec/gimp/0.99/plug-ins/illusion +libexec/gimp/0.99/plug-ins/iwarp +libexec/gimp/0.99/plug-ins/jpeg +libexec/gimp/0.99/plug-ins/laplace +libexec/gimp/0.99/plug-ins/mail +libexec/gimp/0.99/plug-ins/max_rgb +libexec/gimp/0.99/plug-ins/maze +libexec/gimp/0.99/plug-ins/mblur +libexec/gimp/0.99/plug-ins/mosaic +libexec/gimp/0.99/plug-ins/mpeg +libexec/gimp/0.99/plug-ins/nlfilt +libexec/gimp/0.99/plug-ins/noisify +libexec/gimp/0.99/plug-ins/normalize +libexec/gimp/0.99/plug-ins/nova +libexec/gimp/0.99/plug-ins/oilify +libexec/gimp/0.99/plug-ins/pagecurl +libexec/gimp/0.99/plug-ins/palette +libexec/gimp/0.99/plug-ins/papertile +libexec/gimp/0.99/plug-ins/pat +libexec/gimp/0.99/plug-ins/pcx +libexec/gimp/0.99/plug-ins/pix +libexec/gimp/0.99/plug-ins/pixelize +libexec/gimp/0.99/plug-ins/plasma +libexec/gimp/0.99/plug-ins/png +libexec/gimp/0.99/plug-ins/pnm +libexec/gimp/0.99/plug-ins/polar +libexec/gimp/0.99/plug-ins/print +libexec/gimp/0.99/plug-ins/ps +libexec/gimp/0.99/plug-ins/psd +libexec/gimp/0.99/plug-ins/randomize +libexec/gimp/0.99/plug-ins/ripple +libexec/gimp/0.99/plug-ins/rotate +libexec/gimp/0.99/plug-ins/rotators +libexec/gimp/0.99/plug-ins/scatter_hsv +libexec/gimp/0.99/plug-ins/screenshot +libexec/gimp/0.99/plug-ins/script-fu +libexec/gimp/0.99/plug-ins/semiflatten +libexec/gimp/0.99/plug-ins/sgi +libexec/gimp/0.99/plug-ins/sharpen +libexec/gimp/0.99/plug-ins/shift +libexec/gimp/0.99/plug-ins/sinus +libexec/gimp/0.99/plug-ins/smooth_palette +libexec/gimp/0.99/plug-ins/snoise +libexec/gimp/0.99/plug-ins/snp +libexec/gimp/0.99/plug-ins/sobel +libexec/gimp/0.99/plug-ins/sparkle +libexec/gimp/0.99/plug-ins/spread +libexec/gimp/0.99/plug-ins/struc +libexec/gimp/0.99/plug-ins/sunras +libexec/gimp/0.99/plug-ins/tga +libexec/gimp/0.99/plug-ins/threshold_alpha +libexec/gimp/0.99/plug-ins/tiff +libexec/gimp/0.99/plug-ins/tile +libexec/gimp/0.99/plug-ins/tileit +libexec/gimp/0.99/plug-ins/tiler +libexec/gimp/0.99/plug-ins/url +libexec/gimp/0.99/plug-ins/video +libexec/gimp/0.99/plug-ins/vinvert +libexec/gimp/0.99/plug-ins/vpropagate +libexec/gimp/0.99/plug-ins/waves +libexec/gimp/0.99/plug-ins/webbrowser +libexec/gimp/0.99/plug-ins/whirlpinch +libexec/gimp/0.99/plug-ins/xpm +libexec/gimp/0.99/plug-ins/xwd +libexec/gimp/0.99/plug-ins/zealouscrop man/man1/gimp.1.gz +man/man1/gimptool.1.gz +man/man3/gpc.3.gz share/gimp/brushes/10x10square.gbr share/gimp/brushes/10x10squareBlur.gbr share/gimp/brushes/11circle.gbr @@ -627,7 +630,8 @@ share/gimp/gimp_logo.ppm share/gimp/gimp_splash.ppm share/gimp/gimp_tips.txt share/gimp/ps-menurc -@dirrm libexec/gimp/plug-ins +@dirrm libexec/gimp/0.99/plug-ins +@dirrm libexec/gimp/0.99 @dirrm libexec/gimp @dirrm include/libgimp @dirrm include/gck diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 8e2419dec35d..ea01d9bf4c35 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Nov 18 21:28:43 CST 1996 # Whom: erich@FreeBSD.org # -# $Id: Makefile,v 1.31 1998/05/19 03:09:09 jdp Exp $ +# $Id: Makefile,v 1.32 1998/05/21 21:28:51 mph Exp $ # MAJOR= 0 @@ -26,11 +26,11 @@ MAINTAINER= erich@FreeBSD.org LIB_DEPENDS+= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm LIB_DEPENDS+= aa\\.1\\.:${PORTSDIR}/graphics/aalib LIB_DEPENDS+= jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg -LIB_DEPENDS+= gtk\\.1\\.2:${PORTSDIR}/x11/gtk +LIB_DEPENDS+= gtk\\.1\\.3:${PORTSDIR}/x11/gtk LIB_DEPENDS+= mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib LIB_DEPENDS+= png\\.2\\.:${PORTSDIR}/graphics/png LIB_DEPENDS+= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 -LIB_DEPENDS+= xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta +#LIB_DEPENDS+= xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta USE_X11= yes GNU_CONFIGURE= yes @@ -40,7 +40,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/tiff34" \ LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755' -MAN1= gimp.1 +MAN1= gimp.1 gimptool.1 +MAN3= gpc.3 DATASTUFF= brushes palettes gradients patterns diff --git a/graphics/gimp/files/patch-ac b/graphics/gimp/files/patch-ac new file mode 100644 index 000000000000..29a131ca3e9f --- /dev/null +++ b/graphics/gimp/files/patch-ac @@ -0,0 +1,225 @@ +--- plug-ins/gpc/Makefile.am.orig Wed May 27 23:47:43 1998 ++++ plug-ins/gpc/Makefile.am Wed May 27 23:48:43 1998 +@@ -1,11 +1,15 @@ + ## Process this file with automake to produce Makefile.in + +-pluginlibdir = $(gimpplugindir)/plug-ins ++pluginlibdir = $(libdir) ++gimpincludedir = $(includedir) + + pluginlib_LIBRARIES = libgpc.a + + libgpc_a_SOURCES = \ +- gpc.c gpc.h ++ gpc.c ++ ++gimpinclude_HEADERS = \ ++ gpc.h + + INCLUDES = \ + $(X_CFLAGS) \ +--- plug-ins/gpc/Makefile.in.orig Wed May 27 23:47:45 1998 ++++ plug-ins/gpc/Makefile.in Wed May 27 23:48:52 1998 +@@ -115,12 +115,16 @@ + palettedata = @palettedata@ + patterndata = @patterndata@ + +-pluginlibdir = $(gimpplugindir)/plug-ins ++pluginlibdir = $(libdir) ++gimpincludedir = $(includedir) + + pluginlib_LIBRARIES = libgpc.a + + libgpc_a_SOURCES = \ +- gpc.c gpc.h ++ gpc.c ++ ++gimpinclude_HEADERS = \ ++ gpc.h + + INCLUDES = \ + $(X_CFLAGS) \ +@@ -163,6 +167,8 @@ + MANS = $(man_MANS) + + NROFF = nroff ++HEADERS = $(gimpinclude_HEADERS) ++ + DIST_COMMON = Makefile.am Makefile.in + + +@@ -170,17 +176,18 @@ + + TAR = tar + GZIP = --best ++DEP_FILES = .deps/gpc.P + SOURCES = $(libgpc_a_SOURCES) + OBJECTS = $(libgpc_a_OBJECTS) + +-all: Makefile $(LIBRARIES) $(MANS) ++all: Makefile $(LIBRARIES) $(MANS) $(HEADERS) + + .SUFFIXES: + .SUFFIXES: .S .c .lo .o .s + $(srcdir)/Makefile.in: @MAINT@ 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 + +@@ -217,9 +224,6 @@ + rm -f $(DESTDIR)$(pluginlibdir)/$$p; \ + done + +-.c.o: +- $(COMPILE) -c $< +- + .s.o: + $(COMPILE) -c $< + +@@ -236,9 +240,6 @@ + + maintainer-clean-compile: + +-.c.lo: +- $(LIBTOOL) --mode=compile $(COMPILE) -c $< +- + .s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +@@ -299,6 +300,21 @@ + @$(NORMAL_UNINSTALL) + $(MAKE) 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) +@@ -329,6 +345,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); \ + test -f $(distdir)/$$file \ +@@ -336,6 +357,29 @@ + || cp -p $$d/$$file $(distdir)/$$file; \ + done + ++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) ++ ++-include $(DEP_FILES) ++ ++mostlyclean-depend: ++ ++clean-depend: ++ ++distclean-depend: ++ ++maintainer-clean-depend: ++ -rm -rf .deps ++ ++%.o: %.c ++ @echo '$(COMPILE) -c $<'; \ ++ $(COMPILE) -Wp,-MD,.deps/$(*F).P -c $< ++ ++%.lo: %.c ++ @echo '$(LTCOMPILE) -c $<'; \ ++ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $< ++ @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \ ++ < .deps/$(*F).p > .deps/$(*F).P ++ @-rm -f .deps/$(*F).p + info: + dvi: + check: all +@@ -344,18 +388,19 @@ + install-exec: + @$(NORMAL_INSTALL) + +-install-data: install-pluginlibLIBRARIES install-man ++install-data: install-pluginlibLIBRARIES install-man install-gimpincludeHEADERS + @$(NORMAL_INSTALL) + + install: install-exec install-data all + @: + +-uninstall: uninstall-pluginlibLIBRARIES uninstall-man ++uninstall: uninstall-pluginlibLIBRARIES uninstall-man uninstall-gimpincludeHEADERS + + install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + installdirs: +- $(mkinstalldirs) $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 ++ $(mkinstalldirs) $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 \ ++ $(DATADIR)$(gimpincludedir) + + + mostlyclean-generic: +@@ -373,22 +418,22 @@ + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + mostlyclean: mostlyclean-pluginlibLIBRARIES mostlyclean-compile \ +- mostlyclean-libtool mostlyclean-tags \ ++ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic + + clean: clean-pluginlibLIBRARIES clean-compile clean-libtool clean-tags \ +- clean-generic mostlyclean ++ clean-depend clean-generic mostlyclean + + distclean: distclean-pluginlibLIBRARIES distclean-compile \ +- distclean-libtool distclean-tags distclean-generic \ +- clean ++ distclean-libtool distclean-tags distclean-depend \ ++ distclean-generic clean + -rm -f config.status + -rm -f libtool + + maintainer-clean: maintainer-clean-pluginlibLIBRARIES \ + maintainer-clean-compile maintainer-clean-libtool \ +- maintainer-clean-tags maintainer-clean-generic \ +- distclean ++ maintainer-clean-tags maintainer-clean-depend \ ++ maintainer-clean-generic distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +@@ -398,10 +443,12 @@ + 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 dvi installcheck \ +-install-exec install-data install uninstall all installdirs \ +-mostlyclean-generic distclean-generic clean-generic \ ++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 dvi \ ++installcheck install-exec install-data install uninstall all \ ++installdirs mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + diff --git a/graphics/gimp/files/patch-ah b/graphics/gimp/files/patch-ah index a019dd5a4238..b5a2a29dcd04 100644 --- a/graphics/gimp/files/patch-ah +++ b/graphics/gimp/files/patch-ah @@ -1,29 +1,22 @@ ---- configure.in.orig Sun May 17 01:16:39 1998 -+++ configure.in Sun May 17 16:04:23 1998 -@@ -117,13 +117,13 @@ - - dnl Test for libtiff - if test -z "$LIBTIFF_LIB"; then -- AC_CHECK_LIB(tiff, TIFFReadScanline, -+ AC_CHECK_LIB(tiff34, TIFFReadScanline, - AC_CHECK_HEADER(tiffio.h, -- TIFF='tiff'; LIBTIFF_LIB='-ltiff', -+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34', - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)), -- AC_CHECK_LIB(tiff, TIFFWriteScanline, -+ AC_CHECK_LIB(tiff34, TIFFWriteScanline, - AC_CHECK_HEADER(tiffio.h, -- TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz', -+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz', - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)), - AC_CHECK_LIB(tiff34, TIFFFlushData, - AC_CHECK_HEADER(tiffio.h, +--- configure.in.orig Wed May 27 23:32:15 1998 ++++ configure.in Wed May 27 23:32:30 1998 @@ -306,7 +306,7 @@ LIBS="$gimp_save_LIBS" gimpdatadir=$datadir/gimp -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION -++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER ++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION + + brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` + gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile` +--- configure.orig Wed May 27 23:32:17 1998 ++++ configure Wed May 27 23:32:38 1998 +@@ -4146,7 +4146,7 @@ + LIBS="$gimp_save_LIBS" + + gimpdatadir=$datadir/gimp +-gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION ++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile` diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist index 5339ab517bc3..8dd716d230c0 100644 --- a/graphics/gimp/pkg-plist +++ b/graphics/gimp/pkg-plist @@ -1,4 +1,6 @@ bin/gimp +bin/gimptool +include/gpc.h include/megawidget.h include/gck/gck.h include/gck/gckcolor.h @@ -25,133 +27,134 @@ lib/libgimpui.a lib/libgimpui.la lib/libgimpui.so lib/libgimpui.so.1.0 +lib/libgpc.a lib/libmegawidget.a -libexec/gimp/plug-ins/AlienMap -libexec/gimp/plug-ins/CEL -libexec/gimp/plug-ins/CML_explorer -libexec/gimp/plug-ins/MapObject -libexec/gimp/plug-ins/aa -libexec/gimp/plug-ins/align_layers -libexec/gimp/plug-ins/animationplay -libexec/gimp/plug-ins/animoptimize -libexec/gimp/plug-ins/apply_lens -libexec/gimp/plug-ins/autocrop -libexec/gimp/plug-ins/autostretch_hsv -libexec/gimp/plug-ins/blinds -libexec/gimp/plug-ins/blur -libexec/gimp/plug-ins/bmp -libexec/gimp/plug-ins/bumpmap -libexec/gimp/plug-ins/bz2 -libexec/gimp/plug-ins/c_astretch -libexec/gimp/plug-ins/checkerboard -libexec/gimp/plug-ins/colorify -libexec/gimp/plug-ins/compose -libexec/gimp/plug-ins/convmatrix -libexec/gimp/plug-ins/cubism -libexec/gimp/plug-ins/dbbrowser -libexec/gimp/plug-ins/decompose -libexec/gimp/plug-ins/deinterlace -libexec/gimp/plug-ins/depthmerge -libexec/gimp/plug-ins/despeckle -libexec/gimp/plug-ins/destripe -libexec/gimp/plug-ins/diffraction -libexec/gimp/plug-ins/displace -libexec/gimp/plug-ins/edge -libexec/gimp/plug-ins/emboss -libexec/gimp/plug-ins/engrave -libexec/gimp/plug-ins/exchange -libexec/gimp/plug-ins/faxg3 -libexec/gimp/plug-ins/film -libexec/gimp/plug-ins/fits -libexec/gimp/plug-ins/flame -libexec/gimp/plug-ins/flarefx -libexec/gimp/plug-ins/fractaltrace -libexec/gimp/plug-ins/gauss_iir -libexec/gimp/plug-ins/gauss_rle -libexec/gimp/plug-ins/gbr -libexec/gimp/plug-ins/gfig -libexec/gimp/plug-ins/gfli -libexec/gimp/plug-ins/gee -libexec/gimp/plug-ins/gicon -libexec/gimp/plug-ins/gif -libexec/gimp/plug-ins/glasstile -libexec/gimp/plug-ins/gqbist -libexec/gimp/plug-ins/gradmap -libexec/gimp/plug-ins/grid -libexec/gimp/plug-ins/gtm -libexec/gimp/plug-ins/gz -libexec/gimp/plug-ins/header -libexec/gimp/plug-ins/hot -libexec/gimp/plug-ins/hrz -libexec/gimp/plug-ins/ifscompose -libexec/gimp/plug-ins/illusion -libexec/gimp/plug-ins/iwarp -libexec/gimp/plug-ins/jpeg -libexec/gimp/plug-ins/laplace -libexec/gimp/plug-ins/libgpc.a -libexec/gimp/plug-ins/mail -libexec/gimp/plug-ins/max_rgb -libexec/gimp/plug-ins/maze -libexec/gimp/plug-ins/mblur -libexec/gimp/plug-ins/mosaic -libexec/gimp/plug-ins/mpeg -libexec/gimp/plug-ins/nlfilt -libexec/gimp/plug-ins/noisify -libexec/gimp/plug-ins/normalize -libexec/gimp/plug-ins/nova -libexec/gimp/plug-ins/oilify -libexec/gimp/plug-ins/pagecurl -libexec/gimp/plug-ins/palette -libexec/gimp/plug-ins/papertile -libexec/gimp/plug-ins/pat -libexec/gimp/plug-ins/pcx -libexec/gimp/plug-ins/pix -libexec/gimp/plug-ins/pixelize -libexec/gimp/plug-ins/plasma -libexec/gimp/plug-ins/png -libexec/gimp/plug-ins/pnm -libexec/gimp/plug-ins/polar -libexec/gimp/plug-ins/print -libexec/gimp/plug-ins/ps -libexec/gimp/plug-ins/psd -libexec/gimp/plug-ins/randomize -libexec/gimp/plug-ins/ripple -libexec/gimp/plug-ins/rotate -libexec/gimp/plug-ins/rotators -libexec/gimp/plug-ins/scatter_hsv -libexec/gimp/plug-ins/screenshot -libexec/gimp/plug-ins/script-fu -libexec/gimp/plug-ins/semiflatten -libexec/gimp/plug-ins/sgi -libexec/gimp/plug-ins/sharpen -libexec/gimp/plug-ins/shift -libexec/gimp/plug-ins/sinus -libexec/gimp/plug-ins/smooth_palette -libexec/gimp/plug-ins/snoise -libexec/gimp/plug-ins/snp -libexec/gimp/plug-ins/sobel -libexec/gimp/plug-ins/sparkle -libexec/gimp/plug-ins/spread -libexec/gimp/plug-ins/struc -libexec/gimp/plug-ins/sunras -libexec/gimp/plug-ins/tga -libexec/gimp/plug-ins/threshold_alpha -libexec/gimp/plug-ins/tiff -libexec/gimp/plug-ins/tile -libexec/gimp/plug-ins/tileit -libexec/gimp/plug-ins/tiler -libexec/gimp/plug-ins/url -libexec/gimp/plug-ins/video -libexec/gimp/plug-ins/vinvert -libexec/gimp/plug-ins/vpropagate -libexec/gimp/plug-ins/waves -libexec/gimp/plug-ins/webbrowser -libexec/gimp/plug-ins/whirlpinch -libexec/gimp/plug-ins/xd -libexec/gimp/plug-ins/xpm -libexec/gimp/plug-ins/xwd -libexec/gimp/plug-ins/zealouscrop +libexec/gimp/0.99/plug-ins/AlienMap +libexec/gimp/0.99/plug-ins/CEL +libexec/gimp/0.99/plug-ins/CML_explorer +libexec/gimp/0.99/plug-ins/MapObject +libexec/gimp/0.99/plug-ins/aa +libexec/gimp/0.99/plug-ins/align_layers +libexec/gimp/0.99/plug-ins/animationplay +libexec/gimp/0.99/plug-ins/animoptimize +libexec/gimp/0.99/plug-ins/apply_lens +libexec/gimp/0.99/plug-ins/autocrop +libexec/gimp/0.99/plug-ins/autostretch_hsv +libexec/gimp/0.99/plug-ins/blinds +libexec/gimp/0.99/plug-ins/blur +libexec/gimp/0.99/plug-ins/bmp +libexec/gimp/0.99/plug-ins/bumpmap +libexec/gimp/0.99/plug-ins/bz2 +libexec/gimp/0.99/plug-ins/c_astretch +libexec/gimp/0.99/plug-ins/checkerboard +libexec/gimp/0.99/plug-ins/colorify +libexec/gimp/0.99/plug-ins/compose +libexec/gimp/0.99/plug-ins/convmatrix +libexec/gimp/0.99/plug-ins/cubism +libexec/gimp/0.99/plug-ins/dbbrowser +libexec/gimp/0.99/plug-ins/decompose +libexec/gimp/0.99/plug-ins/deinterlace +libexec/gimp/0.99/plug-ins/depthmerge +libexec/gimp/0.99/plug-ins/despeckle +libexec/gimp/0.99/plug-ins/destripe +libexec/gimp/0.99/plug-ins/diffraction +libexec/gimp/0.99/plug-ins/displace +libexec/gimp/0.99/plug-ins/edge +libexec/gimp/0.99/plug-ins/emboss +libexec/gimp/0.99/plug-ins/engrave +libexec/gimp/0.99/plug-ins/exchange +libexec/gimp/0.99/plug-ins/faxg3 +libexec/gimp/0.99/plug-ins/film +libexec/gimp/0.99/plug-ins/fits +libexec/gimp/0.99/plug-ins/flame +libexec/gimp/0.99/plug-ins/flarefx +libexec/gimp/0.99/plug-ins/fractaltrace +libexec/gimp/0.99/plug-ins/gauss_iir +libexec/gimp/0.99/plug-ins/gauss_rle +libexec/gimp/0.99/plug-ins/gbr +libexec/gimp/0.99/plug-ins/gfig +libexec/gimp/0.99/plug-ins/gfli +libexec/gimp/0.99/plug-ins/gee +libexec/gimp/0.99/plug-ins/gicon +libexec/gimp/0.99/plug-ins/gif +libexec/gimp/0.99/plug-ins/glasstile +libexec/gimp/0.99/plug-ins/gqbist +libexec/gimp/0.99/plug-ins/gradmap +libexec/gimp/0.99/plug-ins/grid +libexec/gimp/0.99/plug-ins/gtm +libexec/gimp/0.99/plug-ins/gz +libexec/gimp/0.99/plug-ins/header +libexec/gimp/0.99/plug-ins/hot +libexec/gimp/0.99/plug-ins/hrz +libexec/gimp/0.99/plug-ins/ifscompose +libexec/gimp/0.99/plug-ins/illusion +libexec/gimp/0.99/plug-ins/iwarp +libexec/gimp/0.99/plug-ins/jpeg +libexec/gimp/0.99/plug-ins/laplace +libexec/gimp/0.99/plug-ins/mail +libexec/gimp/0.99/plug-ins/max_rgb +libexec/gimp/0.99/plug-ins/maze +libexec/gimp/0.99/plug-ins/mblur +libexec/gimp/0.99/plug-ins/mosaic +libexec/gimp/0.99/plug-ins/mpeg +libexec/gimp/0.99/plug-ins/nlfilt +libexec/gimp/0.99/plug-ins/noisify +libexec/gimp/0.99/plug-ins/normalize +libexec/gimp/0.99/plug-ins/nova +libexec/gimp/0.99/plug-ins/oilify +libexec/gimp/0.99/plug-ins/pagecurl +libexec/gimp/0.99/plug-ins/palette +libexec/gimp/0.99/plug-ins/papertile +libexec/gimp/0.99/plug-ins/pat +libexec/gimp/0.99/plug-ins/pcx +libexec/gimp/0.99/plug-ins/pix +libexec/gimp/0.99/plug-ins/pixelize +libexec/gimp/0.99/plug-ins/plasma +libexec/gimp/0.99/plug-ins/png +libexec/gimp/0.99/plug-ins/pnm +libexec/gimp/0.99/plug-ins/polar +libexec/gimp/0.99/plug-ins/print +libexec/gimp/0.99/plug-ins/ps +libexec/gimp/0.99/plug-ins/psd +libexec/gimp/0.99/plug-ins/randomize +libexec/gimp/0.99/plug-ins/ripple +libexec/gimp/0.99/plug-ins/rotate +libexec/gimp/0.99/plug-ins/rotators +libexec/gimp/0.99/plug-ins/scatter_hsv +libexec/gimp/0.99/plug-ins/screenshot +libexec/gimp/0.99/plug-ins/script-fu +libexec/gimp/0.99/plug-ins/semiflatten +libexec/gimp/0.99/plug-ins/sgi +libexec/gimp/0.99/plug-ins/sharpen +libexec/gimp/0.99/plug-ins/shift +libexec/gimp/0.99/plug-ins/sinus +libexec/gimp/0.99/plug-ins/smooth_palette +libexec/gimp/0.99/plug-ins/snoise +libexec/gimp/0.99/plug-ins/snp +libexec/gimp/0.99/plug-ins/sobel +libexec/gimp/0.99/plug-ins/sparkle +libexec/gimp/0.99/plug-ins/spread +libexec/gimp/0.99/plug-ins/struc +libexec/gimp/0.99/plug-ins/sunras +libexec/gimp/0.99/plug-ins/tga +libexec/gimp/0.99/plug-ins/threshold_alpha +libexec/gimp/0.99/plug-ins/tiff +libexec/gimp/0.99/plug-ins/tile +libexec/gimp/0.99/plug-ins/tileit +libexec/gimp/0.99/plug-ins/tiler +libexec/gimp/0.99/plug-ins/url +libexec/gimp/0.99/plug-ins/video +libexec/gimp/0.99/plug-ins/vinvert +libexec/gimp/0.99/plug-ins/vpropagate +libexec/gimp/0.99/plug-ins/waves +libexec/gimp/0.99/plug-ins/webbrowser +libexec/gimp/0.99/plug-ins/whirlpinch +libexec/gimp/0.99/plug-ins/xpm +libexec/gimp/0.99/plug-ins/xwd +libexec/gimp/0.99/plug-ins/zealouscrop man/man1/gimp.1.gz +man/man1/gimptool.1.gz +man/man3/gpc.3.gz share/gimp/brushes/10x10square.gbr share/gimp/brushes/10x10squareBlur.gbr share/gimp/brushes/11circle.gbr @@ -627,7 +630,8 @@ share/gimp/gimp_logo.ppm share/gimp/gimp_splash.ppm share/gimp/gimp_tips.txt share/gimp/ps-menurc -@dirrm libexec/gimp/plug-ins +@dirrm libexec/gimp/0.99/plug-ins +@dirrm libexec/gimp/0.99 @dirrm libexec/gimp @dirrm include/libgimp @dirrm include/gck diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile index 8e2419dec35d..ea01d9bf4c35 100644 --- a/graphics/gimp1/Makefile +++ b/graphics/gimp1/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Nov 18 21:28:43 CST 1996 # Whom: erich@FreeBSD.org # -# $Id: Makefile,v 1.31 1998/05/19 03:09:09 jdp Exp $ +# $Id: Makefile,v 1.32 1998/05/21 21:28:51 mph Exp $ # MAJOR= 0 @@ -26,11 +26,11 @@ MAINTAINER= erich@FreeBSD.org LIB_DEPENDS+= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm LIB_DEPENDS+= aa\\.1\\.:${PORTSDIR}/graphics/aalib LIB_DEPENDS+= jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg -LIB_DEPENDS+= gtk\\.1\\.2:${PORTSDIR}/x11/gtk +LIB_DEPENDS+= gtk\\.1\\.3:${PORTSDIR}/x11/gtk LIB_DEPENDS+= mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib LIB_DEPENDS+= png\\.2\\.:${PORTSDIR}/graphics/png LIB_DEPENDS+= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 -LIB_DEPENDS+= xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta +#LIB_DEPENDS+= xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta USE_X11= yes GNU_CONFIGURE= yes @@ -40,7 +40,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/tiff34" \ LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755' -MAN1= gimp.1 +MAN1= gimp.1 gimptool.1 +MAN3= gpc.3 DATASTUFF= brushes palettes gradients patterns diff --git a/graphics/gimp1/files/patch-ac b/graphics/gimp1/files/patch-ac new file mode 100644 index 000000000000..29a131ca3e9f --- /dev/null +++ b/graphics/gimp1/files/patch-ac @@ -0,0 +1,225 @@ +--- plug-ins/gpc/Makefile.am.orig Wed May 27 23:47:43 1998 ++++ plug-ins/gpc/Makefile.am Wed May 27 23:48:43 1998 +@@ -1,11 +1,15 @@ + ## Process this file with automake to produce Makefile.in + +-pluginlibdir = $(gimpplugindir)/plug-ins ++pluginlibdir = $(libdir) ++gimpincludedir = $(includedir) + + pluginlib_LIBRARIES = libgpc.a + + libgpc_a_SOURCES = \ +- gpc.c gpc.h ++ gpc.c ++ ++gimpinclude_HEADERS = \ ++ gpc.h + + INCLUDES = \ + $(X_CFLAGS) \ +--- plug-ins/gpc/Makefile.in.orig Wed May 27 23:47:45 1998 ++++ plug-ins/gpc/Makefile.in Wed May 27 23:48:52 1998 +@@ -115,12 +115,16 @@ + palettedata = @palettedata@ + patterndata = @patterndata@ + +-pluginlibdir = $(gimpplugindir)/plug-ins ++pluginlibdir = $(libdir) ++gimpincludedir = $(includedir) + + pluginlib_LIBRARIES = libgpc.a + + libgpc_a_SOURCES = \ +- gpc.c gpc.h ++ gpc.c ++ ++gimpinclude_HEADERS = \ ++ gpc.h + + INCLUDES = \ + $(X_CFLAGS) \ +@@ -163,6 +167,8 @@ + MANS = $(man_MANS) + + NROFF = nroff ++HEADERS = $(gimpinclude_HEADERS) ++ + DIST_COMMON = Makefile.am Makefile.in + + +@@ -170,17 +176,18 @@ + + TAR = tar + GZIP = --best ++DEP_FILES = .deps/gpc.P + SOURCES = $(libgpc_a_SOURCES) + OBJECTS = $(libgpc_a_OBJECTS) + +-all: Makefile $(LIBRARIES) $(MANS) ++all: Makefile $(LIBRARIES) $(MANS) $(HEADERS) + + .SUFFIXES: + .SUFFIXES: .S .c .lo .o .s + $(srcdir)/Makefile.in: @MAINT@ 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 + +@@ -217,9 +224,6 @@ + rm -f $(DESTDIR)$(pluginlibdir)/$$p; \ + done + +-.c.o: +- $(COMPILE) -c $< +- + .s.o: + $(COMPILE) -c $< + +@@ -236,9 +240,6 @@ + + maintainer-clean-compile: + +-.c.lo: +- $(LIBTOOL) --mode=compile $(COMPILE) -c $< +- + .s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +@@ -299,6 +300,21 @@ + @$(NORMAL_UNINSTALL) + $(MAKE) 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) +@@ -329,6 +345,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); \ + test -f $(distdir)/$$file \ +@@ -336,6 +357,29 @@ + || cp -p $$d/$$file $(distdir)/$$file; \ + done + ++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) ++ ++-include $(DEP_FILES) ++ ++mostlyclean-depend: ++ ++clean-depend: ++ ++distclean-depend: ++ ++maintainer-clean-depend: ++ -rm -rf .deps ++ ++%.o: %.c ++ @echo '$(COMPILE) -c $<'; \ ++ $(COMPILE) -Wp,-MD,.deps/$(*F).P -c $< ++ ++%.lo: %.c ++ @echo '$(LTCOMPILE) -c $<'; \ ++ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $< ++ @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \ ++ < .deps/$(*F).p > .deps/$(*F).P ++ @-rm -f .deps/$(*F).p + info: + dvi: + check: all +@@ -344,18 +388,19 @@ + install-exec: + @$(NORMAL_INSTALL) + +-install-data: install-pluginlibLIBRARIES install-man ++install-data: install-pluginlibLIBRARIES install-man install-gimpincludeHEADERS + @$(NORMAL_INSTALL) + + install: install-exec install-data all + @: + +-uninstall: uninstall-pluginlibLIBRARIES uninstall-man ++uninstall: uninstall-pluginlibLIBRARIES uninstall-man uninstall-gimpincludeHEADERS + + install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + installdirs: +- $(mkinstalldirs) $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 ++ $(mkinstalldirs) $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 \ ++ $(DATADIR)$(gimpincludedir) + + + mostlyclean-generic: +@@ -373,22 +418,22 @@ + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + mostlyclean: mostlyclean-pluginlibLIBRARIES mostlyclean-compile \ +- mostlyclean-libtool mostlyclean-tags \ ++ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic + + clean: clean-pluginlibLIBRARIES clean-compile clean-libtool clean-tags \ +- clean-generic mostlyclean ++ clean-depend clean-generic mostlyclean + + distclean: distclean-pluginlibLIBRARIES distclean-compile \ +- distclean-libtool distclean-tags distclean-generic \ +- clean ++ distclean-libtool distclean-tags distclean-depend \ ++ distclean-generic clean + -rm -f config.status + -rm -f libtool + + maintainer-clean: maintainer-clean-pluginlibLIBRARIES \ + maintainer-clean-compile maintainer-clean-libtool \ +- maintainer-clean-tags maintainer-clean-generic \ +- distclean ++ maintainer-clean-tags maintainer-clean-depend \ ++ maintainer-clean-generic distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +@@ -398,10 +443,12 @@ + 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 dvi installcheck \ +-install-exec install-data install uninstall all installdirs \ +-mostlyclean-generic distclean-generic clean-generic \ ++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 dvi \ ++installcheck install-exec install-data install uninstall all \ ++installdirs mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + diff --git a/graphics/gimp1/files/patch-ah b/graphics/gimp1/files/patch-ah index a019dd5a4238..b5a2a29dcd04 100644 --- a/graphics/gimp1/files/patch-ah +++ b/graphics/gimp1/files/patch-ah @@ -1,29 +1,22 @@ ---- configure.in.orig Sun May 17 01:16:39 1998 -+++ configure.in Sun May 17 16:04:23 1998 -@@ -117,13 +117,13 @@ - - dnl Test for libtiff - if test -z "$LIBTIFF_LIB"; then -- AC_CHECK_LIB(tiff, TIFFReadScanline, -+ AC_CHECK_LIB(tiff34, TIFFReadScanline, - AC_CHECK_HEADER(tiffio.h, -- TIFF='tiff'; LIBTIFF_LIB='-ltiff', -+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34', - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)), -- AC_CHECK_LIB(tiff, TIFFWriteScanline, -+ AC_CHECK_LIB(tiff34, TIFFWriteScanline, - AC_CHECK_HEADER(tiffio.h, -- TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz', -+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz', - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)), - AC_CHECK_LIB(tiff34, TIFFFlushData, - AC_CHECK_HEADER(tiffio.h, +--- configure.in.orig Wed May 27 23:32:15 1998 ++++ configure.in Wed May 27 23:32:30 1998 @@ -306,7 +306,7 @@ LIBS="$gimp_save_LIBS" gimpdatadir=$datadir/gimp -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION -++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER ++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION + + brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` + gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile` +--- configure.orig Wed May 27 23:32:17 1998 ++++ configure Wed May 27 23:32:38 1998 +@@ -4146,7 +4146,7 @@ + LIBS="$gimp_save_LIBS" + + gimpdatadir=$datadir/gimp +-gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION ++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile` diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist index 5339ab517bc3..8dd716d230c0 100644 --- a/graphics/gimp1/pkg-plist +++ b/graphics/gimp1/pkg-plist @@ -1,4 +1,6 @@ bin/gimp +bin/gimptool +include/gpc.h include/megawidget.h include/gck/gck.h include/gck/gckcolor.h @@ -25,133 +27,134 @@ lib/libgimpui.a lib/libgimpui.la lib/libgimpui.so lib/libgimpui.so.1.0 +lib/libgpc.a lib/libmegawidget.a -libexec/gimp/plug-ins/AlienMap -libexec/gimp/plug-ins/CEL -libexec/gimp/plug-ins/CML_explorer -libexec/gimp/plug-ins/MapObject -libexec/gimp/plug-ins/aa -libexec/gimp/plug-ins/align_layers -libexec/gimp/plug-ins/animationplay -libexec/gimp/plug-ins/animoptimize -libexec/gimp/plug-ins/apply_lens -libexec/gimp/plug-ins/autocrop -libexec/gimp/plug-ins/autostretch_hsv -libexec/gimp/plug-ins/blinds -libexec/gimp/plug-ins/blur -libexec/gimp/plug-ins/bmp -libexec/gimp/plug-ins/bumpmap -libexec/gimp/plug-ins/bz2 -libexec/gimp/plug-ins/c_astretch -libexec/gimp/plug-ins/checkerboard -libexec/gimp/plug-ins/colorify -libexec/gimp/plug-ins/compose -libexec/gimp/plug-ins/convmatrix -libexec/gimp/plug-ins/cubism -libexec/gimp/plug-ins/dbbrowser -libexec/gimp/plug-ins/decompose -libexec/gimp/plug-ins/deinterlace -libexec/gimp/plug-ins/depthmerge -libexec/gimp/plug-ins/despeckle -libexec/gimp/plug-ins/destripe -libexec/gimp/plug-ins/diffraction -libexec/gimp/plug-ins/displace -libexec/gimp/plug-ins/edge -libexec/gimp/plug-ins/emboss -libexec/gimp/plug-ins/engrave -libexec/gimp/plug-ins/exchange -libexec/gimp/plug-ins/faxg3 -libexec/gimp/plug-ins/film -libexec/gimp/plug-ins/fits -libexec/gimp/plug-ins/flame -libexec/gimp/plug-ins/flarefx -libexec/gimp/plug-ins/fractaltrace -libexec/gimp/plug-ins/gauss_iir -libexec/gimp/plug-ins/gauss_rle -libexec/gimp/plug-ins/gbr -libexec/gimp/plug-ins/gfig -libexec/gimp/plug-ins/gfli -libexec/gimp/plug-ins/gee -libexec/gimp/plug-ins/gicon -libexec/gimp/plug-ins/gif -libexec/gimp/plug-ins/glasstile -libexec/gimp/plug-ins/gqbist -libexec/gimp/plug-ins/gradmap -libexec/gimp/plug-ins/grid -libexec/gimp/plug-ins/gtm -libexec/gimp/plug-ins/gz -libexec/gimp/plug-ins/header -libexec/gimp/plug-ins/hot -libexec/gimp/plug-ins/hrz -libexec/gimp/plug-ins/ifscompose -libexec/gimp/plug-ins/illusion -libexec/gimp/plug-ins/iwarp -libexec/gimp/plug-ins/jpeg -libexec/gimp/plug-ins/laplace -libexec/gimp/plug-ins/libgpc.a -libexec/gimp/plug-ins/mail -libexec/gimp/plug-ins/max_rgb -libexec/gimp/plug-ins/maze -libexec/gimp/plug-ins/mblur -libexec/gimp/plug-ins/mosaic -libexec/gimp/plug-ins/mpeg -libexec/gimp/plug-ins/nlfilt -libexec/gimp/plug-ins/noisify -libexec/gimp/plug-ins/normalize -libexec/gimp/plug-ins/nova -libexec/gimp/plug-ins/oilify -libexec/gimp/plug-ins/pagecurl -libexec/gimp/plug-ins/palette -libexec/gimp/plug-ins/papertile -libexec/gimp/plug-ins/pat -libexec/gimp/plug-ins/pcx -libexec/gimp/plug-ins/pix -libexec/gimp/plug-ins/pixelize -libexec/gimp/plug-ins/plasma -libexec/gimp/plug-ins/png -libexec/gimp/plug-ins/pnm -libexec/gimp/plug-ins/polar -libexec/gimp/plug-ins/print -libexec/gimp/plug-ins/ps -libexec/gimp/plug-ins/psd -libexec/gimp/plug-ins/randomize -libexec/gimp/plug-ins/ripple -libexec/gimp/plug-ins/rotate -libexec/gimp/plug-ins/rotators -libexec/gimp/plug-ins/scatter_hsv -libexec/gimp/plug-ins/screenshot -libexec/gimp/plug-ins/script-fu -libexec/gimp/plug-ins/semiflatten -libexec/gimp/plug-ins/sgi -libexec/gimp/plug-ins/sharpen -libexec/gimp/plug-ins/shift -libexec/gimp/plug-ins/sinus -libexec/gimp/plug-ins/smooth_palette -libexec/gimp/plug-ins/snoise -libexec/gimp/plug-ins/snp -libexec/gimp/plug-ins/sobel -libexec/gimp/plug-ins/sparkle -libexec/gimp/plug-ins/spread -libexec/gimp/plug-ins/struc -libexec/gimp/plug-ins/sunras -libexec/gimp/plug-ins/tga -libexec/gimp/plug-ins/threshold_alpha -libexec/gimp/plug-ins/tiff -libexec/gimp/plug-ins/tile -libexec/gimp/plug-ins/tileit -libexec/gimp/plug-ins/tiler -libexec/gimp/plug-ins/url -libexec/gimp/plug-ins/video -libexec/gimp/plug-ins/vinvert -libexec/gimp/plug-ins/vpropagate -libexec/gimp/plug-ins/waves -libexec/gimp/plug-ins/webbrowser -libexec/gimp/plug-ins/whirlpinch -libexec/gimp/plug-ins/xd -libexec/gimp/plug-ins/xpm -libexec/gimp/plug-ins/xwd -libexec/gimp/plug-ins/zealouscrop +libexec/gimp/0.99/plug-ins/AlienMap +libexec/gimp/0.99/plug-ins/CEL +libexec/gimp/0.99/plug-ins/CML_explorer +libexec/gimp/0.99/plug-ins/MapObject +libexec/gimp/0.99/plug-ins/aa +libexec/gimp/0.99/plug-ins/align_layers +libexec/gimp/0.99/plug-ins/animationplay +libexec/gimp/0.99/plug-ins/animoptimize +libexec/gimp/0.99/plug-ins/apply_lens +libexec/gimp/0.99/plug-ins/autocrop +libexec/gimp/0.99/plug-ins/autostretch_hsv +libexec/gimp/0.99/plug-ins/blinds +libexec/gimp/0.99/plug-ins/blur +libexec/gimp/0.99/plug-ins/bmp +libexec/gimp/0.99/plug-ins/bumpmap +libexec/gimp/0.99/plug-ins/bz2 +libexec/gimp/0.99/plug-ins/c_astretch +libexec/gimp/0.99/plug-ins/checkerboard +libexec/gimp/0.99/plug-ins/colorify +libexec/gimp/0.99/plug-ins/compose +libexec/gimp/0.99/plug-ins/convmatrix +libexec/gimp/0.99/plug-ins/cubism +libexec/gimp/0.99/plug-ins/dbbrowser +libexec/gimp/0.99/plug-ins/decompose +libexec/gimp/0.99/plug-ins/deinterlace +libexec/gimp/0.99/plug-ins/depthmerge +libexec/gimp/0.99/plug-ins/despeckle +libexec/gimp/0.99/plug-ins/destripe +libexec/gimp/0.99/plug-ins/diffraction +libexec/gimp/0.99/plug-ins/displace +libexec/gimp/0.99/plug-ins/edge +libexec/gimp/0.99/plug-ins/emboss +libexec/gimp/0.99/plug-ins/engrave +libexec/gimp/0.99/plug-ins/exchange +libexec/gimp/0.99/plug-ins/faxg3 +libexec/gimp/0.99/plug-ins/film +libexec/gimp/0.99/plug-ins/fits +libexec/gimp/0.99/plug-ins/flame +libexec/gimp/0.99/plug-ins/flarefx +libexec/gimp/0.99/plug-ins/fractaltrace +libexec/gimp/0.99/plug-ins/gauss_iir +libexec/gimp/0.99/plug-ins/gauss_rle +libexec/gimp/0.99/plug-ins/gbr +libexec/gimp/0.99/plug-ins/gfig +libexec/gimp/0.99/plug-ins/gfli +libexec/gimp/0.99/plug-ins/gee +libexec/gimp/0.99/plug-ins/gicon +libexec/gimp/0.99/plug-ins/gif +libexec/gimp/0.99/plug-ins/glasstile +libexec/gimp/0.99/plug-ins/gqbist +libexec/gimp/0.99/plug-ins/gradmap +libexec/gimp/0.99/plug-ins/grid +libexec/gimp/0.99/plug-ins/gtm +libexec/gimp/0.99/plug-ins/gz +libexec/gimp/0.99/plug-ins/header +libexec/gimp/0.99/plug-ins/hot +libexec/gimp/0.99/plug-ins/hrz +libexec/gimp/0.99/plug-ins/ifscompose +libexec/gimp/0.99/plug-ins/illusion +libexec/gimp/0.99/plug-ins/iwarp +libexec/gimp/0.99/plug-ins/jpeg +libexec/gimp/0.99/plug-ins/laplace +libexec/gimp/0.99/plug-ins/mail +libexec/gimp/0.99/plug-ins/max_rgb +libexec/gimp/0.99/plug-ins/maze +libexec/gimp/0.99/plug-ins/mblur +libexec/gimp/0.99/plug-ins/mosaic +libexec/gimp/0.99/plug-ins/mpeg +libexec/gimp/0.99/plug-ins/nlfilt +libexec/gimp/0.99/plug-ins/noisify +libexec/gimp/0.99/plug-ins/normalize +libexec/gimp/0.99/plug-ins/nova +libexec/gimp/0.99/plug-ins/oilify +libexec/gimp/0.99/plug-ins/pagecurl +libexec/gimp/0.99/plug-ins/palette +libexec/gimp/0.99/plug-ins/papertile +libexec/gimp/0.99/plug-ins/pat +libexec/gimp/0.99/plug-ins/pcx +libexec/gimp/0.99/plug-ins/pix +libexec/gimp/0.99/plug-ins/pixelize +libexec/gimp/0.99/plug-ins/plasma +libexec/gimp/0.99/plug-ins/png +libexec/gimp/0.99/plug-ins/pnm +libexec/gimp/0.99/plug-ins/polar +libexec/gimp/0.99/plug-ins/print +libexec/gimp/0.99/plug-ins/ps +libexec/gimp/0.99/plug-ins/psd +libexec/gimp/0.99/plug-ins/randomize +libexec/gimp/0.99/plug-ins/ripple +libexec/gimp/0.99/plug-ins/rotate +libexec/gimp/0.99/plug-ins/rotators +libexec/gimp/0.99/plug-ins/scatter_hsv +libexec/gimp/0.99/plug-ins/screenshot +libexec/gimp/0.99/plug-ins/script-fu +libexec/gimp/0.99/plug-ins/semiflatten +libexec/gimp/0.99/plug-ins/sgi +libexec/gimp/0.99/plug-ins/sharpen +libexec/gimp/0.99/plug-ins/shift +libexec/gimp/0.99/plug-ins/sinus +libexec/gimp/0.99/plug-ins/smooth_palette +libexec/gimp/0.99/plug-ins/snoise +libexec/gimp/0.99/plug-ins/snp +libexec/gimp/0.99/plug-ins/sobel +libexec/gimp/0.99/plug-ins/sparkle +libexec/gimp/0.99/plug-ins/spread +libexec/gimp/0.99/plug-ins/struc +libexec/gimp/0.99/plug-ins/sunras +libexec/gimp/0.99/plug-ins/tga +libexec/gimp/0.99/plug-ins/threshold_alpha +libexec/gimp/0.99/plug-ins/tiff +libexec/gimp/0.99/plug-ins/tile +libexec/gimp/0.99/plug-ins/tileit +libexec/gimp/0.99/plug-ins/tiler +libexec/gimp/0.99/plug-ins/url +libexec/gimp/0.99/plug-ins/video +libexec/gimp/0.99/plug-ins/vinvert +libexec/gimp/0.99/plug-ins/vpropagate +libexec/gimp/0.99/plug-ins/waves +libexec/gimp/0.99/plug-ins/webbrowser +libexec/gimp/0.99/plug-ins/whirlpinch +libexec/gimp/0.99/plug-ins/xpm +libexec/gimp/0.99/plug-ins/xwd +libexec/gimp/0.99/plug-ins/zealouscrop man/man1/gimp.1.gz +man/man1/gimptool.1.gz +man/man3/gpc.3.gz share/gimp/brushes/10x10square.gbr share/gimp/brushes/10x10squareBlur.gbr share/gimp/brushes/11circle.gbr @@ -627,7 +630,8 @@ share/gimp/gimp_logo.ppm share/gimp/gimp_splash.ppm share/gimp/gimp_tips.txt share/gimp/ps-menurc -@dirrm libexec/gimp/plug-ins +@dirrm libexec/gimp/0.99/plug-ins +@dirrm libexec/gimp/0.99 @dirrm libexec/gimp @dirrm include/libgimp @dirrm include/gck diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile index 8e2419dec35d..ea01d9bf4c35 100644 --- a/graphics/gimpshop/Makefile +++ b/graphics/gimpshop/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Nov 18 21:28:43 CST 1996 # Whom: erich@FreeBSD.org # -# $Id: Makefile,v 1.31 1998/05/19 03:09:09 jdp Exp $ +# $Id: Makefile,v 1.32 1998/05/21 21:28:51 mph Exp $ # MAJOR= 0 @@ -26,11 +26,11 @@ MAINTAINER= erich@FreeBSD.org LIB_DEPENDS+= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm LIB_DEPENDS+= aa\\.1\\.:${PORTSDIR}/graphics/aalib LIB_DEPENDS+= jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg -LIB_DEPENDS+= gtk\\.1\\.2:${PORTSDIR}/x11/gtk +LIB_DEPENDS+= gtk\\.1\\.3:${PORTSDIR}/x11/gtk LIB_DEPENDS+= mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib LIB_DEPENDS+= png\\.2\\.:${PORTSDIR}/graphics/png LIB_DEPENDS+= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 -LIB_DEPENDS+= xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta +#LIB_DEPENDS+= xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta USE_X11= yes GNU_CONFIGURE= yes @@ -40,7 +40,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/tiff34" \ LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755' -MAN1= gimp.1 +MAN1= gimp.1 gimptool.1 +MAN3= gpc.3 DATASTUFF= brushes palettes gradients patterns diff --git a/graphics/gimpshop/files/patch-ac b/graphics/gimpshop/files/patch-ac new file mode 100644 index 000000000000..29a131ca3e9f --- /dev/null +++ b/graphics/gimpshop/files/patch-ac @@ -0,0 +1,225 @@ +--- plug-ins/gpc/Makefile.am.orig Wed May 27 23:47:43 1998 ++++ plug-ins/gpc/Makefile.am Wed May 27 23:48:43 1998 +@@ -1,11 +1,15 @@ + ## Process this file with automake to produce Makefile.in + +-pluginlibdir = $(gimpplugindir)/plug-ins ++pluginlibdir = $(libdir) ++gimpincludedir = $(includedir) + + pluginlib_LIBRARIES = libgpc.a + + libgpc_a_SOURCES = \ +- gpc.c gpc.h ++ gpc.c ++ ++gimpinclude_HEADERS = \ ++ gpc.h + + INCLUDES = \ + $(X_CFLAGS) \ +--- plug-ins/gpc/Makefile.in.orig Wed May 27 23:47:45 1998 ++++ plug-ins/gpc/Makefile.in Wed May 27 23:48:52 1998 +@@ -115,12 +115,16 @@ + palettedata = @palettedata@ + patterndata = @patterndata@ + +-pluginlibdir = $(gimpplugindir)/plug-ins ++pluginlibdir = $(libdir) ++gimpincludedir = $(includedir) + + pluginlib_LIBRARIES = libgpc.a + + libgpc_a_SOURCES = \ +- gpc.c gpc.h ++ gpc.c ++ ++gimpinclude_HEADERS = \ ++ gpc.h + + INCLUDES = \ + $(X_CFLAGS) \ +@@ -163,6 +167,8 @@ + MANS = $(man_MANS) + + NROFF = nroff ++HEADERS = $(gimpinclude_HEADERS) ++ + DIST_COMMON = Makefile.am Makefile.in + + +@@ -170,17 +176,18 @@ + + TAR = tar + GZIP = --best ++DEP_FILES = .deps/gpc.P + SOURCES = $(libgpc_a_SOURCES) + OBJECTS = $(libgpc_a_OBJECTS) + +-all: Makefile $(LIBRARIES) $(MANS) ++all: Makefile $(LIBRARIES) $(MANS) $(HEADERS) + + .SUFFIXES: + .SUFFIXES: .S .c .lo .o .s + $(srcdir)/Makefile.in: @MAINT@ 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 + +@@ -217,9 +224,6 @@ + rm -f $(DESTDIR)$(pluginlibdir)/$$p; \ + done + +-.c.o: +- $(COMPILE) -c $< +- + .s.o: + $(COMPILE) -c $< + +@@ -236,9 +240,6 @@ + + maintainer-clean-compile: + +-.c.lo: +- $(LIBTOOL) --mode=compile $(COMPILE) -c $< +- + .s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +@@ -299,6 +300,21 @@ + @$(NORMAL_UNINSTALL) + $(MAKE) 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) +@@ -329,6 +345,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); \ + test -f $(distdir)/$$file \ +@@ -336,6 +357,29 @@ + || cp -p $$d/$$file $(distdir)/$$file; \ + done + ++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) ++ ++-include $(DEP_FILES) ++ ++mostlyclean-depend: ++ ++clean-depend: ++ ++distclean-depend: ++ ++maintainer-clean-depend: ++ -rm -rf .deps ++ ++%.o: %.c ++ @echo '$(COMPILE) -c $<'; \ ++ $(COMPILE) -Wp,-MD,.deps/$(*F).P -c $< ++ ++%.lo: %.c ++ @echo '$(LTCOMPILE) -c $<'; \ ++ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $< ++ @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \ ++ < .deps/$(*F).p > .deps/$(*F).P ++ @-rm -f .deps/$(*F).p + info: + dvi: + check: all +@@ -344,18 +388,19 @@ + install-exec: + @$(NORMAL_INSTALL) + +-install-data: install-pluginlibLIBRARIES install-man ++install-data: install-pluginlibLIBRARIES install-man install-gimpincludeHEADERS + @$(NORMAL_INSTALL) + + install: install-exec install-data all + @: + +-uninstall: uninstall-pluginlibLIBRARIES uninstall-man ++uninstall: uninstall-pluginlibLIBRARIES uninstall-man uninstall-gimpincludeHEADERS + + install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + installdirs: +- $(mkinstalldirs) $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 ++ $(mkinstalldirs) $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 \ ++ $(DATADIR)$(gimpincludedir) + + + mostlyclean-generic: +@@ -373,22 +418,22 @@ + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + mostlyclean: mostlyclean-pluginlibLIBRARIES mostlyclean-compile \ +- mostlyclean-libtool mostlyclean-tags \ ++ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic + + clean: clean-pluginlibLIBRARIES clean-compile clean-libtool clean-tags \ +- clean-generic mostlyclean ++ clean-depend clean-generic mostlyclean + + distclean: distclean-pluginlibLIBRARIES distclean-compile \ +- distclean-libtool distclean-tags distclean-generic \ +- clean ++ distclean-libtool distclean-tags distclean-depend \ ++ distclean-generic clean + -rm -f config.status + -rm -f libtool + + maintainer-clean: maintainer-clean-pluginlibLIBRARIES \ + maintainer-clean-compile maintainer-clean-libtool \ +- maintainer-clean-tags maintainer-clean-generic \ +- distclean ++ maintainer-clean-tags maintainer-clean-depend \ ++ maintainer-clean-generic distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +@@ -398,10 +443,12 @@ + 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 dvi installcheck \ +-install-exec install-data install uninstall all installdirs \ +-mostlyclean-generic distclean-generic clean-generic \ ++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 dvi \ ++installcheck install-exec install-data install uninstall all \ ++installdirs mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + diff --git a/graphics/gimpshop/files/patch-ah b/graphics/gimpshop/files/patch-ah index a019dd5a4238..b5a2a29dcd04 100644 --- a/graphics/gimpshop/files/patch-ah +++ b/graphics/gimpshop/files/patch-ah @@ -1,29 +1,22 @@ ---- configure.in.orig Sun May 17 01:16:39 1998 -+++ configure.in Sun May 17 16:04:23 1998 -@@ -117,13 +117,13 @@ - - dnl Test for libtiff - if test -z "$LIBTIFF_LIB"; then -- AC_CHECK_LIB(tiff, TIFFReadScanline, -+ AC_CHECK_LIB(tiff34, TIFFReadScanline, - AC_CHECK_HEADER(tiffio.h, -- TIFF='tiff'; LIBTIFF_LIB='-ltiff', -+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34', - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)), -- AC_CHECK_LIB(tiff, TIFFWriteScanline, -+ AC_CHECK_LIB(tiff34, TIFFWriteScanline, - AC_CHECK_HEADER(tiffio.h, -- TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz', -+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz', - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)), - AC_CHECK_LIB(tiff34, TIFFFlushData, - AC_CHECK_HEADER(tiffio.h, +--- configure.in.orig Wed May 27 23:32:15 1998 ++++ configure.in Wed May 27 23:32:30 1998 @@ -306,7 +306,7 @@ LIBS="$gimp_save_LIBS" gimpdatadir=$datadir/gimp -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION -++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER ++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION + + brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` + gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile` +--- configure.orig Wed May 27 23:32:17 1998 ++++ configure Wed May 27 23:32:38 1998 +@@ -4146,7 +4146,7 @@ + LIBS="$gimp_save_LIBS" + + gimpdatadir=$datadir/gimp +-gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION ++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile` gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile` diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist index 5339ab517bc3..8dd716d230c0 100644 --- a/graphics/gimpshop/pkg-plist +++ b/graphics/gimpshop/pkg-plist @@ -1,4 +1,6 @@ bin/gimp +bin/gimptool +include/gpc.h include/megawidget.h include/gck/gck.h include/gck/gckcolor.h @@ -25,133 +27,134 @@ lib/libgimpui.a lib/libgimpui.la lib/libgimpui.so lib/libgimpui.so.1.0 +lib/libgpc.a lib/libmegawidget.a -libexec/gimp/plug-ins/AlienMap -libexec/gimp/plug-ins/CEL -libexec/gimp/plug-ins/CML_explorer -libexec/gimp/plug-ins/MapObject -libexec/gimp/plug-ins/aa -libexec/gimp/plug-ins/align_layers -libexec/gimp/plug-ins/animationplay -libexec/gimp/plug-ins/animoptimize -libexec/gimp/plug-ins/apply_lens -libexec/gimp/plug-ins/autocrop -libexec/gimp/plug-ins/autostretch_hsv -libexec/gimp/plug-ins/blinds -libexec/gimp/plug-ins/blur -libexec/gimp/plug-ins/bmp -libexec/gimp/plug-ins/bumpmap -libexec/gimp/plug-ins/bz2 -libexec/gimp/plug-ins/c_astretch -libexec/gimp/plug-ins/checkerboard -libexec/gimp/plug-ins/colorify -libexec/gimp/plug-ins/compose -libexec/gimp/plug-ins/convmatrix -libexec/gimp/plug-ins/cubism -libexec/gimp/plug-ins/dbbrowser -libexec/gimp/plug-ins/decompose -libexec/gimp/plug-ins/deinterlace -libexec/gimp/plug-ins/depthmerge -libexec/gimp/plug-ins/despeckle -libexec/gimp/plug-ins/destripe -libexec/gimp/plug-ins/diffraction -libexec/gimp/plug-ins/displace -libexec/gimp/plug-ins/edge -libexec/gimp/plug-ins/emboss -libexec/gimp/plug-ins/engrave -libexec/gimp/plug-ins/exchange -libexec/gimp/plug-ins/faxg3 -libexec/gimp/plug-ins/film -libexec/gimp/plug-ins/fits -libexec/gimp/plug-ins/flame -libexec/gimp/plug-ins/flarefx -libexec/gimp/plug-ins/fractaltrace -libexec/gimp/plug-ins/gauss_iir -libexec/gimp/plug-ins/gauss_rle -libexec/gimp/plug-ins/gbr -libexec/gimp/plug-ins/gfig -libexec/gimp/plug-ins/gfli -libexec/gimp/plug-ins/gee -libexec/gimp/plug-ins/gicon -libexec/gimp/plug-ins/gif -libexec/gimp/plug-ins/glasstile -libexec/gimp/plug-ins/gqbist -libexec/gimp/plug-ins/gradmap -libexec/gimp/plug-ins/grid -libexec/gimp/plug-ins/gtm -libexec/gimp/plug-ins/gz -libexec/gimp/plug-ins/header -libexec/gimp/plug-ins/hot -libexec/gimp/plug-ins/hrz -libexec/gimp/plug-ins/ifscompose -libexec/gimp/plug-ins/illusion -libexec/gimp/plug-ins/iwarp -libexec/gimp/plug-ins/jpeg -libexec/gimp/plug-ins/laplace -libexec/gimp/plug-ins/libgpc.a -libexec/gimp/plug-ins/mail -libexec/gimp/plug-ins/max_rgb -libexec/gimp/plug-ins/maze -libexec/gimp/plug-ins/mblur -libexec/gimp/plug-ins/mosaic -libexec/gimp/plug-ins/mpeg -libexec/gimp/plug-ins/nlfilt -libexec/gimp/plug-ins/noisify -libexec/gimp/plug-ins/normalize -libexec/gimp/plug-ins/nova -libexec/gimp/plug-ins/oilify -libexec/gimp/plug-ins/pagecurl -libexec/gimp/plug-ins/palette -libexec/gimp/plug-ins/papertile -libexec/gimp/plug-ins/pat -libexec/gimp/plug-ins/pcx -libexec/gimp/plug-ins/pix -libexec/gimp/plug-ins/pixelize -libexec/gimp/plug-ins/plasma -libexec/gimp/plug-ins/png -libexec/gimp/plug-ins/pnm -libexec/gimp/plug-ins/polar -libexec/gimp/plug-ins/print -libexec/gimp/plug-ins/ps -libexec/gimp/plug-ins/psd -libexec/gimp/plug-ins/randomize -libexec/gimp/plug-ins/ripple -libexec/gimp/plug-ins/rotate -libexec/gimp/plug-ins/rotators -libexec/gimp/plug-ins/scatter_hsv -libexec/gimp/plug-ins/screenshot -libexec/gimp/plug-ins/script-fu -libexec/gimp/plug-ins/semiflatten -libexec/gimp/plug-ins/sgi -libexec/gimp/plug-ins/sharpen -libexec/gimp/plug-ins/shift -libexec/gimp/plug-ins/sinus -libexec/gimp/plug-ins/smooth_palette -libexec/gimp/plug-ins/snoise -libexec/gimp/plug-ins/snp -libexec/gimp/plug-ins/sobel -libexec/gimp/plug-ins/sparkle -libexec/gimp/plug-ins/spread -libexec/gimp/plug-ins/struc -libexec/gimp/plug-ins/sunras -libexec/gimp/plug-ins/tga -libexec/gimp/plug-ins/threshold_alpha -libexec/gimp/plug-ins/tiff -libexec/gimp/plug-ins/tile -libexec/gimp/plug-ins/tileit -libexec/gimp/plug-ins/tiler -libexec/gimp/plug-ins/url -libexec/gimp/plug-ins/video -libexec/gimp/plug-ins/vinvert -libexec/gimp/plug-ins/vpropagate -libexec/gimp/plug-ins/waves -libexec/gimp/plug-ins/webbrowser -libexec/gimp/plug-ins/whirlpinch -libexec/gimp/plug-ins/xd -libexec/gimp/plug-ins/xpm -libexec/gimp/plug-ins/xwd -libexec/gimp/plug-ins/zealouscrop +libexec/gimp/0.99/plug-ins/AlienMap +libexec/gimp/0.99/plug-ins/CEL +libexec/gimp/0.99/plug-ins/CML_explorer +libexec/gimp/0.99/plug-ins/MapObject +libexec/gimp/0.99/plug-ins/aa +libexec/gimp/0.99/plug-ins/align_layers +libexec/gimp/0.99/plug-ins/animationplay +libexec/gimp/0.99/plug-ins/animoptimize +libexec/gimp/0.99/plug-ins/apply_lens +libexec/gimp/0.99/plug-ins/autocrop +libexec/gimp/0.99/plug-ins/autostretch_hsv +libexec/gimp/0.99/plug-ins/blinds +libexec/gimp/0.99/plug-ins/blur +libexec/gimp/0.99/plug-ins/bmp +libexec/gimp/0.99/plug-ins/bumpmap +libexec/gimp/0.99/plug-ins/bz2 +libexec/gimp/0.99/plug-ins/c_astretch +libexec/gimp/0.99/plug-ins/checkerboard +libexec/gimp/0.99/plug-ins/colorify +libexec/gimp/0.99/plug-ins/compose +libexec/gimp/0.99/plug-ins/convmatrix +libexec/gimp/0.99/plug-ins/cubism +libexec/gimp/0.99/plug-ins/dbbrowser +libexec/gimp/0.99/plug-ins/decompose +libexec/gimp/0.99/plug-ins/deinterlace +libexec/gimp/0.99/plug-ins/depthmerge +libexec/gimp/0.99/plug-ins/despeckle +libexec/gimp/0.99/plug-ins/destripe +libexec/gimp/0.99/plug-ins/diffraction +libexec/gimp/0.99/plug-ins/displace +libexec/gimp/0.99/plug-ins/edge +libexec/gimp/0.99/plug-ins/emboss +libexec/gimp/0.99/plug-ins/engrave +libexec/gimp/0.99/plug-ins/exchange +libexec/gimp/0.99/plug-ins/faxg3 +libexec/gimp/0.99/plug-ins/film +libexec/gimp/0.99/plug-ins/fits +libexec/gimp/0.99/plug-ins/flame +libexec/gimp/0.99/plug-ins/flarefx +libexec/gimp/0.99/plug-ins/fractaltrace +libexec/gimp/0.99/plug-ins/gauss_iir +libexec/gimp/0.99/plug-ins/gauss_rle +libexec/gimp/0.99/plug-ins/gbr +libexec/gimp/0.99/plug-ins/gfig +libexec/gimp/0.99/plug-ins/gfli +libexec/gimp/0.99/plug-ins/gee +libexec/gimp/0.99/plug-ins/gicon +libexec/gimp/0.99/plug-ins/gif +libexec/gimp/0.99/plug-ins/glasstile +libexec/gimp/0.99/plug-ins/gqbist +libexec/gimp/0.99/plug-ins/gradmap +libexec/gimp/0.99/plug-ins/grid +libexec/gimp/0.99/plug-ins/gtm +libexec/gimp/0.99/plug-ins/gz +libexec/gimp/0.99/plug-ins/header +libexec/gimp/0.99/plug-ins/hot +libexec/gimp/0.99/plug-ins/hrz +libexec/gimp/0.99/plug-ins/ifscompose +libexec/gimp/0.99/plug-ins/illusion +libexec/gimp/0.99/plug-ins/iwarp +libexec/gimp/0.99/plug-ins/jpeg +libexec/gimp/0.99/plug-ins/laplace +libexec/gimp/0.99/plug-ins/mail +libexec/gimp/0.99/plug-ins/max_rgb +libexec/gimp/0.99/plug-ins/maze +libexec/gimp/0.99/plug-ins/mblur +libexec/gimp/0.99/plug-ins/mosaic +libexec/gimp/0.99/plug-ins/mpeg +libexec/gimp/0.99/plug-ins/nlfilt +libexec/gimp/0.99/plug-ins/noisify +libexec/gimp/0.99/plug-ins/normalize +libexec/gimp/0.99/plug-ins/nova +libexec/gimp/0.99/plug-ins/oilify +libexec/gimp/0.99/plug-ins/pagecurl +libexec/gimp/0.99/plug-ins/palette +libexec/gimp/0.99/plug-ins/papertile +libexec/gimp/0.99/plug-ins/pat +libexec/gimp/0.99/plug-ins/pcx +libexec/gimp/0.99/plug-ins/pix +libexec/gimp/0.99/plug-ins/pixelize +libexec/gimp/0.99/plug-ins/plasma +libexec/gimp/0.99/plug-ins/png +libexec/gimp/0.99/plug-ins/pnm +libexec/gimp/0.99/plug-ins/polar +libexec/gimp/0.99/plug-ins/print +libexec/gimp/0.99/plug-ins/ps +libexec/gimp/0.99/plug-ins/psd +libexec/gimp/0.99/plug-ins/randomize +libexec/gimp/0.99/plug-ins/ripple +libexec/gimp/0.99/plug-ins/rotate +libexec/gimp/0.99/plug-ins/rotators +libexec/gimp/0.99/plug-ins/scatter_hsv +libexec/gimp/0.99/plug-ins/screenshot +libexec/gimp/0.99/plug-ins/script-fu +libexec/gimp/0.99/plug-ins/semiflatten +libexec/gimp/0.99/plug-ins/sgi +libexec/gimp/0.99/plug-ins/sharpen +libexec/gimp/0.99/plug-ins/shift +libexec/gimp/0.99/plug-ins/sinus +libexec/gimp/0.99/plug-ins/smooth_palette +libexec/gimp/0.99/plug-ins/snoise +libexec/gimp/0.99/plug-ins/snp +libexec/gimp/0.99/plug-ins/sobel +libexec/gimp/0.99/plug-ins/sparkle +libexec/gimp/0.99/plug-ins/spread +libexec/gimp/0.99/plug-ins/struc +libexec/gimp/0.99/plug-ins/sunras +libexec/gimp/0.99/plug-ins/tga +libexec/gimp/0.99/plug-ins/threshold_alpha +libexec/gimp/0.99/plug-ins/tiff +libexec/gimp/0.99/plug-ins/tile +libexec/gimp/0.99/plug-ins/tileit +libexec/gimp/0.99/plug-ins/tiler +libexec/gimp/0.99/plug-ins/url +libexec/gimp/0.99/plug-ins/video +libexec/gimp/0.99/plug-ins/vinvert +libexec/gimp/0.99/plug-ins/vpropagate +libexec/gimp/0.99/plug-ins/waves +libexec/gimp/0.99/plug-ins/webbrowser +libexec/gimp/0.99/plug-ins/whirlpinch +libexec/gimp/0.99/plug-ins/xpm +libexec/gimp/0.99/plug-ins/xwd +libexec/gimp/0.99/plug-ins/zealouscrop man/man1/gimp.1.gz +man/man1/gimptool.1.gz +man/man3/gpc.3.gz share/gimp/brushes/10x10square.gbr share/gimp/brushes/10x10squareBlur.gbr share/gimp/brushes/11circle.gbr @@ -627,7 +630,8 @@ share/gimp/gimp_logo.ppm share/gimp/gimp_splash.ppm share/gimp/gimp_tips.txt share/gimp/ps-menurc -@dirrm libexec/gimp/plug-ins +@dirrm libexec/gimp/0.99/plug-ins +@dirrm libexec/gimp/0.99 @dirrm libexec/gimp @dirrm include/libgimp @dirrm include/gck |