Index: head/math/gnumeric/Makefile =================================================================== --- head/math/gnumeric/Makefile (revision 18678) +++ head/math/gnumeric/Makefile (revision 18679) @@ -1,38 +1,38 @@ # New ports collection makefile for: gnumeric -# Version required: 0.18 +# Version required: 0.25 # Date created: 08 October 1998 # Whom: Yukihiro Nakai # -# $Id: Makefile,v 1.9 1999/03/26 04:48:08 nectar Exp $ +# $Id: Makefile,v 1.10 1999/04/08 18:08:34 steve Exp $ # -DISTNAME= gnumeric-0.18 +DISTNAME= gnumeric-0.25 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnumeric MAINTAINER= nacai@iname.com BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ python:${PORTSDIR}/lang/python RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ python:${PORTSDIR}/lang/python LIB_DEPENDS= xml.0:${PORTSDIR}/textproc/libxml # implicit dependencies: # gettext, xpm, gtk12, guile, gnomelibs USE_X_PREFIX= yes USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --with-gnome=${X11BASE} --with-guile CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include Property changes on: head/math/gnumeric/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.10 \ No newline at end of property +1.11 \ No newline at end of property Index: head/math/gnumeric/distinfo =================================================================== --- head/math/gnumeric/distinfo (revision 18678) +++ head/math/gnumeric/distinfo (revision 18679) @@ -1 +1 @@ -MD5 (gnumeric-0.18.tar.gz) = 203c37c6f653df4cf2ca97569fba0277 +MD5 (gnumeric-0.25.tar.gz) = 429e8afdf9a5bf0509307ae229034907 Property changes on: head/math/gnumeric/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/math/gnumeric/files/patch-aa =================================================================== --- head/math/gnumeric/files/patch-aa (revision 18678) +++ head/math/gnumeric/files/patch-aa (revision 18679) @@ -1,42 +1,62 @@ ---- configure.orig Wed Feb 24 03:49:18 1999 -+++ configure Wed Feb 24 18:46:00 1999 -@@ -3309,7 +3309,7 @@ +--- configure.orig Tue Apr 27 14:23:58 1999 ++++ configure Thu May 6 10:48:39 1999 +@@ -3335,7 +3335,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lxml `gnome-config --libs xml` $LIBS" +LIBS="`xml-config --libs` $LIBS" cat > conftest.$ac_ext <&6 -@@ -5557,15 +5557,15 @@ +@@ -5583,15 +5583,15 @@ fi - USE_INCLUDED_LIBINTL=yes +# USE_INCLUDED_LIBINTL=yes CATOBJEXT=.gmo INSTOBJEXT=.mo DATADIRNAME=share - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h +# INTLDEPS='$(top_builddir)/intl/libintl.a' +# INTLLIBS=$INTLDEPS +# LIBS=`echo $LIBS | sed -e 's/-lintl//'` +# nls_cv_header_intl=intl/libintl.h +# nls_cv_header_libgt=intl/libgettext.h fi if test "$XGETTEXT" != ":"; then +@@ -6174,7 +6174,7 @@ + test -n "$AWK" && break + done + +-GDK_KEYSYMS="`$GTK_CONFIG --prefix`/include/gdk/gdkkeysyms.h" ++GDK_KEYSYMS="`$GTK_CONFIG --prefix`/include/gtk12/gdk/gdkkeysyms.h" + + cat >> confdefs.h <<\EOF + #define ENABLE_GNOME 1 +@@ -6198,8 +6198,8 @@ + LIBGLADE_FULLDIST_TRUE='#' + LIBGLADE_FULLDIST_FALSE= + fi +-XML_LIBS=`gnome-config --libs xml` +-XML_CFLAGS=`gnome-config --cflags xml`/gnome-xml ++XML_LIBS=`xml-config --libs` ++XML_CFLAGS=`xml-config --cflags` + + + Property changes on: head/math/gnumeric/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/math/gnumeric/files/patch-ba =================================================================== --- head/math/gnumeric/files/patch-ba (revision 18678) +++ head/math/gnumeric/files/patch-ba (revision 18679) @@ -1,20 +1,20 @@ --- Makefile.in.orig Wed Feb 24 03:49:45 1999 +++ Makefile.in Wed Feb 24 19:06:37 1999 @@ -137,7 +137,7 @@ perl_val = @perl_val@ python_val = @python_val@ --SUBDIRS = intl po macros plugins src doc -+SUBDIRS = intl po macros plugins src +-SUBDIRS = intl po macros libglade plugins src doc ++SUBDIRS = intl po macros libglade plugins src EXTRA_DIST = gnumeric.desktop README HACKING gnumeric.spec.in gnumeric.keys.in gnumeric.mime $(appicon_DATA) @@ -145,7 +145,7 @@ appicondir = $(datadir)/pixmaps appicon_DATA = gnome-gnumeric.png gnome-gnumeric-xl.png -Applicationsdir = $(datadir)/gnome/apps/Applications +Applicationsdir = $(datadir)/apps/Applications Applications_DATA = gnumeric.desktop Mimedir = $(datadir)/mime-info Property changes on: head/math/gnumeric/files/patch-ba ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/math/gnumeric/pkg-plist =================================================================== --- head/math/gnumeric/pkg-plist (revision 18678) +++ head/math/gnumeric/pkg-plist (revision 18679) @@ -1,47 +1,58 @@ bin/gnumeric bin/gnumeric-corba +bin/ole +lib/libglade.a share/gnome/apps/Applications/gnumeric.desktop share/gnome/gnumeric/guile/gnumeric_startup.scm share/gnome/gnumeric/perl/startup.pl +share/gnome/gnumeric/plugins/libcsv.a +share/gnome/gnumeric/plugins/libcsv.la +share/gnome/gnumeric/plugins/libcsv.so +share/gnome/gnumeric/plugins/libcsv.so.0 share/gnome/gnumeric/plugins/libgnumguile.a share/gnome/gnumeric/plugins/libgnumguile.la share/gnome/gnumeric/plugins/libgnumguile.so share/gnome/gnumeric/plugins/libgnumguile.so.0 share/gnome/gnumeric/plugins/libpython.a share/gnome/gnumeric/plugins/libpython.la share/gnome/gnumeric/plugins/libpython.so share/gnome/gnumeric/plugins/libpython.so.0 share/gnome/gnumeric/plugins/libstat.a share/gnome/gnumeric/plugins/libstat.la share/gnome/gnumeric/plugins/libstat.so share/gnome/gnumeric/plugins/libstat.so.0 +share/gnome/gnumeric/plugins/libtext.a +share/gnome/gnumeric/plugins/libtext.la +share/gnome/gnumeric/plugins/libtext.so +share/gnome/gnumeric/plugins/libtext.so.0 share/gnome/gnumeric/python/gnumeric_startup.py share/gnome/mc/templates/gnumeric.desktop share/gnome/mime-info/gnumeric.keys share/gnome/mime-info/gnumeric.mime share/gnome/pixmaps/gnome-gnumeric-xl.png share/gnome/pixmaps/gnome-gnumeric.png share/locale/cs/LC_MESSAGES/gnumeric.mo share/locale/de/LC_MESSAGES/gnumeric.mo +share/locale/en_GB/LC_MESSAGES/gnumeric.mo share/locale/es/LC_MESSAGES/gnumeric.mo share/locale/es_DO/LC_MESSAGES/gnumeric.mo share/locale/es_GT/LC_MESSAGES/gnumeric.mo share/locale/es_HN/LC_MESSAGES/gnumeric.mo share/locale/es_MX/LC_MESSAGES/gnumeric.mo share/locale/es_PA/LC_MESSAGES/gnumeric.mo share/locale/es_PE/LC_MESSAGES/gnumeric.mo share/locale/es_SV/LC_MESSAGES/gnumeric.mo share/locale/fr/LC_MESSAGES/gnumeric.mo share/locale/hu/LC_MESSAGES/gnumeric.mo share/locale/it/LC_MESSAGES/gnumeric.mo share/locale/ja/LC_MESSAGES/gnumeric.mo share/locale/ko/LC_MESSAGES/gnumeric.mo share/locale/no/LC_MESSAGES/gnumeric.mo share/locale/pl/LC_MESSAGES/gnumeric.mo share/locale/pt/LC_MESSAGES/gnumeric.mo share/locale/ru/LC_MESSAGES/gnumeric.mo @dirrm share/gnome/gnumeric/python @dirrm share/gnome/gnumeric/plugins @dirrm share/gnome/gnumeric/perl @dirrm share/gnome/gnumeric/guile @dirrm share/gnome/gnumeric Property changes on: head/math/gnumeric/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/math/gnumeric2/Makefile =================================================================== --- head/math/gnumeric2/Makefile (revision 18678) +++ head/math/gnumeric2/Makefile (revision 18679) @@ -1,38 +1,38 @@ # New ports collection makefile for: gnumeric -# Version required: 0.18 +# Version required: 0.25 # Date created: 08 October 1998 # Whom: Yukihiro Nakai # -# $Id: Makefile,v 1.9 1999/03/26 04:48:08 nectar Exp $ +# $Id: Makefile,v 1.10 1999/04/08 18:08:34 steve Exp $ # -DISTNAME= gnumeric-0.18 +DISTNAME= gnumeric-0.25 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnumeric MAINTAINER= nacai@iname.com BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ python:${PORTSDIR}/lang/python RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ python:${PORTSDIR}/lang/python LIB_DEPENDS= xml.0:${PORTSDIR}/textproc/libxml # implicit dependencies: # gettext, xpm, gtk12, guile, gnomelibs USE_X_PREFIX= yes USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --with-gnome=${X11BASE} --with-guile CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include Property changes on: head/math/gnumeric2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.10 \ No newline at end of property +1.11 \ No newline at end of property Index: head/math/gnumeric2/distinfo =================================================================== --- head/math/gnumeric2/distinfo (revision 18678) +++ head/math/gnumeric2/distinfo (revision 18679) @@ -1 +1 @@ -MD5 (gnumeric-0.18.tar.gz) = 203c37c6f653df4cf2ca97569fba0277 +MD5 (gnumeric-0.25.tar.gz) = 429e8afdf9a5bf0509307ae229034907 Property changes on: head/math/gnumeric2/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/math/gnumeric2/files/patch-aa =================================================================== --- head/math/gnumeric2/files/patch-aa (revision 18678) +++ head/math/gnumeric2/files/patch-aa (revision 18679) @@ -1,42 +1,62 @@ ---- configure.orig Wed Feb 24 03:49:18 1999 -+++ configure Wed Feb 24 18:46:00 1999 -@@ -3309,7 +3309,7 @@ +--- configure.orig Tue Apr 27 14:23:58 1999 ++++ configure Thu May 6 10:48:39 1999 +@@ -3335,7 +3335,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lxml `gnome-config --libs xml` $LIBS" +LIBS="`xml-config --libs` $LIBS" cat > conftest.$ac_ext <&6 -@@ -5557,15 +5557,15 @@ +@@ -5583,15 +5583,15 @@ fi - USE_INCLUDED_LIBINTL=yes +# USE_INCLUDED_LIBINTL=yes CATOBJEXT=.gmo INSTOBJEXT=.mo DATADIRNAME=share - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h +# INTLDEPS='$(top_builddir)/intl/libintl.a' +# INTLLIBS=$INTLDEPS +# LIBS=`echo $LIBS | sed -e 's/-lintl//'` +# nls_cv_header_intl=intl/libintl.h +# nls_cv_header_libgt=intl/libgettext.h fi if test "$XGETTEXT" != ":"; then +@@ -6174,7 +6174,7 @@ + test -n "$AWK" && break + done + +-GDK_KEYSYMS="`$GTK_CONFIG --prefix`/include/gdk/gdkkeysyms.h" ++GDK_KEYSYMS="`$GTK_CONFIG --prefix`/include/gtk12/gdk/gdkkeysyms.h" + + cat >> confdefs.h <<\EOF + #define ENABLE_GNOME 1 +@@ -6198,8 +6198,8 @@ + LIBGLADE_FULLDIST_TRUE='#' + LIBGLADE_FULLDIST_FALSE= + fi +-XML_LIBS=`gnome-config --libs xml` +-XML_CFLAGS=`gnome-config --cflags xml`/gnome-xml ++XML_LIBS=`xml-config --libs` ++XML_CFLAGS=`xml-config --cflags` + + + Property changes on: head/math/gnumeric2/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/math/gnumeric2/files/patch-ba =================================================================== --- head/math/gnumeric2/files/patch-ba (revision 18678) +++ head/math/gnumeric2/files/patch-ba (revision 18679) @@ -1,20 +1,20 @@ --- Makefile.in.orig Wed Feb 24 03:49:45 1999 +++ Makefile.in Wed Feb 24 19:06:37 1999 @@ -137,7 +137,7 @@ perl_val = @perl_val@ python_val = @python_val@ --SUBDIRS = intl po macros plugins src doc -+SUBDIRS = intl po macros plugins src +-SUBDIRS = intl po macros libglade plugins src doc ++SUBDIRS = intl po macros libglade plugins src EXTRA_DIST = gnumeric.desktop README HACKING gnumeric.spec.in gnumeric.keys.in gnumeric.mime $(appicon_DATA) @@ -145,7 +145,7 @@ appicondir = $(datadir)/pixmaps appicon_DATA = gnome-gnumeric.png gnome-gnumeric-xl.png -Applicationsdir = $(datadir)/gnome/apps/Applications +Applicationsdir = $(datadir)/apps/Applications Applications_DATA = gnumeric.desktop Mimedir = $(datadir)/mime-info Property changes on: head/math/gnumeric2/files/patch-ba ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/math/gnumeric2/pkg-plist =================================================================== --- head/math/gnumeric2/pkg-plist (revision 18678) +++ head/math/gnumeric2/pkg-plist (revision 18679) @@ -1,47 +1,58 @@ bin/gnumeric bin/gnumeric-corba +bin/ole +lib/libglade.a share/gnome/apps/Applications/gnumeric.desktop share/gnome/gnumeric/guile/gnumeric_startup.scm share/gnome/gnumeric/perl/startup.pl +share/gnome/gnumeric/plugins/libcsv.a +share/gnome/gnumeric/plugins/libcsv.la +share/gnome/gnumeric/plugins/libcsv.so +share/gnome/gnumeric/plugins/libcsv.so.0 share/gnome/gnumeric/plugins/libgnumguile.a share/gnome/gnumeric/plugins/libgnumguile.la share/gnome/gnumeric/plugins/libgnumguile.so share/gnome/gnumeric/plugins/libgnumguile.so.0 share/gnome/gnumeric/plugins/libpython.a share/gnome/gnumeric/plugins/libpython.la share/gnome/gnumeric/plugins/libpython.so share/gnome/gnumeric/plugins/libpython.so.0 share/gnome/gnumeric/plugins/libstat.a share/gnome/gnumeric/plugins/libstat.la share/gnome/gnumeric/plugins/libstat.so share/gnome/gnumeric/plugins/libstat.so.0 +share/gnome/gnumeric/plugins/libtext.a +share/gnome/gnumeric/plugins/libtext.la +share/gnome/gnumeric/plugins/libtext.so +share/gnome/gnumeric/plugins/libtext.so.0 share/gnome/gnumeric/python/gnumeric_startup.py share/gnome/mc/templates/gnumeric.desktop share/gnome/mime-info/gnumeric.keys share/gnome/mime-info/gnumeric.mime share/gnome/pixmaps/gnome-gnumeric-xl.png share/gnome/pixmaps/gnome-gnumeric.png share/locale/cs/LC_MESSAGES/gnumeric.mo share/locale/de/LC_MESSAGES/gnumeric.mo +share/locale/en_GB/LC_MESSAGES/gnumeric.mo share/locale/es/LC_MESSAGES/gnumeric.mo share/locale/es_DO/LC_MESSAGES/gnumeric.mo share/locale/es_GT/LC_MESSAGES/gnumeric.mo share/locale/es_HN/LC_MESSAGES/gnumeric.mo share/locale/es_MX/LC_MESSAGES/gnumeric.mo share/locale/es_PA/LC_MESSAGES/gnumeric.mo share/locale/es_PE/LC_MESSAGES/gnumeric.mo share/locale/es_SV/LC_MESSAGES/gnumeric.mo share/locale/fr/LC_MESSAGES/gnumeric.mo share/locale/hu/LC_MESSAGES/gnumeric.mo share/locale/it/LC_MESSAGES/gnumeric.mo share/locale/ja/LC_MESSAGES/gnumeric.mo share/locale/ko/LC_MESSAGES/gnumeric.mo share/locale/no/LC_MESSAGES/gnumeric.mo share/locale/pl/LC_MESSAGES/gnumeric.mo share/locale/pt/LC_MESSAGES/gnumeric.mo share/locale/ru/LC_MESSAGES/gnumeric.mo @dirrm share/gnome/gnumeric/python @dirrm share/gnome/gnumeric/plugins @dirrm share/gnome/gnumeric/perl @dirrm share/gnome/gnumeric/guile @dirrm share/gnome/gnumeric Property changes on: head/math/gnumeric2/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property