From 48c9c156762dc5cd0b3b497cf38edb9aafa68127 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Thu, 25 Sep 2003 05:47:12 +0000 Subject: [PATCH] Update to 0.10. --- deskutils/mrproject/Makefile | 11 ++--- deskutils/mrproject/distinfo | 2 +- deskutils/mrproject/files/patch-configure | 11 ----- deskutils/mrproject/files/patch-ltmain.sh | 51 +++++++++++++++++++++++ deskutils/mrproject/pkg-plist | 17 ++++++++ deskutils/planner/Makefile | 11 ++--- deskutils/planner/distinfo | 2 +- deskutils/planner/files/patch-configure | 11 ----- deskutils/planner/files/patch-ltmain.sh | 51 +++++++++++++++++++++++ deskutils/planner/pkg-plist | 17 ++++++++ 10 files changed, 150 insertions(+), 34 deletions(-) delete mode 100644 deskutils/mrproject/files/patch-configure create mode 100644 deskutils/mrproject/files/patch-ltmain.sh delete mode 100644 deskutils/planner/files/patch-configure create mode 100644 deskutils/planner/files/patch-ltmain.sh diff --git a/deskutils/mrproject/Makefile b/deskutils/mrproject/Makefile index 19a476bc2e8e..75633a4de4e8 100644 --- a/deskutils/mrproject/Makefile +++ b/deskutils/mrproject/Makefile @@ -6,21 +6,22 @@ # PORTNAME= mrproject -PORTVERSION= 0.9.1 -PORTREVISION= 3 +PORTVERSION= 0.10 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= Project management application for Gnome 2 LIB_DEPENDS= mrproject.0:${PORTSDIR}/deskutils/libmrproject +USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui libgnomeprintui -USE_LIBTOOL= yes -USE_LIBTOOL_VER= 14 +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/deskutils/mrproject/distinfo b/deskutils/mrproject/distinfo index 8341e5f63e12..568c53a2439c 100644 --- a/deskutils/mrproject/distinfo +++ b/deskutils/mrproject/distinfo @@ -1 +1 @@ -MD5 (mrproject-0.9.1.tar.gz) = 4c159fa4124ccbca957f7031c5ba0bea +MD5 (gnome2/mrproject-0.10.tar.bz2) = 4f23ddc29efc9ae6be0a14baa4af4812 diff --git a/deskutils/mrproject/files/patch-configure b/deskutils/mrproject/files/patch-configure deleted file mode 100644 index adc4d1b44f8b..000000000000 --- a/deskutils/mrproject/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Tue Aug 19 12:17:22 2003 -+++ configure Tue Aug 19 12:19:16 2003 -@@ -5168,7 +5168,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" diff --git a/deskutils/mrproject/files/patch-ltmain.sh b/deskutils/mrproject/files/patch-ltmain.sh new file mode 100644 index 000000000000..1d5a5c7b87e1 --- /dev/null +++ b/deskutils/mrproject/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/mrproject/pkg-plist b/deskutils/mrproject/pkg-plist index 50e4c285bde1..82c826894175 100644 --- a/deskutils/mrproject/pkg-plist +++ b/deskutils/mrproject/pkg-plist @@ -9,12 +9,14 @@ lib/mrproject/libsidebar.so lib/mrproject/libtaskdialog.so lib/mrproject/libtaskinput.so lib/mrproject/libutil.so +lib/mrproject/plugins/libproject-html-output-plugin.so lib/mrproject/views/libgantt-view.so lib/mrproject/views/libresources-view.so lib/mrproject/views/libtask-view.so share/gnome/application-registry/mrproject.applications share/gnome/applications/mrproject.desktop share/gnome/gnome-2.0/ui/GNOME_MrProject_GanttView.ui +share/gnome/gnome-2.0/ui/GNOME_MrProject_HtmlOutputPlugin.ui share/gnome/gnome-2.0/ui/GNOME_MrProject_MainWindow.ui share/gnome/gnome-2.0/ui/GNOME_MrProject_ResourcesView.ui share/gnome/gnome-2.0/ui/GNOME_MrProject_TaskView.ui @@ -68,6 +70,7 @@ share/gnome/mime-info/mrproject.mime share/gnome/mrproject/glade/mg-add-predecessor.glade share/gnome/mrproject/glade/mg-calendar-dialog.glade share/gnome/mrproject/glade/mg-group-dialog.glade +share/gnome/mrproject/glade/mg-html-output.glade share/gnome/mrproject/glade/mg-new-property.glade share/gnome/mrproject/glade/mg-project-properties.glade share/gnome/mrproject/glade/mg-property-dialog.glade @@ -95,23 +98,37 @@ share/gnome/pixmaps/mrproject/gantt.png share/gnome/pixmaps/mrproject/resources.png share/gnome/pixmaps/mrproject/tasks.png share/locale/am/LC_MESSAGES/mrproject.mo +share/locale/az/LC_MESSAGES/mrproject.mo +share/locale/be/LC_MESSAGES/mrproject.mo share/locale/ca/LC_MESSAGES/mrproject.mo share/locale/cs/LC_MESSAGES/mrproject.mo share/locale/da/LC_MESSAGES/mrproject.mo share/locale/de/LC_MESSAGES/mrproject.mo share/locale/es/LC_MESSAGES/mrproject.mo +share/locale/et/LC_MESSAGES/mrproject.mo +share/locale/fa/LC_MESSAGES/mrproject.mo share/locale/fr/LC_MESSAGES/mrproject.mo share/locale/hu/LC_MESSAGES/mrproject.mo +share/locale/is/LC_MESSAGES/mrproject.mo share/locale/it/LC_MESSAGES/mrproject.mo share/locale/ja/LC_MESSAGES/mrproject.mo share/locale/ko/LC_MESSAGES/mrproject.mo share/locale/lv/LC_MESSAGES/mrproject.mo +share/locale/ml/LC_MESSAGES/mrproject.mo +share/locale/ms/LC_MESSAGES/mrproject.mo +share/locale/nl/LC_MESSAGES/mrproject.mo share/locale/nn/LC_MESSAGES/mrproject.mo share/locale/no/LC_MESSAGES/mrproject.mo share/locale/pl/LC_MESSAGES/mrproject.mo share/locale/pt/LC_MESSAGES/mrproject.mo +share/locale/pt_BR/LC_MESSAGES/mrproject.mo share/locale/ru/LC_MESSAGES/mrproject.mo +share/locale/sk/LC_MESSAGES/mrproject.mo +share/locale/sr/LC_MESSAGES/mrproject.mo +share/locale/sr@Latn/LC_MESSAGES/mrproject.mo share/locale/sv/LC_MESSAGES/mrproject.mo +share/locale/uk/LC_MESSAGES/mrproject.mo +share/locale/zh_CN/LC_MESSAGES/mrproject.mo @dirrm share/gnome/pixmaps/mrproject @dirrm share/gnome/omf/mrproject @dirrm share/gnome/mrproject/glade diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile index 19a476bc2e8e..75633a4de4e8 100644 --- a/deskutils/planner/Makefile +++ b/deskutils/planner/Makefile @@ -6,21 +6,22 @@ # PORTNAME= mrproject -PORTVERSION= 0.9.1 -PORTREVISION= 3 +PORTVERSION= 0.10 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= Project management application for Gnome 2 LIB_DEPENDS= mrproject.0:${PORTSDIR}/deskutils/libmrproject +USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui libgnomeprintui -USE_LIBTOOL= yes -USE_LIBTOOL_VER= 14 +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/deskutils/planner/distinfo b/deskutils/planner/distinfo index 8341e5f63e12..568c53a2439c 100644 --- a/deskutils/planner/distinfo +++ b/deskutils/planner/distinfo @@ -1 +1 @@ -MD5 (mrproject-0.9.1.tar.gz) = 4c159fa4124ccbca957f7031c5ba0bea +MD5 (gnome2/mrproject-0.10.tar.bz2) = 4f23ddc29efc9ae6be0a14baa4af4812 diff --git a/deskutils/planner/files/patch-configure b/deskutils/planner/files/patch-configure deleted file mode 100644 index adc4d1b44f8b..000000000000 --- a/deskutils/planner/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Tue Aug 19 12:17:22 2003 -+++ configure Tue Aug 19 12:19:16 2003 -@@ -5168,7 +5168,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" diff --git a/deskutils/planner/files/patch-ltmain.sh b/deskutils/planner/files/patch-ltmain.sh new file mode 100644 index 000000000000..1d5a5c7b87e1 --- /dev/null +++ b/deskutils/planner/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/planner/pkg-plist b/deskutils/planner/pkg-plist index 50e4c285bde1..82c826894175 100644 --- a/deskutils/planner/pkg-plist +++ b/deskutils/planner/pkg-plist @@ -9,12 +9,14 @@ lib/mrproject/libsidebar.so lib/mrproject/libtaskdialog.so lib/mrproject/libtaskinput.so lib/mrproject/libutil.so +lib/mrproject/plugins/libproject-html-output-plugin.so lib/mrproject/views/libgantt-view.so lib/mrproject/views/libresources-view.so lib/mrproject/views/libtask-view.so share/gnome/application-registry/mrproject.applications share/gnome/applications/mrproject.desktop share/gnome/gnome-2.0/ui/GNOME_MrProject_GanttView.ui +share/gnome/gnome-2.0/ui/GNOME_MrProject_HtmlOutputPlugin.ui share/gnome/gnome-2.0/ui/GNOME_MrProject_MainWindow.ui share/gnome/gnome-2.0/ui/GNOME_MrProject_ResourcesView.ui share/gnome/gnome-2.0/ui/GNOME_MrProject_TaskView.ui @@ -68,6 +70,7 @@ share/gnome/mime-info/mrproject.mime share/gnome/mrproject/glade/mg-add-predecessor.glade share/gnome/mrproject/glade/mg-calendar-dialog.glade share/gnome/mrproject/glade/mg-group-dialog.glade +share/gnome/mrproject/glade/mg-html-output.glade share/gnome/mrproject/glade/mg-new-property.glade share/gnome/mrproject/glade/mg-project-properties.glade share/gnome/mrproject/glade/mg-property-dialog.glade @@ -95,23 +98,37 @@ share/gnome/pixmaps/mrproject/gantt.png share/gnome/pixmaps/mrproject/resources.png share/gnome/pixmaps/mrproject/tasks.png share/locale/am/LC_MESSAGES/mrproject.mo +share/locale/az/LC_MESSAGES/mrproject.mo +share/locale/be/LC_MESSAGES/mrproject.mo share/locale/ca/LC_MESSAGES/mrproject.mo share/locale/cs/LC_MESSAGES/mrproject.mo share/locale/da/LC_MESSAGES/mrproject.mo share/locale/de/LC_MESSAGES/mrproject.mo share/locale/es/LC_MESSAGES/mrproject.mo +share/locale/et/LC_MESSAGES/mrproject.mo +share/locale/fa/LC_MESSAGES/mrproject.mo share/locale/fr/LC_MESSAGES/mrproject.mo share/locale/hu/LC_MESSAGES/mrproject.mo +share/locale/is/LC_MESSAGES/mrproject.mo share/locale/it/LC_MESSAGES/mrproject.mo share/locale/ja/LC_MESSAGES/mrproject.mo share/locale/ko/LC_MESSAGES/mrproject.mo share/locale/lv/LC_MESSAGES/mrproject.mo +share/locale/ml/LC_MESSAGES/mrproject.mo +share/locale/ms/LC_MESSAGES/mrproject.mo +share/locale/nl/LC_MESSAGES/mrproject.mo share/locale/nn/LC_MESSAGES/mrproject.mo share/locale/no/LC_MESSAGES/mrproject.mo share/locale/pl/LC_MESSAGES/mrproject.mo share/locale/pt/LC_MESSAGES/mrproject.mo +share/locale/pt_BR/LC_MESSAGES/mrproject.mo share/locale/ru/LC_MESSAGES/mrproject.mo +share/locale/sk/LC_MESSAGES/mrproject.mo +share/locale/sr/LC_MESSAGES/mrproject.mo +share/locale/sr@Latn/LC_MESSAGES/mrproject.mo share/locale/sv/LC_MESSAGES/mrproject.mo +share/locale/uk/LC_MESSAGES/mrproject.mo +share/locale/zh_CN/LC_MESSAGES/mrproject.mo @dirrm share/gnome/pixmaps/mrproject @dirrm share/gnome/omf/mrproject @dirrm share/gnome/mrproject/glade