From 626fc122b17eb1e3aea9921350e03116ed21c314 Mon Sep 17 00:00:00 2001 From: jolan Date: Fri, 20 Jun 2003 10:03:49 +0000 Subject: [PATCH] upgrade to 0.98a14 --- misc/xcdroast/Makefile | 8 +++---- misc/xcdroast/distinfo | 6 ++--- misc/xcdroast/patches/patch-configure | 28 ++++++++++++++++++++++++ misc/xcdroast/patches/patch-src_io_c | 12 ++++++++++ misc/xcdroast/patches/patch-src_tools_c | 12 ---------- misc/xcdroast/patches/patch-src_xtools_c | 20 ----------------- misc/xcdroast/pkg/PLIST | 8 ++++++- 7 files changed, 54 insertions(+), 40 deletions(-) create mode 100644 misc/xcdroast/patches/patch-configure create mode 100644 misc/xcdroast/patches/patch-src_io_c delete mode 100644 misc/xcdroast/patches/patch-src_tools_c delete mode 100644 misc/xcdroast/patches/patch-src_xtools_c diff --git a/misc/xcdroast/Makefile b/misc/xcdroast/Makefile index 5deba059fd5..f0f33e8d435 100644 --- a/misc/xcdroast/Makefile +++ b/misc/xcdroast/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.5 2003/05/12 08:23:47 jolan Exp $ +# $OpenBSD: Makefile,v 1.6 2003/06/20 10:03:49 jolan Exp $ COMMENT= "gtk-based frontend to cdrtools" -DISTNAME= xcdroast-0.98alpha13 -PKGNAME= xcdroast-0.98a13 +DISTNAME= xcdroast-0.98alpha14 +PKGNAME= xcdroast-0.98a14 CATEGORIES= misc x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xcdroast/} @@ -26,7 +26,7 @@ CONFIGURE_STYLE=gnu post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/src/xpms/xcdricon.xpm \ + ${INSTALL_DATA} ${WRKSRC}/xpms/xcdricon.xpm \ ${PREFIX}/share/pixmaps/xcdricon.xpm .include diff --git a/misc/xcdroast/distinfo b/misc/xcdroast/distinfo index 841d49e26ab..1224542a07e 100644 --- a/misc/xcdroast/distinfo +++ b/misc/xcdroast/distinfo @@ -1,3 +1,3 @@ -MD5 (xcdroast-0.98alpha13.tar.gz) = ba5d006cc8a9d13c223ccc11c2fc088a -RMD160 (xcdroast-0.98alpha13.tar.gz) = 9c5e8bb86cf3c4a5961e629683b8c35d51255b1c -SHA1 (xcdroast-0.98alpha13.tar.gz) = c73eadd0bd1958eb99c2c2908e27e3aea79dd66b +MD5 (xcdroast-0.98alpha14.tar.gz) = c5f3f1ab6ff6d286bd984def54ef0c54 +RMD160 (xcdroast-0.98alpha14.tar.gz) = 1045a4ee8db9cea0f4062e4f75f8c4e965d207d3 +SHA1 (xcdroast-0.98alpha14.tar.gz) = 7055f281ed7b9d9d0854df245a9e136bb5dd622a diff --git a/misc/xcdroast/patches/patch-configure b/misc/xcdroast/patches/patch-configure new file mode 100644 index 00000000000..ded2c9b089d --- /dev/null +++ b/misc/xcdroast/patches/patch-configure @@ -0,0 +1,28 @@ +$OpenBSD: patch-configure,v 1.1 2003/06/20 10:03:50 jolan Exp $ +--- configure.orig Mon May 19 14:41:52 2003 ++++ configure Sat May 31 04:21:12 2003 +@@ -7856,23 +7856,16 @@ else + #include "confdefs.h" + #include + extern int _nl_msg_cat_cntr; +-extern int *_nl_domain_bindings; + extern + #ifdef __cplusplus + "C" + #endif + const char *_nl_expand_alias (); +-#ifdef F77_DUMMY_MAIN +-# ifdef __cplusplus +- extern "C" +-# endif +- int F77_DUMMY_MAIN() { return 1; } +-#endif + int + main () + { + bindtextdomain ("", ""); +-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0) ++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) + ; + return 0; + } diff --git a/misc/xcdroast/patches/patch-src_io_c b/misc/xcdroast/patches/patch-src_io_c new file mode 100644 index 00000000000..7aeb53bf1e2 --- /dev/null +++ b/misc/xcdroast/patches/patch-src_io_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_io_c,v 1.1 2003/06/20 10:03:50 jolan Exp $ +--- src/io.c.orig Thu May 29 08:14:42 2003 ++++ src/io.c Fri Jun 20 03:36:07 2003 +@@ -6605,7 +6605,7 @@ gchar *p; + read_output_ctrl = 4; + } + /* check Medium error/buffer underrun */ +- if (strncmp(tmp2,"Input/output error",18)) { ++ if (strncmp(tmp2,"Input/output error",18) == 0) { + read_output_ctrl = 5; + } + } diff --git a/misc/xcdroast/patches/patch-src_tools_c b/misc/xcdroast/patches/patch-src_tools_c deleted file mode 100644 index d7992d06e57..00000000000 --- a/misc/xcdroast/patches/patch-src_tools_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_tools_c,v 1.1 2003/02/17 18:10:35 naddy Exp $ ---- src/tools.c.orig Wed Jan 1 08:49:38 2003 -+++ src/tools.c Wed Feb 5 18:06:13 2003 -@@ -924,7 +924,7 @@ gchar tmp[1024]; - - gint isroot() { - -- if (getuid() == 0) { -+ if (geteuid() == 0) { - return 1; - } else { - return 0; diff --git a/misc/xcdroast/patches/patch-src_xtools_c b/misc/xcdroast/patches/patch-src_xtools_c deleted file mode 100644 index 886ab0667c5..00000000000 --- a/misc/xcdroast/patches/patch-src_xtools_c +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_xtools_c,v 1.1 2003/02/17 18:10:35 naddy Exp $ ---- src/xtools.c.orig Tue Dec 31 08:29:27 2002 -+++ src/xtools.c Wed Feb 5 18:06:51 2003 -@@ -2559,6 +2559,7 @@ gint count; - /* do change the group rights for nonroot mode */ - /* this seems only be required with /bin/sh being bash2 */ - -+#if 0 - void fix_guid() { - - dodebug(3,"Current gid/egid = %d/%d\n", getgid(), getegid()); -@@ -2570,7 +2571,7 @@ void fix_guid() { - setregid(getegid(), getgid()); - dodebug(3,"Current gid/egid after setregid = %d/%d\n", getgid(), getegid()); - } -- -+#endif - - /* check if a given group-id matches a groupname */ - diff --git a/misc/xcdroast/pkg/PLIST b/misc/xcdroast/pkg/PLIST index 2e20c808c20..f02620c8802 100644 --- a/misc/xcdroast/pkg/PLIST +++ b/misc/xcdroast/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2003/02/17 18:10:35 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.3 2003/06/20 10:03:50 jolan Exp $ bin/xcdroast lib/xcdroast-0.98/bin/cddbtool lib/xcdroast-0.98/bin/rmtool @@ -22,6 +22,7 @@ share/locale/ca/LC_MESSAGES/xcdroast.mo share/locale/cs/LC_MESSAGES/xcdroast.mo share/locale/da/LC_MESSAGES/xcdroast.mo share/locale/de/LC_MESSAGES/xcdroast.mo +share/locale/el_GR/LC_MESSAGES/xcdroast.mo share/locale/es/LC_MESSAGES/xcdroast.mo share/locale/et/LC_MESSAGES/xcdroast.mo share/locale/fi/LC_MESSAGES/xcdroast.mo @@ -40,6 +41,7 @@ share/locale/ru/LC_MESSAGES/xcdroast.mo share/locale/sk/LC_MESSAGES/xcdroast.mo share/locale/sv/LC_MESSAGES/xcdroast.mo share/locale/tr/LC_MESSAGES/xcdroast.mo +share/locale/uk/LC_MESSAGES/xcdroast.mo share/locale/zh_CN.GB2312/LC_MESSAGES/xcdroast.mo share/locale/zh_TW.Big5/LC_MESSAGES/xcdroast.mo share/pixmaps/xcdricon.xpm @@ -48,6 +50,8 @@ share/pixmaps/xcdricon.xpm @comment @dirrm share/locale/zh_TW.Big5 @comment @dirrm share/locale/zh_CN.GB2312/LC_MESSAGES @comment @dirrm share/locale/zh_CN.GB2312 +@comment @dirrm share/locale/uk/LC_MESSAGES +@comment @dirrm share/locale/uk @comment @dirrm share/locale/tr/LC_MESSAGES @comment @dirrm share/locale/tr @comment @dirrm share/locale/sv/LC_MESSAGES @@ -84,6 +88,8 @@ share/pixmaps/xcdricon.xpm @comment @dirrm share/locale/et @comment @dirrm share/locale/es/LC_MESSAGES @comment @dirrm share/locale/es +@comment @dirrm share/locale/el_GR/LC_MESSAGES +@comment @dirrm share/locale/el_GR @comment @dirrm share/locale/de/LC_MESSAGES @comment @dirrm share/locale/de @comment @dirrm share/locale/da/LC_MESSAGES