cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.98a16

Browse Source
This commit is contained in:
jolan 2009-08-18 23:58:56 +00:00
parent 23854fc57d
commit ff4dd21047
6 changed files with 17 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
misc/xcdroast/Makefile
View File

@ -1,15 +1,13 @@
# $OpenBSD: Makefile,v 1.23 2009/08/10 06:33:02 kili Exp $
# $OpenBSD: Makefile,v 1.24 2009/08/18 23:58:56 jolan Exp $
COMMENT= gtk-based frontend to cdrtools
DISTNAME= xcdroast-0.98alpha15
PKGNAME= ${DISTNAME:L:S/alpha/a/}p9
DISTNAME= xcdroast-0.98alpha16
PKGNAME= ${DISTNAME:L:S/alpha/a/}
CATEGORIES= misc x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xcdroast/}
HOMEPAGE= http://www.xcdroast.org/
MAINTAINER= Jolan Luff <jolan@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes

10
misc/xcdroast/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xcdroast-0.98alpha15.tar.gz) = Kpwdny71hxPEU+Z0uYm+Pg==
RMD160 (xcdroast-0.98alpha15.tar.gz) = kZj2dlkCPOj1CPosMx352ci4Go8=
SHA1 (xcdroast-0.98alpha15.tar.gz) = 81Tqn/6RjE7BExLVU35uJFcw/sw=
SHA256 (xcdroast-0.98alpha15.tar.gz) = QL53FCsj+mImWiPkc7069D32qwEzLqmRpe8waVMLKNg=
SIZE (xcdroast-0.98alpha15.tar.gz) = 3282794
MD5 (xcdroast-0.98alpha16.tar.gz) = vD0zWjDykgZ+qvHqA+uvFw==
RMD160 (xcdroast-0.98alpha16.tar.gz) = 0NY7Y4fZrqzlqu+O6TW2xtSDYlk=
SHA1 (xcdroast-0.98alpha16.tar.gz) = u7MYSn4r/YDZMWmAAtyfdPE2JB0=
SHA256 (xcdroast-0.98alpha16.tar.gz) = orlruXmbWIC+/i0BxeagtjEQ3WH1k4STW3UOcrxzmE0=
SIZE (xcdroast-0.98alpha16.tar.gz) = 3563666

67
misc/xcdroast/patches/patch-configure
View File

@ -1,67 +0,0 @@
$OpenBSD: patch-configure,v 1.3 2004/01/12 05:37:11 jolan Exp $
--- configure.orig 2003-10-25 17:51:45.000000000 -0500
+++ configure 2003-11-05 16:03:23.000000000 -0600
@@ -4361,55 +4361,6 @@ echo "$as_me: error: Library requirement
LIBS="$LIBS $PKGCONFIG_LIBS"
CFLAGS="$CFLAGS $PKGCONFIG_CFLAGS"
- # Extract the first word of "pcre-config", so it can be a program name with args.
-set dummy pcre-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PCRE_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $PCRE_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PCRE_CONFIG="$PCRE_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PCRE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- test -z "$ac_cv_path_PCRE_CONFIG" && ac_cv_path_PCRE_CONFIG="no"
- ;;
-esac
-fi
-PCRE_CONFIG=$ac_cv_path_PCRE_CONFIG
-
-if test -n "$PCRE_CONFIG"; then
- echo "$as_me:$LINENO: result: $PCRE_CONFIG" >&5
-echo "${ECHO_T}$PCRE_CONFIG" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- if test "x$PCRE_CONFIG" = "xno" ; then
- { { echo "$as_me:$LINENO: error: pcre-config not found please install libpcre3-dev or similar" >&5
-echo "$as_me: error: pcre-config not found please install libpcre3-dev or similar" >&2;}
- { (exit 1); exit 1; }; }
- else
- LIBS="$LIBS `$PCRE_CONFIG --libs`"
- CFLAGS="$CFLAGS `$PCRE_CONFIG --cflags`"
- fi
-
else
@@ -9249,7 +9200,6 @@ s,@ENABLE_GTK2@,$ENABLE_GTK2,;t t
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@PKGCONFIG_CFLAGS@,$PKGCONFIG_CFLAGS,;t t
s,@PKGCONFIG_LIBS@,$PKGCONFIG_LIBS,;t t
-s,@PCRE_CONFIG@,$PCRE_CONFIG,;t t
s,@GLIB_CONFIG@,$GLIB_CONFIG,;t t
s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
s,@GLIB_LIBS@,$GLIB_LIBS,;t t

46
misc/xcdroast/patches/patch-src_tools_c
View File

@ -1,46 +0,0 @@
$OpenBSD: patch-src_tools_c,v 1.3 2004/01/12 05:37:11 jolan Exp $
--- src/tools.c.orig 2003-10-26 16:28:57.000000000 -0600
+++ src/tools.c 2004-01-11 22:32:57.000000000 -0600
@@ -559,6 +559,33 @@ guint i;
}
+/* read a single char from a file descriptor. If the descriptor
+ says that it is not available, then try again up to 5 times,
+ before giving up.
+ Required for Mac OS 10.3
+*/
+
+static gint read_char(gint fd, gchar *c) {
+gint rc;
+gint retries;
+
+ retries = 5;
+
+ while (retries) {
+ rc = read(fd, c, 1);
+
+ /* all ok, read one char or EOF */
+ if (rc != -1) {
+ return rc;
+ }
+
+ /* error code, try again after a little while */
+ usleep(100);
+ retries--;
+ }
+ return rc;
+}
+
/*
* Read a line from a descriptor. Read the line one byte at a time,
* looking for the newline. Works fine in nonblocking mode..here
@@ -576,7 +603,7 @@ gchar *str;
str = ptr;
for (n = 1; n < maxlen; n++) {
- if ( (rc = read(fd, &c, 1)) == 1) {
+ if ( (rc = read_char(fd, &c)) == 1) {
*ptr++ = c;
if (c == '\n') {
break;

36
misc/xcdroast/patches/patch-src_xtools_c
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-src_xtools_c,v 1.3 2004/01/12 05:37:11 jolan Exp $
--- src/xtools.c.orig 2003-10-30 07:06:17.000000000 -0600
+++ src/xtools.c 2004-01-11 22:35:32.000000000 -0600
@@ -3635,7 +3635,7 @@ gchar *convert_for_gtk2_textwidget(gchar
return str;
#else
gchar *locstr;
-gint in, out;
+gsize in, out;
locstr = g_locale_from_utf8(str, strlen(str), &in, &out, NULL);
if (locstr) {
@@ -3655,16 +3655,20 @@ gchar *convert_for_gtk2_filename(gchar *
return str;
#else
gchar *locstr;
-gint in, out;
+gsize in, out;
/* ok, if your filesystem is already UTF8 we are not
allowed to change the filenames here. */
if (c_locale_is_utf8)
return str;
- /* should be logical to use g_filename_from_utf8() here, but
- somehow this works not correctly on my testsystem */
+#ifdef BROKEN_GTK2_LOCALE
+ /* on my redhat 7.3 system it does only work that way, but
+ on other systems the correct way is in the #else branch */
locstr = g_locale_from_utf8(str, strlen(str), &in, &out, NULL);
+#else
+ locstr = g_filename_from_utf8(str, strlen(str), &in, &out, NULL);
+#endif
if (locstr) {
strncpy(str, locstr, MAXLINE);
}

18
misc/xcdroast/pkg/PLIST
View File

@ -1,12 +1,12 @@
@comment $OpenBSD: PLIST,v 1.9 2004/11/26 16:40:21 alek Exp $
bin/xcdroast
@comment $OpenBSD: PLIST,v 1.10 2009/08/18 23:58:56 jolan Exp $
@bin bin/xcdroast
lib/xcdroast-0.98/
lib/xcdroast-0.98/bin/
lib/xcdroast-0.98/bin/cddbtool
lib/xcdroast-0.98/bin/rmtool
lib/xcdroast-0.98/bin/vrfytool
lib/xcdroast-0.98/bin/wavplay
lib/xcdroast-0.98/bin/xcdrwrap
@bin lib/xcdroast-0.98/bin/cddbtool
@bin lib/xcdroast-0.98/bin/rmtool
@bin lib/xcdroast-0.98/bin/vrfytool
@bin lib/xcdroast-0.98/bin/wavplay
@bin lib/xcdroast-0.98/bin/xcdrwrap
lib/xcdroast-0.98/icons/
lib/xcdroast-0.98/icons/burnproof.gif
lib/xcdroast-0.98/icons/cddblogo.gif
@ -22,8 +22,6 @@ lib/xcdroast-0.98/sound/
lib/xcdroast-0.98/sound/test.wav
@man man/man1/xcdroast.1
share/locale/bg/LC_MESSAGES/xcdroast.mo
share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/xcdroast.mo
share/locale/cs/LC_MESSAGES/xcdroast.mo
share/locale/da/LC_MESSAGES/xcdroast.mo
@ -58,9 +56,11 @@ share/locale/uk/LC_MESSAGES/xcdroast.mo
share/locale/zh_CN.GB2312/
share/locale/zh_CN.GB2312/LC_MESSAGES/
share/locale/zh_CN.GB2312/LC_MESSAGES/xcdroast.mo
share/locale/zh_CN/LC_MESSAGES/xcdroast.mo
share/locale/zh_TW.Big5/
share/locale/zh_TW.Big5/LC_MESSAGES/
share/locale/zh_TW.Big5/LC_MESSAGES/xcdroast.mo
share/locale/zh_TW/LC_MESSAGES/xcdroast.mo
share/pixmaps/
share/pixmaps/xcdricon.xpm
@extra ${SYSCONFDIR}/xcdroast.conf