From owner-freebsd-ports Fri Feb 25 10:17:30 2000 Delivered-To: freebsd-ports@freebsd.org Received: from rock.ghis.net (rock.ghis.net [209.222.164.7]) by hub.freebsd.org (Postfix) with ESMTP id 81F6637BBBE; Fri, 25 Feb 2000 10:17:00 -0800 (PST) (envelope-from will@blackdawn.com) Received: from shadow.blackdawn.com (postfix@16-196.008.popsite.net [209.69.195.196] (may be forged)) by rock.ghis.net (8.9.3/8.9.3) with ESMTP id KAA58996; Fri, 25 Feb 2000 10:16:45 -0800 (PST) Received: by shadow.blackdawn.com (Postfix, from userid 1000) id 427EF193B; Fri, 25 Feb 2000 13:16:40 -0500 (EST) Date: Fri, 25 Feb 2000 13:16:40 -0500 From: Will Andrews To: Will Andrews Cc: ade@FreeBSD.ORG, freebsd-ports@FreeBSD.ORG Subject: Re: ports/16850: upgrade port: graphics/gnofract4d: 1.0 -> 1.2 Message-ID: <20000225131640.C92482@shadow.blackdawn.com> References: <200002250807.AAA90241@freefall.freebsd.org> <20000225130145.B92482@shadow.blackdawn.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="PEIAKu/WMn1b1Hv9" X-Mailer: Mutt 1.0i In-Reply-To: <20000225130145.B92482@shadow.blackdawn.com>; from andrews@TECHNOLOGIST.COM on Fri, Feb 25, 2000 at 01:01:45PM -0500 X-Operating-System: FreeBSD 3.4-STABLE i386 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org --PEIAKu/WMn1b1Hv9 Content-Type: text/plain; charset=us-ascii On Fri, Feb 25, 2000 at 01:01:45PM -0500, Will Andrews wrote: > I've fixed this for -current. I am testing my patch on -stable. Please > await the patch (it will be sent Real Soon Now). Thanks. This should fix it. (complete diff attached) I tested the patch against a cvs co'd gnofract4d dir. -- Will Andrews GCS/E/S @d- s+:+>+:- a--->+++ C++ UB++++ P+ L- E--- W+++ !N !o ?K w--- ?O M+ V-- PS+ PE++ Y+ PGP+>+++ t++ 5 X++ R+ tv+ b++>++++ DI+++ D+ G++>+++ e->++++ h! r-->+++ y? --PEIAKu/WMn1b1Hv9 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=prfix Index: Makefile =================================================================== RCS file: /extra/cvsroot/ports/graphics/gnofract4d/Makefile,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Makefile --- Makefile 1999/12/31 21:54:34 1.1.1.1 +++ Makefile 2000/02/25 18:10:09 @@ -1,24 +1,25 @@ # New ports collection makefile for: gnofract4d -# Version required: 1.0 +# Version required: 1.2 # Date created: 30 Dec 1999 # Whom: Will Andrews # # $FreeBSD: ports/graphics/gnofract4d/Makefile,v 1.1.1.1 1999/12/31 21:54:34 jedgar Exp $ # -DISTNAME= gnofract4d-1.0 +DISTNAME= gnofract4d-1.2 CATEGORIES= graphics MASTER_SITES= http://download.sourceforge.net/gnofract4d/ MAINTAINER= andrews@technologist.com -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gnomeui.3:${PORTSDIR}/x11/gnomelibs +LIB_DEPENDS= gnomeui.3:${PORTSDIR}/x11/gnomelibs GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG=${GTK_CONFIG} +CONFIGURE_ENV= GTK_CONFIG=${GTK_CONFIG} \ + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+=--datadir=${PREFIX}/share USE_NEWGCC= yes Index: files/md5 =================================================================== RCS file: /extra/cvsroot/ports/graphics/gnofract4d/files/md5,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 md5 --- files/md5 1999/12/31 21:54:34 1.1.1.1 +++ files/md5 2000/02/25 17:39:46 @@ -1 +1 @@ -MD5 (gnofract4d-1.0.tar.gz) = 3ce1d769f6ebc42b0af088fa1c18c45a +MD5 (gnofract4d-1.2.tar.gz) = b79d18b2e98e2292e8f08162020f7483 Index: patches/patch-aa =================================================================== RCS file: /extra/cvsroot/ports/graphics/gnofract4d/patches/patch-aa,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-aa --- patches/patch-aa 1999/12/31 21:54:35 1.1.1.1 +++ patches/patch-aa 2000/02/25 17:39:46 @@ -1,6 +1,6 @@ ---- configure Tue Dec 21 18:47:04 1999 -+++ configure.new Thu Dec 30 07:57:06 1999 -@@ -3945,7 +3945,7 @@ +--- configure.orig Sun Feb 20 19:14:33 2000 ++++ configure Thu Feb 24 10:14:55 2000 +@@ -4223,7 +4223,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -9,3 +9,17 @@ fi rm -f conftest* INSTOBJEXT=.mo +@@ -4789,11 +4789,11 @@ + real_prefix="${prefix}" + fi + +-PACKAGE_PIXMAPS_DIR="`gnome-config --datadir`/pixmaps/${PACKAGE}" ++PACKAGE_PIXMAPS_DIR="${prefix}/share/gnome/pixmaps/${PACKAGE}" + + + +-PACKAGE_MAPS_DIR="`gnome-config --datadir`/maps/${PACKAGE}" ++PACKAGE_MAPS_DIR="${prefix}/share/gnome/maps/${PACKAGE}" + + + Index: pkg/COMMENT =================================================================== RCS file: /extra/cvsroot/ports/graphics/gnofract4d/pkg/COMMENT,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 COMMENT --- pkg/COMMENT 1999/12/31 21:54:34 1.1.1.1 +++ pkg/COMMENT 2000/02/25 17:39:46 @@ -1 +1 @@ -Weird GNOME fractal generator. +Weird GNOME fractal generator Index: pkg/PLIST =================================================================== RCS file: /extra/cvsroot/ports/graphics/gnofract4d/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST --- pkg/PLIST 1999/12/31 21:54:35 1.1.1.1 +++ pkg/PLIST 2000/02/25 17:39:46 @@ -1,2 +1,91 @@ -share/locale/fr/LC_MESSAGES/gnofract4d.mo bin/gnofract4d +share/gnome/apps/Graphics/gnofract4d.desktop +share/gnome/help/gnofract4d/C/about.html +share/gnome/help/gnofract4d/C/docbook.css +share/gnome/help/gnofract4d/C/filemenu.html +share/gnome/help/gnofract4d/C/gnofract4d.html +share/gnome/help/gnofract4d/C/julia_perturbed.gif +share/gnome/help/gnofract4d/C/julia_standard.gif +share/gnome/help/gnofract4d/C/mandelbrot_perturbed.gif +share/gnome/help/gnofract4d/C/mandelbrot_standard.gif +share/gnome/help/gnofract4d/C/maths.html +share/gnome/help/gnofract4d/C/mouse.html +share/gnome/help/gnofract4d/C/preferences.html +share/gnome/help/gnofract4d/C/toolbar.html +share/gnome/help/gnofract4d/C/topic.dat +share/gnome/help/gnofract4d/C/xw_plane.gif +share/gnome/maps/gnofract4d/4zebbowx.map +share/gnome/maps/gnofract4d/anenome.map +share/gnome/maps/gnofract4d/basic.map +share/gnome/maps/gnofract4d/bgold.map +share/gnome/maps/gnofract4d/blend.map +share/gnome/maps/gnofract4d/blend4.map +share/gnome/maps/gnofract4d/blend8.map +share/gnome/maps/gnofract4d/blengbyg.map +share/gnome/maps/gnofract4d/blues.map +share/gnome/maps/gnofract4d/bpg.map +share/gnome/maps/gnofract4d/brass.map +share/gnome/maps/gnofract4d/brite.map +share/gnome/maps/gnofract4d/chroma.map +share/gnome/maps/gnofract4d/chroma3.map +share/gnome/maps/gnofract4d/chroma4.map +share/gnome/maps/gnofract4d/coldfire.map +share/gnome/maps/gnofract4d/copper.map +share/gnome/maps/gnofract4d/crwn.map +share/gnome/maps/gnofract4d/egan1.map +share/gnome/maps/gnofract4d/fadern1.map +share/gnome/maps/gnofract4d/fadern2.map +share/gnome/maps/gnofract4d/fish.map +share/gnome/maps/gnofract4d/gamma1.map +share/gnome/maps/gnofract4d/glass.map +share/gnome/maps/gnofract4d/hawaii.map +share/gnome/maps/gnofract4d/hls17.map +share/gnome/maps/gnofract4d/hlsrain1.map +share/gnome/maps/gnofract4d/hlsrain5.map +share/gnome/maps/gnofract4d/horns.map +share/gnome/maps/gnofract4d/hunk.map +share/gnome/maps/gnofract4d/janine.map +share/gnome/maps/gnofract4d/japan.map +share/gnome/maps/gnofract4d/juteblue.map +share/gnome/maps/gnofract4d/jutemap.map +share/gnome/maps/gnofract4d/kahki.map +share/gnome/maps/gnofract4d/lace.map +share/gnome/maps/gnofract4d/lite.map +share/gnome/maps/gnofract4d/litnin1.map +share/gnome/maps/gnofract4d/longs.map +share/gnome/maps/gnofract4d/lyapunov.map +share/gnome/maps/gnofract4d/mandmap.map +share/gnome/maps/gnofract4d/mist.map +share/gnome/maps/gnofract4d/neon.map +share/gnome/maps/gnofract4d/new.map +share/gnome/maps/gnofract4d/new1.map +share/gnome/maps/gnofract4d/new2.map +share/gnome/maps/gnofract4d/nkohala.map +share/gnome/maps/gnofract4d/osb.map +share/gnome/maps/gnofract4d/pale.map +share/gnome/maps/gnofract4d/pumpkin.map +share/gnome/maps/gnofract4d/rain4x.map +share/gnome/maps/gnofract4d/rainbow4.map +share/gnome/maps/gnofract4d/rainbow7.map +share/gnome/maps/gnofract4d/rgb.map +share/gnome/maps/gnofract4d/ribbon20.map +share/gnome/maps/gnofract4d/royal.map +share/gnome/maps/gnofract4d/rw.map +share/gnome/maps/gnofract4d/ryb1.map +share/gnome/maps/gnofract4d/sea.map +share/gnome/maps/gnofract4d/stripe.map +share/gnome/maps/gnofract4d/topo.map +share/gnome/maps/gnofract4d/unknown.map +share/gnome/maps/gnofract4d/volcano.map +share/gnome/maps/gnofract4d/vooon.map +share/gnome/maps/gnofract4d/wild.map +share/gnome/maps/gnofract4d/wine.map +share/gnome/maps/gnofract4d/world.map +share/gnome/pixmaps/gnofract4d/full_screen.png +share/gnome/pixmaps/gnofract4d/gnofract4d-logo.png +share/locale/fr/LC_MESSAGES/gnofract4d.mo +@dirrm share/gnome/pixmaps/gnofract4d +@dirrm share/gnome/maps/gnofract4d +@dirrm share/gnome/help/gnofract4d/C/images +@dirrm share/gnome/help/gnofract4d/C +@dirrm share/gnome/help/gnofract4d --- /dev/null Fri Feb 25 13:12:59 2000 +++ patches/patch-ab Fri Feb 25 13:07:11 2000 @@ -0,0 +1,14 @@ +--- src/gf4d_fractal.cpp Sun Feb 20 16:55:31 2000 ++++ src/gf4d_fractal.cpp.new Fri Feb 25 13:06:59 2000 +@@ -1,9 +1,8 @@ +-#include +-#include +- + #include "gf4d_fractal.h" + #include "image.h" + #include "fract.h" ++#include ++#include + + static void gf4d_fractal_class_init (Gf4dFractalClass *klass); + static void gf4d_fractal_init (Gf4dFractal *dial); --PEIAKu/WMn1b1Hv9-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message