1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

Upgrade to 0.3.7.

Changelog at
<https://sourceforge.net/project/shownotes.php?release_id=448075>.
This commit is contained in:
Thierry Thomas 2006-09-17 21:11:44 +00:00
parent 6016ea6244
commit 5f79d406d1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=173264
10 changed files with 94 additions and 44 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= rkward
PORTVERSION= 0.3.6
PORTVERSION= 0.3.7
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -23,6 +23,7 @@ USE_GETTEXT= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
INSTALLS_ICONS= yes
DOCSDIR= ${PREFIX}/share/doc/HTML/en/rkward

View File

@ -1,3 +1,3 @@
MD5 (rkward-0.3.6.tar.gz) = 5a779a4547a6e114ac587a1d657d965b
SHA256 (rkward-0.3.6.tar.gz) = 5d5ce3ab64ed2dff2c57201f8c1e981b518bc6a3b1fd1981dd48f5418ffd1e61
SIZE (rkward-0.3.6.tar.gz) = 1196863
MD5 (rkward-0.3.7.tar.gz) = af80a7fb17b1a9b4d79974d317a81029
SHA256 (rkward-0.3.7.tar.gz) = 6b0430a10b446fe4585d4aedc3c481e2c2ed582f81183b73645524b46d965366
SIZE (rkward-0.3.7.tar.gz) = 1289882

View File

@ -1,14 +1,6 @@
--- configure.orig Sun Apr 23 19:36:54 2006
+++ configure Sat Apr 29 18:24:07 2006
@@ -27082,13 +27082,13 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
if eval "test \"\${$as_ac_Lib+set}\" = set"; then
--- configure.orig Sun Sep 17 17:21:28 2006
+++ configure Sun Sep 17 20:59:12 2006
@@ -31790,7 +31790,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -17,21 +9,21 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -28920,7 +28920,7 @@
use_r_home="$withval"
@@ -33809,7 +33809,7 @@
withval=$with_r_home; use_r_home="$withval"
else
use_r_home=`R CMD sh -c 'echo $R_HOME'`
- if test "$use_r_home" == "" ; then use_r_home="/usr/local/lib/R" ; fi
+ if test "$use_r_home" = "" ; then use_r_home="/usr/local/lib/R" ; fi
fi;
r_home=
@@ -28968,7 +28968,7 @@
use_r_includes="$withval"
fi
@@ -33888,7 +33888,7 @@
withval=$with_r_includes; use_r_includes="$withval"
else
use_r_includes=`$R_HOMEDIR/bin/R CMD sh -c 'echo $R_INCLUDE_DIR'`
- if test "$use_r_includes" == "" ; then use_r_includes="$R_HOMEDIR/include" ; fi
+ if test "$use_r_includes" = "" ; then use_r_includes="$R_HOMEDIR/include" ; fi
fi;
fi

View File

@ -0,0 +1,31 @@
--- rkward/dialogs/rkloadlibsdialog.cpp.orig Mon Sep 11 00:59:43 2006
+++ rkward/dialogs/rkloadlibsdialog.cpp Sun Sep 17 22:27:38 2006
@@ -38,6 +38,14 @@
#include "../debug.h"
+#ifdef __FreeBSD__
+# include <sys/types.h>
+# include <unistd.h>
+# include <pwd.h>
+
+ struct passwd *passe;
+#endif
+
#define GET_CURRENT_LIBLOCS_COMMAND 1
RKLoadLibsDialog::RKLoadLibsDialog (QWidget *parent, RCommandChain *chain, bool modal) : KDialogBase (KDialogBase::Tabbed, Qt::WStyle_DialogBorder, parent, 0, modal, i18n ("Configure Packages"), KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel | KDialogBase::User1) {
@@ -166,7 +174,12 @@
QTextStream stream (&file);
stream << "options (repos=" + repos_string + ")\n" + command_string;
if (as_root) {
- stream << QString ("system (\"chown ") + cuserid (0) + " " + QDir (RKSettingsModuleGeneral::filesPath ()).filePath ("package_archive") + "/*\")\n";
+ #ifdef __FreeBSD__
+ passe = getpwuid((uid_t) 0);
+ stream << QString ("system (\"chown ") + passe->pw_name + " " + QDir (RKSettingsModuleGeneral::filesPath ()).filePath ("package_archive") + "/*\")\n";
+ #else
+ stream << QString ("system (\"chown ") + cuserid (0) + " " + QDir (RKSettingsModuleGeneral::filesPath ()).filePath ("package_archive") + "/*\")\n";
+ #endif
}
stream << "q ()\n";
file.close();

View File

@ -101,6 +101,7 @@ share/icons/locolor/32x32/apps/rkward.png
%%NLS%%share/locale/fr/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/it/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/pl/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/tr/LC_MESSAGES/rkward.mo
%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/pl
%%PORTDOCS%%@dirrm %%DOCSDIR%%

View File

@ -6,7 +6,7 @@
#
PORTNAME= rkward
PORTVERSION= 0.3.6
PORTVERSION= 0.3.7
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -23,6 +23,7 @@ USE_GETTEXT= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
INSTALLS_ICONS= yes
DOCSDIR= ${PREFIX}/share/doc/HTML/en/rkward

View File

@ -1,3 +1,3 @@
MD5 (rkward-0.3.6.tar.gz) = 5a779a4547a6e114ac587a1d657d965b
SHA256 (rkward-0.3.6.tar.gz) = 5d5ce3ab64ed2dff2c57201f8c1e981b518bc6a3b1fd1981dd48f5418ffd1e61
SIZE (rkward-0.3.6.tar.gz) = 1196863
MD5 (rkward-0.3.7.tar.gz) = af80a7fb17b1a9b4d79974d317a81029
SHA256 (rkward-0.3.7.tar.gz) = 6b0430a10b446fe4585d4aedc3c481e2c2ed582f81183b73645524b46d965366
SIZE (rkward-0.3.7.tar.gz) = 1289882

View File

@ -1,14 +1,6 @@
--- configure.orig Sun Apr 23 19:36:54 2006
+++ configure Sat Apr 29 18:24:07 2006
@@ -27082,13 +27082,13 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
if eval "test \"\${$as_ac_Lib+set}\" = set"; then
--- configure.orig Sun Sep 17 17:21:28 2006
+++ configure Sun Sep 17 20:59:12 2006
@@ -31790,7 +31790,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -17,21 +9,21 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -28920,7 +28920,7 @@
use_r_home="$withval"
@@ -33809,7 +33809,7 @@
withval=$with_r_home; use_r_home="$withval"
else
use_r_home=`R CMD sh -c 'echo $R_HOME'`
- if test "$use_r_home" == "" ; then use_r_home="/usr/local/lib/R" ; fi
+ if test "$use_r_home" = "" ; then use_r_home="/usr/local/lib/R" ; fi
fi;
r_home=
@@ -28968,7 +28968,7 @@
use_r_includes="$withval"
fi
@@ -33888,7 +33888,7 @@
withval=$with_r_includes; use_r_includes="$withval"
else
use_r_includes=`$R_HOMEDIR/bin/R CMD sh -c 'echo $R_INCLUDE_DIR'`
- if test "$use_r_includes" == "" ; then use_r_includes="$R_HOMEDIR/include" ; fi
+ if test "$use_r_includes" = "" ; then use_r_includes="$R_HOMEDIR/include" ; fi
fi;
fi

View File

@ -0,0 +1,31 @@
--- rkward/dialogs/rkloadlibsdialog.cpp.orig Mon Sep 11 00:59:43 2006
+++ rkward/dialogs/rkloadlibsdialog.cpp Sun Sep 17 22:27:38 2006
@@ -38,6 +38,14 @@
#include "../debug.h"
+#ifdef __FreeBSD__
+# include <sys/types.h>
+# include <unistd.h>
+# include <pwd.h>
+
+ struct passwd *passe;
+#endif
+
#define GET_CURRENT_LIBLOCS_COMMAND 1
RKLoadLibsDialog::RKLoadLibsDialog (QWidget *parent, RCommandChain *chain, bool modal) : KDialogBase (KDialogBase::Tabbed, Qt::WStyle_DialogBorder, parent, 0, modal, i18n ("Configure Packages"), KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel | KDialogBase::User1) {
@@ -166,7 +174,12 @@
QTextStream stream (&file);
stream << "options (repos=" + repos_string + ")\n" + command_string;
if (as_root) {
- stream << QString ("system (\"chown ") + cuserid (0) + " " + QDir (RKSettingsModuleGeneral::filesPath ()).filePath ("package_archive") + "/*\")\n";
+ #ifdef __FreeBSD__
+ passe = getpwuid((uid_t) 0);
+ stream << QString ("system (\"chown ") + passe->pw_name + " " + QDir (RKSettingsModuleGeneral::filesPath ()).filePath ("package_archive") + "/*\")\n";
+ #else
+ stream << QString ("system (\"chown ") + cuserid (0) + " " + QDir (RKSettingsModuleGeneral::filesPath ()).filePath ("package_archive") + "/*\")\n";
+ #endif
}
stream << "q ()\n";
file.close();

View File

@ -101,6 +101,7 @@ share/icons/locolor/32x32/apps/rkward.png
%%NLS%%share/locale/fr/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/it/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/pl/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/tr/LC_MESSAGES/rkward.mo
%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/pl
%%PORTDOCS%%@dirrm %%DOCSDIR%%