diff options
Diffstat (limited to 'deskutils')
-rw-r--r-- | deskutils/mrproject/Makefile | 18 | ||||
-rw-r--r-- | deskutils/mrproject/distinfo | 2 | ||||
-rw-r--r-- | deskutils/mrproject/files/patch-client::Makefile.in | 14 | ||||
-rw-r--r-- | deskutils/mrproject/files/patch-configure | 26 | ||||
-rw-r--r-- | deskutils/mrproject/files/patch-ltmain.sh | 39 | ||||
-rw-r--r-- | deskutils/mrproject/pkg-plist | 36 | ||||
-rw-r--r-- | deskutils/planner/Makefile | 18 | ||||
-rw-r--r-- | deskutils/planner/distinfo | 2 | ||||
-rw-r--r-- | deskutils/planner/files/patch-client::Makefile.in | 14 | ||||
-rw-r--r-- | deskutils/planner/files/patch-configure | 26 | ||||
-rw-r--r-- | deskutils/planner/files/patch-ltmain.sh | 39 | ||||
-rw-r--r-- | deskutils/planner/pkg-plist | 36 |
12 files changed, 238 insertions, 32 deletions
diff --git a/deskutils/mrproject/Makefile b/deskutils/mrproject/Makefile index 449181a..44d741f 100644 --- a/deskutils/mrproject/Makefile +++ b/deskutils/mrproject/Makefile @@ -6,26 +6,30 @@ # PORTNAME= mrproject -PORTVERSION= 0.4.0 +PORTVERSION= 0.5.1 CATEGORIES= deskutils gnome MASTER_SITES= ftp://ftp.codefactory.se/pub/software/mrproject/source/ MAINTAINER= demon@FreeBSD.org USE_X_PREFIX= yes -USE_LIBTOOL= yes USE_GMAKE= yes USE_GNOME= yes +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LIBS="-L${LOCALBASE}/lib" \ + BSD_PTHREAD_LIBS=${PTHREAD_LIBS} INSTALLS_SHLIB= yes MAN1= mrproject.1 run-mrproject.1 mrproject-engine.1 pre-patch: - @${PERL} -pi -e 's#-lpthread#-pthread#g ; \ - s#DATADIRNAME=lib#DATADIRNAME=share#g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's#\$\(datadir\)/locale#\$\(prefix\)/share/locale#g' + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '[^g]iconv.h' | \ + xargs ${PERL} -pi -e 's|(["<])iconv.h|\1giconv.h|g' .include <bsd.port.mk> diff --git a/deskutils/mrproject/distinfo b/deskutils/mrproject/distinfo index bbc4d44..7b62fd7 100644 --- a/deskutils/mrproject/distinfo +++ b/deskutils/mrproject/distinfo @@ -1 +1 @@ -MD5 (mrproject-0.4.0.tar.gz) = 758bc531c78f420674abe4da5d8eaa25 +MD5 (mrproject-0.5.1.tar.gz) = 43c42b6a280f7c64e529b9c754babeec diff --git a/deskutils/mrproject/files/patch-client::Makefile.in b/deskutils/mrproject/files/patch-client::Makefile.in new file mode 100644 index 0000000..8349660 --- /dev/null +++ b/deskutils/mrproject/files/patch-client::Makefile.in @@ -0,0 +1,14 @@ +--- client/Makefile.in.orig Mon Jan 28 14:04:20 2002 ++++ client/Makefile.in Mon Jan 28 14:05:02 2002 +@@ -215,6 +215,11 @@ + $(top_builddir)/util/libmrproject-utilx.la \ + $(top_builddir)/util/libmrproject-corba-util.la \ + $(top_builddir)/client/widgets/libwidgets.la \ ++ $(top_builddir)/client/components/gantt/libgantt-component.la \ ++ $(top_builddir)/client/components/network/libnetwork-component.la \ ++ $(top_builddir)/client/components/resource/libresource-component.la \ ++ $(top_builddir)/client/components/task-dialog/libtask-dialog-component.la \ ++ $(top_builddir)/client/components/send/libsend-component.la \ + $(top_builddir)/client/components/shell-component/libshell-component.la \ + $(top_builddir)/client/manager-clients/libmanager-clients.la \ + $(top_builddir)/libmrproject/libmrproject-interfaces.la diff --git a/deskutils/mrproject/files/patch-configure b/deskutils/mrproject/files/patch-configure new file mode 100644 index 0000000..6c74920 --- /dev/null +++ b/deskutils/mrproject/files/patch-configure @@ -0,0 +1,26 @@ +--- configure.orig Sun Jan 27 18:08:12 2002 ++++ configure Sun Jan 27 18:08:30 2002 +@@ -7468,12 +7468,12 @@ + rm -f conftest* + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" +- LIBS="$LIBS -liconv" ++ LIBS="$LIBS -lgiconv" + cat > conftest.$ac_ext <<EOF + #line 7474 "configure" + #include "confdefs.h" + #include <stdlib.h> +-#include <iconv.h> ++#include <giconv.h> + int main() { + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); +@@ -7549,7 +7549,7 @@ + fi + LIBICONV= + if test "$am_cv_lib_iconv" = yes; then +- LIBICONV="-liconv" ++ LIBICONV="-lgiconv" + fi + + diff --git a/deskutils/mrproject/files/patch-ltmain.sh b/deskutils/mrproject/files/patch-ltmain.sh new file mode 100644 index 0000000..7f05474 --- /dev/null +++ b/deskutils/mrproject/files/patch-ltmain.sh @@ -0,0 +1,39 @@ +--- ltmain.sh.orig Sun Jan 20 16:11:07 2002 ++++ ltmain.sh Thu Jan 24 17:07:06 2002 +@@ -1058,8 +1058,13 @@ + continue + ;; + ++ -pthread) ++ compiler_flags="$compiler_flags -pthread" ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -2442,6 +2447,9 @@ + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4208,10 +4216,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 efa8730..acbf2f1 100644 --- a/deskutils/mrproject/pkg-plist +++ b/deskutils/mrproject/pkg-plist @@ -1,20 +1,19 @@ bin/mrproject bin/mrproject-engine bin/run-mrproject -lib/mrproject/components/libgantt-component.so lib/mrproject/components/libcalendar-component.so +lib/mrproject/components/libgantt-component.so lib/mrproject/components/libmpx-file-filter.so lib/mrproject/components/libnetwork-component.so lib/mrproject/components/libresource-component.so +lib/mrproject/components/libsend-component.so lib/mrproject/components/libtask-dialog-component.so lib/mrproject/components/libxml-file-filter.so -share/gnome/gnome/apps/Applications/mrproject.desktop -share/gnome/gnome/ui/GNOME_MrProject_Client.ui -share/gnome/gnome/ui/GNOME_MrProject_GanttComponent.ui -share/gnome/gnome/ui/GNOME_MrProject_ResourceComponent.ui +share/gnome/apps/Applications/mrproject.desktop share/gnome/idl/GNOME_MrProject.idl share/gnome/idl/GNOME_MrProject_AllocationManager.idl share/gnome/idl/GNOME_MrProject_Common.idl +share/gnome/idl/GNOME_MrProject_Engine.idl share/gnome/idl/GNOME_MrProject_FileFilter.idl share/gnome/idl/GNOME_MrProject_Project.idl share/gnome/idl/GNOME_MrProject_ResourceManager.idl @@ -33,6 +32,7 @@ share/gnome/images/mrproject/16_save_as.png share/gnome/images/mrproject/16_send_to.png share/gnome/images/mrproject/24_add_resource.png share/gnome/images/mrproject/24_add_task.png +share/gnome/images/mrproject/24_assign.png share/gnome/images/mrproject/24_calendar.png share/gnome/images/mrproject/24_chain.png share/gnome/images/mrproject/24_delete_resource.png @@ -55,7 +55,6 @@ share/gnome/images/mrproject/network.png share/gnome/images/mrproject/resources.png share/gnome/mime-info/mrproject.keys share/gnome/mime-info/mrproject.mime -share/gnome/mrproject/confirm-exit-dialog.glade share/gnome/mrproject/gantt-component.etspec share/gnome/mrproject/gantt-component.etstate share/gnome/mrproject/gantt-timescale-dialog.glade @@ -66,6 +65,9 @@ share/gnome/mrproject/preferences-dialog.glade share/gnome/mrproject/project-properties-dialog.glade share/gnome/mrproject/resource-component.etspec share/gnome/mrproject/resource-component.etstate +share/gnome/mrproject/resource-filter-dialog-gui.glade +share/gnome/mrproject/resource-filter-table.etspec +share/gnome/mrproject/resource-filter-table.etstate share/gnome/mrproject/task-dialog-alloc-table.etspec share/gnome/mrproject/task-dialog-alloc-table.etstate share/gnome/mrproject/task-dialog-gui.glade @@ -75,15 +77,33 @@ share/gnome/oaf/GNOME_MrProject_MpxFileFilter.oaf share/gnome/oaf/GNOME_MrProject_NetworkComponent.oaf share/gnome/oaf/GNOME_MrProject_ProjectEngine.oaf share/gnome/oaf/GNOME_MrProject_ResourceComponent.oaf +share/gnome/oaf/GNOME_MrProject_SendComponent.oaf share/gnome/oaf/GNOME_MrProject_TaskDialog.oaf share/gnome/oaf/GNOME_MrProject_XmlFileFilter.oaf share/gnome/pixmaps/gnome-application-x-mrproject.png +share/gnome/pixmaps/mrproject.png +share/gnome/ui/GNOME_MrProject_CalendarComponent.ui +share/gnome/ui/GNOME_MrProject_Client.ui +share/gnome/ui/GNOME_MrProject_GanttComponent.ui +share/gnome/ui/GNOME_MrProject_ResourceComponent.ui +share/gnome/ui/GNOME_MrProject_SendComponent.ui +share/locale/da/LC_MESSAGES/mrproject.mo share/locale/de/LC_MESSAGES/mrproject.mo +share/locale/el/LC_MESSAGES/mrproject.mo share/locale/es/LC_MESSAGES/mrproject.mo +share/locale/fr/LC_MESSAGES/mrproject.mo share/locale/ja/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/ru/LC_MESSAGES/mrproject.mo +share/locale/sk/LC_MESSAGES/mrproject.mo share/locale/sv/LC_MESSAGES/mrproject.mo share/locale/tr/LC_MESSAGES/mrproject.mo -@dirrm lib/mrproject/components -@dirrm lib/mrproject +share/locale/zh_CN/LC_MESSAGES/mrproject.mo +share/locale/zh_TW/LC_MESSAGES/mrproject.mo @dirrm share/gnome/mrproject @dirrm share/gnome/images/mrproject +@dirrm lib/mrproject/components +@dirrm lib/mrproject diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile index 449181a..44d741f 100644 --- a/deskutils/planner/Makefile +++ b/deskutils/planner/Makefile @@ -6,26 +6,30 @@ # PORTNAME= mrproject -PORTVERSION= 0.4.0 +PORTVERSION= 0.5.1 CATEGORIES= deskutils gnome MASTER_SITES= ftp://ftp.codefactory.se/pub/software/mrproject/source/ MAINTAINER= demon@FreeBSD.org USE_X_PREFIX= yes -USE_LIBTOOL= yes USE_GMAKE= yes USE_GNOME= yes +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LIBS="-L${LOCALBASE}/lib" \ + BSD_PTHREAD_LIBS=${PTHREAD_LIBS} INSTALLS_SHLIB= yes MAN1= mrproject.1 run-mrproject.1 mrproject-engine.1 pre-patch: - @${PERL} -pi -e 's#-lpthread#-pthread#g ; \ - s#DATADIRNAME=lib#DATADIRNAME=share#g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's#\$\(datadir\)/locale#\$\(prefix\)/share/locale#g' + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '[^g]iconv.h' | \ + xargs ${PERL} -pi -e 's|(["<])iconv.h|\1giconv.h|g' .include <bsd.port.mk> diff --git a/deskutils/planner/distinfo b/deskutils/planner/distinfo index bbc4d44..7b62fd7 100644 --- a/deskutils/planner/distinfo +++ b/deskutils/planner/distinfo @@ -1 +1 @@ -MD5 (mrproject-0.4.0.tar.gz) = 758bc531c78f420674abe4da5d8eaa25 +MD5 (mrproject-0.5.1.tar.gz) = 43c42b6a280f7c64e529b9c754babeec diff --git a/deskutils/planner/files/patch-client::Makefile.in b/deskutils/planner/files/patch-client::Makefile.in new file mode 100644 index 0000000..8349660 --- /dev/null +++ b/deskutils/planner/files/patch-client::Makefile.in @@ -0,0 +1,14 @@ +--- client/Makefile.in.orig Mon Jan 28 14:04:20 2002 ++++ client/Makefile.in Mon Jan 28 14:05:02 2002 +@@ -215,6 +215,11 @@ + $(top_builddir)/util/libmrproject-utilx.la \ + $(top_builddir)/util/libmrproject-corba-util.la \ + $(top_builddir)/client/widgets/libwidgets.la \ ++ $(top_builddir)/client/components/gantt/libgantt-component.la \ ++ $(top_builddir)/client/components/network/libnetwork-component.la \ ++ $(top_builddir)/client/components/resource/libresource-component.la \ ++ $(top_builddir)/client/components/task-dialog/libtask-dialog-component.la \ ++ $(top_builddir)/client/components/send/libsend-component.la \ + $(top_builddir)/client/components/shell-component/libshell-component.la \ + $(top_builddir)/client/manager-clients/libmanager-clients.la \ + $(top_builddir)/libmrproject/libmrproject-interfaces.la diff --git a/deskutils/planner/files/patch-configure b/deskutils/planner/files/patch-configure new file mode 100644 index 0000000..6c74920 --- /dev/null +++ b/deskutils/planner/files/patch-configure @@ -0,0 +1,26 @@ +--- configure.orig Sun Jan 27 18:08:12 2002 ++++ configure Sun Jan 27 18:08:30 2002 +@@ -7468,12 +7468,12 @@ + rm -f conftest* + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" +- LIBS="$LIBS -liconv" ++ LIBS="$LIBS -lgiconv" + cat > conftest.$ac_ext <<EOF + #line 7474 "configure" + #include "confdefs.h" + #include <stdlib.h> +-#include <iconv.h> ++#include <giconv.h> + int main() { + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); +@@ -7549,7 +7549,7 @@ + fi + LIBICONV= + if test "$am_cv_lib_iconv" = yes; then +- LIBICONV="-liconv" ++ LIBICONV="-lgiconv" + fi + + diff --git a/deskutils/planner/files/patch-ltmain.sh b/deskutils/planner/files/patch-ltmain.sh new file mode 100644 index 0000000..7f05474 --- /dev/null +++ b/deskutils/planner/files/patch-ltmain.sh @@ -0,0 +1,39 @@ +--- ltmain.sh.orig Sun Jan 20 16:11:07 2002 ++++ ltmain.sh Thu Jan 24 17:07:06 2002 +@@ -1058,8 +1058,13 @@ + continue + ;; + ++ -pthread) ++ compiler_flags="$compiler_flags -pthread" ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -2442,6 +2447,9 @@ + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4208,10 +4216,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 efa8730..acbf2f1 100644 --- a/deskutils/planner/pkg-plist +++ b/deskutils/planner/pkg-plist @@ -1,20 +1,19 @@ bin/mrproject bin/mrproject-engine bin/run-mrproject -lib/mrproject/components/libgantt-component.so lib/mrproject/components/libcalendar-component.so +lib/mrproject/components/libgantt-component.so lib/mrproject/components/libmpx-file-filter.so lib/mrproject/components/libnetwork-component.so lib/mrproject/components/libresource-component.so +lib/mrproject/components/libsend-component.so lib/mrproject/components/libtask-dialog-component.so lib/mrproject/components/libxml-file-filter.so -share/gnome/gnome/apps/Applications/mrproject.desktop -share/gnome/gnome/ui/GNOME_MrProject_Client.ui -share/gnome/gnome/ui/GNOME_MrProject_GanttComponent.ui -share/gnome/gnome/ui/GNOME_MrProject_ResourceComponent.ui +share/gnome/apps/Applications/mrproject.desktop share/gnome/idl/GNOME_MrProject.idl share/gnome/idl/GNOME_MrProject_AllocationManager.idl share/gnome/idl/GNOME_MrProject_Common.idl +share/gnome/idl/GNOME_MrProject_Engine.idl share/gnome/idl/GNOME_MrProject_FileFilter.idl share/gnome/idl/GNOME_MrProject_Project.idl share/gnome/idl/GNOME_MrProject_ResourceManager.idl @@ -33,6 +32,7 @@ share/gnome/images/mrproject/16_save_as.png share/gnome/images/mrproject/16_send_to.png share/gnome/images/mrproject/24_add_resource.png share/gnome/images/mrproject/24_add_task.png +share/gnome/images/mrproject/24_assign.png share/gnome/images/mrproject/24_calendar.png share/gnome/images/mrproject/24_chain.png share/gnome/images/mrproject/24_delete_resource.png @@ -55,7 +55,6 @@ share/gnome/images/mrproject/network.png share/gnome/images/mrproject/resources.png share/gnome/mime-info/mrproject.keys share/gnome/mime-info/mrproject.mime -share/gnome/mrproject/confirm-exit-dialog.glade share/gnome/mrproject/gantt-component.etspec share/gnome/mrproject/gantt-component.etstate share/gnome/mrproject/gantt-timescale-dialog.glade @@ -66,6 +65,9 @@ share/gnome/mrproject/preferences-dialog.glade share/gnome/mrproject/project-properties-dialog.glade share/gnome/mrproject/resource-component.etspec share/gnome/mrproject/resource-component.etstate +share/gnome/mrproject/resource-filter-dialog-gui.glade +share/gnome/mrproject/resource-filter-table.etspec +share/gnome/mrproject/resource-filter-table.etstate share/gnome/mrproject/task-dialog-alloc-table.etspec share/gnome/mrproject/task-dialog-alloc-table.etstate share/gnome/mrproject/task-dialog-gui.glade @@ -75,15 +77,33 @@ share/gnome/oaf/GNOME_MrProject_MpxFileFilter.oaf share/gnome/oaf/GNOME_MrProject_NetworkComponent.oaf share/gnome/oaf/GNOME_MrProject_ProjectEngine.oaf share/gnome/oaf/GNOME_MrProject_ResourceComponent.oaf +share/gnome/oaf/GNOME_MrProject_SendComponent.oaf share/gnome/oaf/GNOME_MrProject_TaskDialog.oaf share/gnome/oaf/GNOME_MrProject_XmlFileFilter.oaf share/gnome/pixmaps/gnome-application-x-mrproject.png +share/gnome/pixmaps/mrproject.png +share/gnome/ui/GNOME_MrProject_CalendarComponent.ui +share/gnome/ui/GNOME_MrProject_Client.ui +share/gnome/ui/GNOME_MrProject_GanttComponent.ui +share/gnome/ui/GNOME_MrProject_ResourceComponent.ui +share/gnome/ui/GNOME_MrProject_SendComponent.ui +share/locale/da/LC_MESSAGES/mrproject.mo share/locale/de/LC_MESSAGES/mrproject.mo +share/locale/el/LC_MESSAGES/mrproject.mo share/locale/es/LC_MESSAGES/mrproject.mo +share/locale/fr/LC_MESSAGES/mrproject.mo share/locale/ja/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/ru/LC_MESSAGES/mrproject.mo +share/locale/sk/LC_MESSAGES/mrproject.mo share/locale/sv/LC_MESSAGES/mrproject.mo share/locale/tr/LC_MESSAGES/mrproject.mo -@dirrm lib/mrproject/components -@dirrm lib/mrproject +share/locale/zh_CN/LC_MESSAGES/mrproject.mo +share/locale/zh_TW/LC_MESSAGES/mrproject.mo @dirrm share/gnome/mrproject @dirrm share/gnome/images/mrproject +@dirrm lib/mrproject/components +@dirrm lib/mrproject |