> > - return GINT_TO_POINTER (strtol ((gchar *) data.key, NULL, 16)); > > + return GUINT_TO_POINTER (strtoul ((gchar *) data.key, NULL, 16));
So, here is an updated diff which also adds USE_LIBTOOL=yes and p5-XML-Parser in dependencies. Tested with new gettext installed. Thanks to wilfried@ for help and testing on i386/macppc/amd64. Index: Makefile =================================================================== RCS file: /cvs/ports/education/drgeo/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- Makefile 13 Feb 2005 17:49:46 -0000 1.6 +++ Makefile 6 Nov 2005 13:17:35 -0000 @@ -2,7 +2,7 @@ COMMENT= "interactive geometry program" -DISTNAME= drgeo-0.9.13 +DISTNAME= drgeo-1.1.0 CATEGORIES= education math HOMEPAGE= http://www.ofset.org/drgeo/ @@ -18,19 +18,23 @@ glib-2.0.0.0 gmodule-2.0.0.0 \ gobject-2.0.0.0 gtk-x11-2.0.0.0 pango-1.0.0.0 \ pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 \ - xml2.0.0 X11 Xext Xft Xinerama Xrender c fontconfig \ - freetype m stdc++ z Xcursor + xml2.0.0 X11 Xft Xrender c fontconfig \ + freetype m stdc++ z MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ofset/} MODULES= devel/gettext -BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig +BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig \ + :p5-XML-Parser-*:textproc/p5-XML-Parser LIB_DEPENDS= glade-2.0.=0::devel/libglade2 \ guile::lang/guile USE_X11= Yes USE_GMAKE= Yes -CONFIGURE_STYLE= gnu +USE_LIBTOOL= Yes +CONFIGURE_STYLE=gnu +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/education/drgeo/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 5 Jan 2005 16:28:22 -0000 1.3 +++ distinfo 6 Nov 2005 13:17:35 -0000 @@ -1,4 +1,4 @@ -MD5 (drgeo-0.9.13.tar.gz) = 0ab4c1e1e72f4ffc8ef6c02a58036098 -RMD160 (drgeo-0.9.13.tar.gz) = 2d719b0a34c897a4958ad013b95bdaa7d8e3426d -SHA1 (drgeo-0.9.13.tar.gz) = 24eaa741f2c4f756aec4273dca2004ee7a5a5a7a -SIZE (drgeo-0.9.13.tar.gz) = 1442681 +MD5 (drgeo-1.1.0.tar.gz) = 4ee0a887e819266740867959cbb4095f +RMD160 (drgeo-1.1.0.tar.gz) = 94859c622cf9a48f6134d7e348e6f5e94a43ed6c +SHA1 (drgeo-1.1.0.tar.gz) = 7b988233fbcaac8002bd20e4e61c37240a739c29 +SIZE (drgeo-1.1.0.tar.gz) = 1608361 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/education/drgeo/patches/patch-Makefile_in,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-Makefile_in --- patches/patch-Makefile_in 21 Feb 2004 12:31:02 -0000 1.1.1.1 +++ patches/patch-Makefile_in 6 Nov 2005 13:17:35 -0000 @@ -1,7 +1,16 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2004/02/21 12:31:02 espie Exp $ ---- Makefile.in.orig 2004-02-12 01:31:23.000000000 +0100 -+++ Makefile.in 2004-02-12 01:31:29.000000000 +0100 -@@ -218,8 +218,7 @@ drgeo_LDADD = \ +--- Makefile.in.orig Wed Jul 27 09:36:20 2005 ++++ Makefile.in Fri Nov 4 13:55:44 2005 +@@ -182,7 +182,7 @@ helpdir = $(datadir)/drgeo/help + gladedir = $(datadir)/drgeo/glade + scmdir = $(datadir)/drgeo/scm + appicondir = $(datadir)/pixmaps +-SUBDIRS = po geo examples icons glade scm plugin encode ++SUBDIRS = po geo examples icons glade scm encode + + INCLUDES = \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ +@@ -226,8 +226,7 @@ drgeo_LDADD = \ $(top_builddir)/geo/libgeo.a \ $(INTLLIBS) \ $(DRGEO_LIBS) \ Index: patches/patch-examples_figures_Makefile_in =================================================================== RCS file: patches/patch-examples_figures_Makefile_in diff -N patches/patch-examples_figures_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-examples_figures_Makefile_in 6 Nov 2005 13:17:35 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- examples/figures/Makefile.in.orig Fri Nov 4 13:33:10 2005 ++++ examples/figures/Makefile.in Fri Nov 4 13:33:31 2005 +@@ -178,7 +178,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-figuresdir = $(datadir)/drgeo/examples/figures ++figuresdir = $(datadir)/examples/drgeo/figures + + figures_DATA = \ + circle-locus.fgeo \ Index: patches/patch-examples_macro_Makefile_in =================================================================== RCS file: patches/patch-examples_macro_Makefile_in diff -N patches/patch-examples_macro_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-examples_macro_Makefile_in 6 Nov 2005 13:17:35 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- examples/macro/Makefile.in.orig Fri Nov 4 13:33:37 2005 ++++ examples/macro/Makefile.in Fri Nov 4 13:33:44 2005 +@@ -178,7 +178,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-macrosdir = $(datadir)/drgeo/examples/macros ++macrosdir = $(datadir)/examples/drgeo/macros + + macros_DATA = \ + bissectrice.mgeo \ Index: patches/patch-examples_scheme_Makefile_in =================================================================== RCS file: patches/patch-examples_scheme_Makefile_in diff -N patches/patch-examples_scheme_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-examples_scheme_Makefile_in 6 Nov 2005 13:17:35 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- examples/scheme/Makefile.in.orig Fri Nov 4 13:33:53 2005 ++++ examples/scheme/Makefile.in Fri Nov 4 13:34:01 2005 +@@ -178,7 +178,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-schemedir = $(datadir)/drgeo/examples/scheme ++schemedir = $(datadir)/examples/drgeo/scheme + + scheme_DATA = \ + figure.scm \ Index: patches/patch-geo_drgeo_figure_cc =================================================================== RCS file: patches/patch-geo_drgeo_figure_cc diff -N patches/patch-geo_drgeo_figure_cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-geo_drgeo_figure_cc 6 Nov 2005 13:17:35 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- geo/drgeo_figure.cc.orig Sun Nov 6 12:07:33 2005 ++++ geo/drgeo_figure.cc Sun Nov 6 12:11:08 2005 +@@ -1044,7 +1044,7 @@ drgeoFigure::getKeyFromValueOnHash (gpoi + return NULL; + else + // data.key is a * gchar get it content as a gpointer +- return GINT_TO_POINTER (strtol ((gchar *) data.key, NULL, 16)); ++ return GUINT_TO_POINTER (strtoul ((gchar *) data.key, NULL, 16)); + } + + void Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/education/drgeo/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- pkg/PLIST 2 Aug 2004 07:13:08 -0000 1.2 +++ pkg/PLIST 6 Nov 2005 13:17:35 -0000 @@ -5,56 +5,6 @@ share/drgeo/ share/drgeo/encode/ share/drgeo/encode/latin1.ps -share/drgeo/examples/ -share/drgeo/examples/figures/ -share/drgeo/examples/figures/accel.fgeo -share/drgeo/examples/figures/angle-inscrit.fgeo -share/drgeo/examples/figures/baballe.fgeo -share/drgeo/examples/figures/braik_conic.fgeo -share/drgeo/examples/figures/cercle-inscrit.fgeo -share/drgeo/examples/figures/circle-locus.fgeo -share/drgeo/examples/figures/conics.fgeo -share/drgeo/examples/figures/duality.fgeo -share/drgeo/examples/figures/euler-line.fgeo -share/drgeo/examples/figures/fonctions_associees.fgeo -share/drgeo/examples/figures/lens.fgeo -share/drgeo/examples/figures/light6.fgeo -share/drgeo/examples/figures/mercedes.fgeo -share/drgeo/examples/figures/moyenne-prop.fgeo -share/drgeo/examples/figures/orthocenter-locus.fgeo -share/drgeo/examples/figures/orthocentre-symetique.fgeo -share/drgeo/examples/figures/parallelogramme.fgeo -share/drgeo/examples/figures/partage-segment.fgeo -share/drgeo/examples/figures/polygons.fgeo -share/drgeo/examples/figures/problem1.fgeo -share/drgeo/examples/figures/refraction.fgeo -share/drgeo/examples/figures/saliera.fgeo -share/drgeo/examples/figures/signed-distance.fgeo -share/drgeo/examples/figures/sinusoide.fgeo -share/drgeo/examples/figures/slope.fgeo -share/drgeo/examples/figures/steiner_conic.fgeo -share/drgeo/examples/figures/symmetry-axe-2.fgeo -share/drgeo/examples/figures/symmetry-center.fgeo -share/drgeo/examples/figures/triangle-scale.fgeo -share/drgeo/examples/figures/triangle_rectangle1.fgeo -share/drgeo/examples/figures/triangles-homothetiques.fgeo -share/drgeo/examples/figures/trigo1.fgeo -share/drgeo/examples/figures/varignon.fgeo -share/drgeo/examples/figures/wheel.fgeo -share/drgeo/examples/macros/ -share/drgeo/examples/macros/bissectrice.mgeo -share/drgeo/examples/macros/centre1.mgeo -share/drgeo/examples/macros/orthocentre.mgeo -share/drgeo/examples/macros/pentagone.mgeo -share/drgeo/examples/macros/segment.mgeo -share/drgeo/examples/scheme/ -share/drgeo/examples/scheme/baum.scm -share/drgeo/examples/scheme/figure.scm -share/drgeo/examples/scheme/polygon.scm -share/drgeo/examples/scheme/polygon2.scm -share/drgeo/examples/scheme/spiral.scm -share/drgeo/examples/scheme/square.scm -share/drgeo/examples/scheme/steiner.scm share/drgeo/glade/ share/drgeo/glade/angle.png share/drgeo/glade/angle.xpm @@ -109,7 +59,6 @@ share/drgeo/glade/line_menu.xpm share/drgeo/glade/load.xpm share/drgeo/glade/locus.png -share/drgeo/glade/locus.xpm share/drgeo/glade/macro_menu.png share/drgeo/glade/macro_menu.xpm share/drgeo/glade/middle.png @@ -170,13 +119,128 @@ share/drgeo/scm/drgeo_scm_interface_constant_nl.scm share/drgeo/scm/drgeo_scm_interface_constant_sr.scm share/drgeo/scm/preferences.scm +share/examples/drgeo/ +share/examples/drgeo/figures/ +share/examples/drgeo/figures/accel.big5.fgeo +share/examples/drgeo/figures/accel.fgeo +share/examples/drgeo/figures/angle-inscrit.fgeo +share/examples/drgeo/figures/baballe.fgeo +share/examples/drgeo/figures/braik_conic.fgeo +share/examples/drgeo/figures/cercle-inscrit.fgeo +share/examples/drgeo/figures/circle-locus.fgeo +share/examples/drgeo/figures/conics.fgeo +share/examples/drgeo/figures/duality.fgeo +share/examples/drgeo/figures/euler-line.fgeo +share/examples/drgeo/figures/fonctions_associees.fgeo +share/examples/drgeo/figures/lens.fgeo +share/examples/drgeo/figures/light6.fgeo +share/examples/drgeo/figures/mercedes.fgeo +share/examples/drgeo/figures/moyenne-prop.fgeo +share/examples/drgeo/figures/orthocenter-locus.fgeo +share/examples/drgeo/figures/orthocentre-symetique.fgeo +share/examples/drgeo/figures/parallelogramme.fgeo +share/examples/drgeo/figures/partage-segment.fgeo +share/examples/drgeo/figures/polygon-7.fgeo +share/examples/drgeo/figures/polygons.fgeo +share/examples/drgeo/figures/problem1.fgeo +share/examples/drgeo/figures/refraction.fgeo +share/examples/drgeo/figures/saliera.fgeo +share/examples/drgeo/figures/signed-distance.fgeo +share/examples/drgeo/figures/sinusoide.fgeo +share/examples/drgeo/figures/slope.fgeo +share/examples/drgeo/figures/steiner_conic.fgeo +share/examples/drgeo/figures/symmetry-axe-2.fgeo +share/examples/drgeo/figures/symmetry-center.fgeo +share/examples/drgeo/figures/triangle-scale.fgeo +share/examples/drgeo/figures/triangle_rectangle1.fgeo +share/examples/drgeo/figures/triangles-homothetiques.fgeo +share/examples/drgeo/figures/trigo1.fgeo +share/examples/drgeo/figures/varignon.fgeo +share/examples/drgeo/figures/wheel.fgeo +share/examples/drgeo/macros/ +share/examples/drgeo/macros/bissectrice.mgeo +share/examples/drgeo/macros/centre1.mgeo +share/examples/drgeo/macros/orthocentre.mgeo +share/examples/drgeo/macros/pentagone.mgeo +share/examples/drgeo/macros/polygon-7.mgeo +share/examples/drgeo/macros/segment.mgeo +share/examples/drgeo/scheme/ +share/examples/drgeo/scheme/baravelle.scm +share/examples/drgeo/scheme/baum.scm +share/examples/drgeo/scheme/figure.scm +share/examples/drgeo/scheme/fractale.scm +share/examples/drgeo/scheme/koch.scm +share/examples/drgeo/scheme/pappo.scm +share/examples/drgeo/scheme/polygon.scm +share/examples/drgeo/scheme/polygon2.scm +share/examples/drgeo/scheme/premier.scm +share/examples/drgeo/scheme/spiral.scm +share/examples/drgeo/scheme/square.scm +share/examples/drgeo/scheme/steiner.scm +share/examples/drgeo/scheme/tilings.scm +share/locale/az/ +share/locale/az/LC_MESSAGES/ +share/locale/az/LC_MESSAGES/drgeo.mo +share/locale/ca/LC_MESSAGES/drgeo.mo +share/locale/cs/LC_MESSAGES/drgeo.mo +share/locale/da/LC_MESSAGES/drgeo.mo +share/locale/de/LC_MESSAGES/drgeo.mo +share/locale/el/LC_MESSAGES/drgeo.mo +share/locale/en_CA/ +share/locale/en_CA/LC_MESSAGES/ +share/locale/en_CA/LC_MESSAGES/drgeo.mo +share/locale/en_GB/ +share/locale/en_GB/LC_MESSAGES/ +share/locale/en_GB/LC_MESSAGES/drgeo.mo +share/locale/es/LC_MESSAGES/drgeo.mo +share/locale/eu/ +share/locale/eu/LC_MESSAGES/ +share/locale/eu/LC_MESSAGES/drgeo.mo +share/locale/fr/LC_MESSAGES/drgeo.mo +share/locale/ga/LC_MESSAGES/drgeo.mo +share/locale/gl/LC_MESSAGES/drgeo.mo +share/locale/gu/ +share/locale/gu/LC_MESSAGES/ +share/locale/gu/LC_MESSAGES/drgeo.mo +share/locale/hi/ +share/locale/hi/LC_MESSAGES/ +share/locale/hi/LC_MESSAGES/drgeo.mo +share/locale/hr/LC_MESSAGES/drgeo.mo +share/locale/hu/LC_MESSAGES/drgeo.mo +share/locale/it/LC_MESSAGES/drgeo.mo +share/locale/ja/LC_MESSAGES/drgeo.mo +share/locale/ml/ +share/locale/ml/LC_MESSAGES/ +share/locale/ml/LC_MESSAGES/drgeo.mo +share/locale/mr/ +share/locale/mr/LC_MESSAGES/ +share/locale/mr/LC_MESSAGES/drgeo.mo +share/locale/nb/LC_MESSAGES/drgeo.mo +share/locale/ne/ +share/locale/ne/LC_MESSAGES/ +share/locale/ne/LC_MESSAGES/drgeo.mo +share/locale/nl/LC_MESSAGES/drgeo.mo +share/locale/no/LC_MESSAGES/drgeo.mo +share/locale/pl/LC_MESSAGES/drgeo.mo +share/locale/pt/LC_MESSAGES/drgeo.mo +share/locale/pt_BR/LC_MESSAGES/drgeo.mo +share/locale/ru/LC_MESSAGES/drgeo.mo +share/locale/rw/ +share/locale/rw/LC_MESSAGES/ +share/locale/rw/LC_MESSAGES/drgeo.mo +share/locale/sl/LC_MESSAGES/drgeo.mo +share/locale/sq/ +share/locale/sq/LC_MESSAGES/ +share/locale/sq/LC_MESSAGES/drgeo.mo +share/locale/sr/LC_MESSAGES/drgeo.mo +share/locale/[EMAIL PROTECTED]/ +share/locale/[EMAIL PROTECTED]/LC_MESSAGES/ +share/locale/[EMAIL PROTECTED]/LC_MESSAGES/drgeo.mo +share/locale/sv/LC_MESSAGES/drgeo.mo +share/locale/uk/LC_MESSAGES/drgeo.mo +share/locale/zh_CN/LC_MESSAGES/drgeo.mo +share/locale/zh_TW/LC_MESSAGES/drgeo.mo share/pixmaps/ share/pixmaps/drgeo-book.png share/pixmaps/drgeo-file.png share/pixmaps/ofset-logo.png -share/texmacs/ -share/texmacs/TeXmacs/ -share/texmacs/TeXmacs/plugins/ -share/texmacs/TeXmacs/plugins/drgeo/ -share/texmacs/TeXmacs/plugins/drgeo/progs/ -share/texmacs/TeXmacs/plugins/drgeo/progs/init-drgeo.scm Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
