From 26b5fbc399bd3ed959464b2d3092b878688fb6a9 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Thu, 25 Sep 2003 05:45:50 +0000 Subject: [PATCH] Update to 0.10_1. --- deskutils/libmrproject/Makefile | 13 +++-- deskutils/libmrproject/distinfo | 2 +- deskutils/libmrproject/files/patch-configure | 25 +++++---- .../files/patch-file-modules_xsl_mrp-xsl.c | 16 ++++++ deskutils/libmrproject/files/patch-ltmain.sh | 51 +++++++++++++++++++ deskutils/libmrproject/pkg-plist | 48 +++++++++++++++-- 6 files changed, 135 insertions(+), 20 deletions(-) create mode 100644 deskutils/libmrproject/files/patch-file-modules_xsl_mrp-xsl.c create mode 100644 deskutils/libmrproject/files/patch-ltmain.sh diff --git a/deskutils/libmrproject/Makefile b/deskutils/libmrproject/Makefile index 9237b73e74ea..facb12319797 100644 --- a/deskutils/libmrproject/Makefile +++ b/deskutils/libmrproject/Makefile @@ -6,20 +6,23 @@ # PORTNAME= libmrproject -PORTVERSION= 0.9.1 -PORTREVISION= 4 +PORTVERSION= 0.10 +PORTREVISION= 1 CATEGORIES= deskutils gnome -MASTER_SITES= ftp://ftp.codefactory.se/pub/software/mrproject/source/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10 +DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Library backend for MrProject project management application +USE_BZIP2= yes USE_X_PREFIX= yes +USE_PYTHON= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnometarget libgsf INSTALLS_SHLIB= yes -USE_LIBTOOL= yes -USE_LIBTOOL_VER= 14 +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --enable-static diff --git a/deskutils/libmrproject/distinfo b/deskutils/libmrproject/distinfo index 9ae10fe8f309..2dda3173f83b 100644 --- a/deskutils/libmrproject/distinfo +++ b/deskutils/libmrproject/distinfo @@ -1 +1 @@ -MD5 (libmrproject-0.9.1.tar.gz) = 6e9101e5b283178463ad4f66efa7367d +MD5 (gnome2/libmrproject-0.10.tar.bz2) = 59a41b91b01352d3ae9c9a9b370915ae diff --git a/deskutils/libmrproject/files/patch-configure b/deskutils/libmrproject/files/patch-configure index ec9874cf8362..00d8fdd3d70f 100644 --- a/deskutils/libmrproject/files/patch-configure +++ b/deskutils/libmrproject/files/patch-configure @@ -1,11 +1,14 @@ ---- configure.orig Tue Aug 19 12:23:20 2003 -+++ configure Tue Aug 19 12:23:44 2003 -@@ -5171,7 +5171,7 @@ - # All known linkers require a `.a' archive for static linking (except M$VC, - # which needs '.lib'). - libext=a --ltmain="$ac_aux_dir/ltmain.sh" -+ltmain="/usr/local/share/libtool14/ltmain.sh" - ofile="$default_ofile" - with_gnu_ld="$lt_cv_prog_gnu_ld" - need_locks="$enable_libtool_lock" +--- configure.orig Sun Sep 21 19:59:12 2003 ++++ configure Sun Sep 21 19:59:48 2003 +@@ -21815,9 +21815,9 @@ + + + +- PYTHON_PREFIX='${prefix}' ++ PYTHON_PREFIX='${LOCALBASE}' + +- PYTHON_EXEC_PREFIX='${exec_prefix}' ++ PYTHON_EXEC_PREFIX='${LOCALBASE}' + + + diff --git a/deskutils/libmrproject/files/patch-file-modules_xsl_mrp-xsl.c b/deskutils/libmrproject/files/patch-file-modules_xsl_mrp-xsl.c new file mode 100644 index 000000000000..1ea23e0188e1 --- /dev/null +++ b/deskutils/libmrproject/files/patch-file-modules_xsl_mrp-xsl.c @@ -0,0 +1,16 @@ +--- file-modules/xsl/mrp-xsl.c.orig Sun Sep 21 19:50:32 2003 ++++ file-modules/xsl/mrp-xsl.c Sun Sep 21 19:50:55 2003 +@@ -46,11 +46,12 @@ + gboolean force, + GError **error) + { +- g_return_val_if_fail (writer != NULL, FALSE); + gchar *xml_project; + xsltStylesheet *stylesheet; + xmlDoc *doc; + xmlDoc *final_doc; ++ ++ g_return_val_if_fail (writer != NULL, FALSE); + + mrp_project_save_to_xml (project, &xml_project, NULL); + diff --git a/deskutils/libmrproject/files/patch-ltmain.sh b/deskutils/libmrproject/files/patch-ltmain.sh new file mode 100644 index 000000000000..1d5a5c7b87e1 --- /dev/null +++ b/deskutils/libmrproject/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Fri Sep 12 14:51:51 2003 ++++ ltmain.sh Sun Sep 21 17:49:07 2003 +@@ -1280,7 +1280,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/deskutils/libmrproject/pkg-plist b/deskutils/libmrproject/pkg-plist index 361379909a95..52553bd0574b 100644 --- a/deskutils/libmrproject/pkg-plist +++ b/deskutils/libmrproject/pkg-plist @@ -17,35 +17,77 @@ include/mrproject-1.0/mrproject/mrproject.h lib/libmrproject.a lib/libmrproject.so lib/libmrproject.so.0 -lib/mrproject/file-modules/libmrp-mpx.so lib/mrproject/file-modules/libmrp-xml.so -lib/mrproject/storage-modules/libstorage-mpx.so +lib/mrproject/file-modules/libmrp-xsl.so lib/mrproject/storage-modules/libstorage-mrproject-1.so libdata/pkgconfig/libmrproject.pc +%%DOCSDIR%%/MrpAssignment.html +%%DOCSDIR%%/MrpCalendar.html +%%DOCSDIR%%/MrpGroup.html +%%DOCSDIR%%/MrpObject.html +%%DOCSDIR%%/MrpProject.html +%%DOCSDIR%%/MrpResource.html +%%DOCSDIR%%/MrpTask.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libmrproject-MrpApplication.html +%%DOCSDIR%%/libmrproject-MrpRelation.html +%%DOCSDIR%%/libmrproject-mrp-day.html +%%DOCSDIR%%/libmrproject-mrp-error.html +%%DOCSDIR%%/libmrproject-mrp-property.html +%%DOCSDIR%%/libmrproject-mrp-time.html +%%DOCSDIR%%/libmrproject.devhelp +%%DOCSDIR%%/right.png +%%DOCSDIR%%/up.png share/gnome/mrproject/dtd/mrproject-0.5.1.dtd share/gnome/mrproject/dtd/mrproject-0.6.dtd +share/gnome/mrproject/stylesheets/html1_css.xsl +share/gnome/mrproject/stylesheets/html1_gantt.xsl +share/gnome/mrproject/stylesheets/html1_milestones.xsl +share/gnome/mrproject/stylesheets/html1_resources.xsl +share/gnome/mrproject/stylesheets/html1_tasks.xsl +share/gnome/mrproject/stylesheets/mrproject2html.xsl share/locale/am/LC_MESSAGES/libmrproject.mo +share/locale/az/LC_MESSAGES/libmrproject.mo +share/locale/be/LC_MESSAGES/libmrproject.mo share/locale/cs/LC_MESSAGES/libmrproject.mo share/locale/da/LC_MESSAGES/libmrproject.mo share/locale/de/LC_MESSAGES/libmrproject.mo share/locale/es/LC_MESSAGES/libmrproject.mo +share/locale/fa/LC_MESSAGES/libmrproject.mo share/locale/fr/LC_MESSAGES/libmrproject.mo share/locale/hu/LC_MESSAGES/libmrproject.mo +share/locale/is/LC_MESSAGES/libmrproject.mo share/locale/it/LC_MESSAGES/libmrproject.mo share/locale/ja/LC_MESSAGES/libmrproject.mo share/locale/kn/LC_MESSAGES/libmrproject.mo +share/locale/ko/LC_MESSAGES/libmrproject.mo share/locale/lv/LC_MESSAGES/libmrproject.mo +share/locale/ml/LC_MESSAGES/libmrproject.mo +share/locale/mn/LC_MESSAGES/libmrproject.mo +share/locale/ms/LC_MESSAGES/libmrproject.mo share/locale/nl/LC_MESSAGES/libmrproject.mo share/locale/nn/LC_MESSAGES/libmrproject.mo share/locale/no/LC_MESSAGES/libmrproject.mo share/locale/pt/LC_MESSAGES/libmrproject.mo +share/locale/pt_BR/LC_MESSAGES/libmrproject.mo share/locale/ru/LC_MESSAGES/libmrproject.mo +share/locale/sk/LC_MESSAGES/libmrproject.mo +share/locale/sr/LC_MESSAGES/libmrproject.mo +share/locale/sr@Latn/LC_MESSAGES/libmrproject.mo share/locale/sv/LC_MESSAGES/libmrproject.mo +share/locale/zh_CN/LC_MESSAGES/libmrproject.mo +@dirrm share/gnome/mrproject/stylesheets @dirrm share/gnome/mrproject/dtd @dirrm share/gnome/mrproject -@dirrm share/doc/libmrproject +@dirrm %%DOCSDIR%% @dirrm lib/mrproject/storage-modules @dirrm lib/mrproject/file-modules @dirrm lib/mrproject @dirrm include/mrproject-1.0/mrproject @dirrm include/mrproject-1.0 +@cwd %%LOCALBASE%% +lib/python2.3/site-packages/mrprojectmodule.so