Changes from maintainer Jolan Luff <jolan@cryptonomicon.org>

- cast NULL to (void *) in execl call to make sure it is 64 bit
on 64 bit address systems; per new gcc warning
- Respect ${SYSCONFDIR}, ${LOCALBASE}
- fix some formatting

misc/xcdroast/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2002/08/23 08:51:58 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.3 2002/10/13 22:39:45 pvalchev Exp $
 
 COMMENT=		"gtk-based frontend to cdrtools"
 
 DISTNAME=		xcdroast-0.98alpha9
-PKGNAME=		xcdroast-0.98a9
+PKGNAME=		xcdroast-0.98a9p1
 CATEGORIES=		misc x11
 
 HOMEPAGE=		http://www.xcdroast.org
@@ -24,6 +24,11 @@ LIB_DEPENDS=		gtk.1.2,glib.1.2::x11/gtk+ \
 USE_X11=		Yes
 NO_REGRESS=		Yes
 
+post-patch:
+	@perl -pi -e 's,/etc,${SYSCONFDIR},g;	\
+		s,/usr/local,${LOCALBASE},g;'	\
+		${WRKSRC}/xcdroast.h
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xcdroast
 	${INSTALL_DATA} ${WRKSRC}/README.nonroot \

misc/xcdroast/patches/patch-io_c

@@ -1,4 +1,4 @@
-$OpenBSD: patch-io_c,v 1.1.1.1 2002/07/14 19:34:28 wilfried Exp $
+$OpenBSD: patch-io_c,v 1.2 2002/10/13 22:39:45 pvalchev Exp $
 --- io.c.orig	Tue May 14 08:37:51 2002
 +++ io.c	Tue May 14 08:38:12 2002
 @@ -20,7 +20,8 @@
@@ -38,6 +38,15 @@ $OpenBSD: patch-io_c,v 1.1.1.1 2002/07/14 19:34:28 wilfried Exp $
  
  	g_snprintf(tmp,MAXLINE,"%s%s",dsp,"ctl");
  
+@@ -1991,7 +1992,7 @@ pid_t pid;
+ 		}
+ 
+ 		/* startup child */
+-		if (execl("/bin/sh", "sh", "-c", cmd ,NULL) < 0) {
++		if (execl("/bin/sh", "sh", "-c", cmd ,(void*)NULL) < 0) {
+ 			g_error("execl error\n");
+ 		}
+  
 @@ -2365,7 +2366,7 @@ gint mix;
  #if defined(linux) || defined(__FreeBSD__)
  gint val;

misc/xcdroast/pkg/DEINSTALL

@@ -1,16 +1,15 @@
 #!/bin/sh
-
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 
-if [ -f /etc/xcdroast.conf ]; then
+if [ -f ${SYSCONFDIR}/xcdroast.conf ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
     echo "| this step as root:"
     echo "|"
-    echo "|           rm -f /etc/xcdroast.conf"
+    echo "|           rm -f ${SYSCONFDIR}/xcdroast.conf"
     echo "|"
     echo "| Do not do this if you plan on re-installing $1"
     echo "| at some future time."

misc/xcdroast/pkg/MESSAGE

@@ -1,6 +1,6 @@
+
 Notes on Preparing X-CD-Roast for Operation
 -------------------------------------------
-
 Due to cdrecord's -scanbus option being wholly unusable under
 OpenBSD, you will need to manually specify the device by using the
 -f option of xcdroast.
@@ -18,3 +18,4 @@ your system to allow for non-root cd-burning, please consult the
 installed documentation at:
 
 	${PREFIX}/share/doc/xcdroast/README.nonroot
+