On Tue, Aug 01, 2006 at 08:46:09PM +0100, Mikolaj Kucharski wrote:
> On Tue, Aug 01, 2006 at 07:45:26AM -0500, Rodolfo Gouveia wrote:
> > All you patches applied fine and I was able to "make update" in all
> > packages,
> > except on esound.
> > When doing an install or update I get the following error:
> >
> > ===> Building package for esound-0.2.36
> > Switching to /usr/ports/audio/esound/pkg/PFRAG.shared
> > Error in package:
> > "/usr/ports/audio/esound/w-esound-0.2.36/fake-i386//usr/local/share/examples/esound/esd.conf"
> > does not exist
> > ===> Cleaning for esound-0.2.36
> > rm -f /usr/ports/packages/i386/all/esound-0.2.36.tgz
> > *** Error code 1
> >
> > Stop in /usr/ports/audio/esound (line 2093 of
> > /usr/ports/infrastructure/mk/bsd.port.mk).
> > *** Error code 1
> >
> > Stop in /usr/ports/audio/esound (line 1317 of
> > /usr/ports/infrastructure/mk/bsd.port.mk).
> >
> > I'm using -current from 1 day ago.
>
> Hm.. Sorry, but I can't reproduce this problem :/ Can you send me
> logfile from install/update process?
No need for it now :-)
I've found the problem. The diffs that you made against /dev/null for eg:
patch-Makefile_am, were being applied in the port dir (ports/esound) when they
should be going to the patches directory.
I've modified your original patch so it can be applied all together on the port
dir itself.
? w-esound-0.2.36
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/esound/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- Makefile 2006/01/10 11:14:49 1.38
+++ Makefile 2006/08/01 06:24:44
@@ -3,9 +3,8 @@
COMMENT= "sound library for Enlightenment"
-DISTNAME= esound-0.2.34
-PKGNAME= ${DISTNAME}p0
-SHARED_LIBS= esd 2.34
+DISTNAME= esound-0.2.36
+SHARED_LIBS= esd 2.36
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/esound/0.2/}
@@ -13,16 +12,17 @@
LIB_DEPENDS= audiofile::devel/libaudiofile
-# GPL/LGPL
+# LGPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m wrap
+WANTLIB= c m wrap ossaudio
+
USE_LIBTOOL= Yes
SEPARATE_BUILD= concurrent
-AUTOCONF_VERSION=2.13
+AUTOCONF_VERSION=2.58
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --with-libwrap
@@ -31,5 +31,7 @@
post-extract:
@cp -f ${FILESDIR}/audio_sun.c ${WRKSRC}
+
+NO_REGRESS= Yes
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/esound/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 2005/01/05 15:47:05 1.5
+++ distinfo 2006/08/01 06:24:44
@@ -1,4 +1,4 @@
-MD5 (esound-0.2.34.tar.gz) = 9526d4ffbbbd9462768b38c082c726c7
-RMD160 (esound-0.2.34.tar.gz) = fbfac06a79fb817f9ef61d7808945f7ba87c0110
-SHA1 (esound-0.2.34.tar.gz) = 4fa1fb32121997fe9e7507bf5af296a64bc0a220
-SIZE (esound-0.2.34.tar.gz) = 392336
+MD5 (esound-0.2.36.tar.gz) = f2ba3597ef584f4eed7a8aa0ce875c2d
+RMD160 (esound-0.2.36.tar.gz) = 39a938e393c86d18d57d71ba6ab05615834d15ae
+SHA1 (esound-0.2.36.tar.gz) = 0533ec1c6fe9797a4d3f9b765f246141a1be6a2b
+SIZE (esound-0.2.36.tar.gz) = 485811
Index: patches/patch-Makefile_am
===================================================================
RCS file: patch-Makefile_am
diff -N patch-Makefile_am
--- /dev/null Sat Aug 30 18:16:59 1997
+++ patches/patch-Makefile_am Tue Aug 1 06:24:44 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.am.orig Tue Jun 7 00:34:30 2005
++++ Makefile.am Tue Aug 1 05:48:09 2006
+@@ -130,7 +130,7 @@ esd_LDADD = $(WRAP_LIB) $(LDADD)
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = esd.m4
+
+-esdconfdir = $(sysconfdir)
++esdconfdir = $(datadir)/examples/esound
+ esdconf_DATA = esd.conf
+
+ $(PACKAGE)-$(VERSION).tar.gz: dist
Index: patches/patch-Makefile_in
===================================================================
RCS file: patch-Makefile_in
diff -N patch-Makefile_in
--- /dev/null Sat Aug 30 18:16:59 1997
+++ patches/patch-Makefile_in Tue Aug 1 06:24:44 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.in.orig Tue Jun 7 02:04:14 2005
++++ Makefile.in Tue Aug 1 05:46:48 2006
+@@ -425,7 +425,7 @@ LDADD = libesd.la $(AUDIOFILE_LIBS)
+ esd_LDADD = $(WRAP_LIB) $(LDADD)
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = esd.m4
+-esdconfdir = $(sysconfdir)
++esdconfdir = $(datadir)/examples/esound
+ esdconf_DATA = esd.conf
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = esound.pc
Index: patches/patch-audio_c
===================================================================
RCS file: /cvs/ports/audio/esound/patches/patch-audio_c,v
retrieving revision 1.2
diff -u -r1.2 patch-audio_c
--- patches/patch-audio_c 2002/07/26 19:57:23 1.2
+++ patches/patch-audio_c 2006/08/01 06:24:44
@@ -1,9 +1,10 @@
---- audio.c.orig Tue Jun 4 10:40:44 2002
-+++ audio.c Fri Jul 19 18:32:52 2002
+$OpenBSD$
+--- audio.c.orig Mon Jan 17 01:45:14 2005
++++ audio.c Tue Aug 1 05:51:34 2006
@@ -25,6 +25,8 @@ static int esd_audio_fd = -1;
+ # include "audio_alsa09.c"
+ #elif defined(DRIVER_ALSA) || defined(DRIVER_NEWALSA)
# include "audio_alsa.c"
- #elif defined(DRIVER_ALSA_09)
- #include "audio_alsa09.c"
+#elif defined(DRIVER_SUN)
+# include "audio_sun.c"
#elif defined(DRIVER_OSS)
Index: patches/patch-config_h_in
===================================================================
RCS file: /cvs/ports/audio/esound/patches/patch-config_h_in,v
retrieving revision 1.4
diff -u -r1.4 patch-config_h_in
--- patches/patch-config_h_in 2004/06/26 04:38:33 1.4
+++ patches/patch-config_h_in 2006/08/01 06:24:44
@@ -1,10 +1,13 @@
---- config.h.in.orig Tue Mar 16 07:25:33 2004
-+++ config.h.in Thu Jun 24 20:10:12 2004
-@@ -45,6 +45,7 @@
- #undef DRIVER_ALSA_09_NEW_PCM_API
- #undef DRIVER_DART
- #undef DRIVER_COREAUDIO
+$OpenBSD$
+--- config.h.in.orig Tue Jun 7 02:04:49 2005
++++ config.h.in Tue Aug 1 06:34:50 2006
+@@ -50,6 +50,9 @@
+ /* Defined if Solaris backend is enabled */
+ #undef DRIVER_SOLARIS
+
++/* Defined if SUN backend is enabled */
+#undef DRIVER_SUN
- #undef DRIVER_NONE
- #undef HAVE_INET_ATON
- #undef HAVE_INET_PTON
++
+ /* Defined if ipv6 is enabled */
+ #undef ENABLE_IPV6
+
Index: patches/patch-configure_ac
===================================================================
RCS file: patch-configure_ac
diff -N patch-configure_ac
--- /dev/null Sat Aug 30 18:16:59 1997
+++ patches/patch-configure_ac Tue Aug 1 06:24:44 2006
@@ -0,0 +1,48 @@
+$OpenBSD$
+--- configure.ac.orig Tue Jun 7 02:03:55 2005
++++ configure.ac Tue Aug 1 06:37:48 2006
+@@ -230,6 +230,14 @@ if test "x$enable_local_sound" = "xyes";
+ ;;
+ esac
+ fi
++ if test "${ac_cv_header_sys_audioio_h}" = "yes"; then
++ case ${host_os} in
++ openbsd*)
++ found_sound=yes
++ AC_DEFINE(DRIVER_SUN, 1, [Defined if SUN backend is
enabled])
++ ;;
++ esac
++ fi
+
+ case ${host_os} in
+ os2*)
+@@ -295,7 +303,9 @@ if test "x$enable_local_sound" = "xyes";
+ echo
"---------------------------------------------------------------------"
+ echo "--- Checking to see which audio libraries are required for linking.";
+ echo "--- Most of these checks should also fail. Do not be alarmed.";
++if test ! "$DRIVER_SUN"; then
+ AC_CHECK_FUNC(_oss_ioctl,,[AC_CHECK_LIB(ossaudio,_oss_ioctl)])
++fi
+ AC_CHECK_FUNC(ALnewconfig,,[AC_CHECK_LIB(audio,ALnewconfig)])
+ if test "x$enable_alsa" = "xyes"; then
+ AC_CHECK_FUNC(snd_cards,,[AC_CHECK_LIB(sound,snd_cards)])
+@@ -401,7 +411,8 @@ if test "x$with_libwrap" = "xyes"; then
+
+ wrap_ok=no
+ AC_TRY_LINK(
+-[#include <tcpd.h>
++[#include <sys/types.h>
++#include <tcpd.h>
+ #include <syslog.h>
+ int allow_severity = LOG_INFO;
+ int deny_severity = LOG_WARNING;],
+@@ -411,7 +422,8 @@ int deny_severity = LOG_WARNING;],
+ wrap_ok=yes],
+ [LIBS="$LIBS -lnsl"
+ AC_TRY_LINK(
+-[#include <tcpd.h>
++[#include <sys/types.h>
++#include <tcpd.h>
+ #include <syslog.h>
+ int allow_severity = LOG_INFO;
+ int deny_severity = LOG_WARNING;],
Index: patches/patch-esd.c
===================================================================
RCS file: /cvs/ports/audio/esound/patches/patch-esd.c,v
retrieving revision 1.7
diff -u -r1.7 patch-esd.c
--- patches/patch-esd.c 2004/06/26 04:38:33 1.7
+++ patches/patch-esd.c 2006/08/01 06:24:44
@@ -1,6 +1,6 @@
---- esd.c.orig Wed Jan 14 07:00:46 2004
-+++ esd.c Thu Jun 24 20:07:12 2004
-@@ -236,12 +236,12 @@ struct stat dir_stats;
+--- esd.c.orig Thu May 26 02:02:52 2005
++++ esd.c Tue Aug 1 05:37:43 2006
+@@ -269,12 +269,12 @@ struct stat dir_stats;
#if defined(S_ISVTX)
#define ESD_UNIX_SOCKET_DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|\
Index: patches/patch-util_c
===================================================================
RCS file: /cvs/ports/audio/esound/patches/patch-util_c,v
retrieving revision 1.2
diff -u -r1.2 patch-util_c
--- patches/patch-util_c 2004/06/26 04:38:33 1.2
+++ patches/patch-util_c 2006/08/01 06:24:44
@@ -1,6 +1,6 @@
-$OpenBSD: patch-util_c,v 1.2 2004/06/26 04:38:33 brad Exp $
---- util.c.orig Mon Mar 1 12:06:58 2004
-+++ util.c Thu Jun 24 20:15:35 2004
+$OpenBSD$
+--- util.c.orig Thu May 26 02:02:52 2005
++++ util.c Tue Aug 1 06:09:44 2006
@@ -1,5 +1,8 @@
#include "config.h"
#include "esd.h"
@@ -10,15 +10,13 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <stdlib.h>
-@@ -23,38 +26,31 @@ have_ipv6() {
+@@ -23,38 +26,31 @@ have_ipv6(void) {
const char*
esd_get_socket_dirname (void)
{
-- char *audiodev;
+- const char *audiodev;
- static char *dirname = NULL;
-+ static char *sockdir = NULL, sockdirbuf[PATH_MAX];
-+ struct passwd *pw;
-
+-
- if (dirname == NULL) {
- if (!(audiodev = getenv("AUDIODEV"))) {
- audiodev = "";
@@ -31,28 +29,32 @@
- dirname = malloc(strlen(audiodev) + sizeof("/tmp/.esd"));
- strcpy(dirname, "/tmp/.esd");
- strcat(dirname, audiodev);
+- }
+-
+- return dirname;
++ static char *sockdir = NULL, sockdirbuf[PATH_MAX];
++ struct passwd *pw;
++
+ if (sockdir != NULL)
+ return (sockdir);
+ pw = getpwuid(getuid());
+ if (pw == NULL || pw->pw_dir == NULL) {
+ fprintf(stderr, "esd: could not find home directory\n");
+ exit(1);
- }
--
-- return dirname;
++ }
+ snprintf(sockdirbuf, sizeof(sockdirbuf), "%s/.esd", pw->pw_dir);
+ endpwent();
+ sockdir = sockdirbuf;
+ return (sockdir);
}
-
+-
++
const char*
esd_get_socket_name (void)
{
- const char *dirname;
- static char *name = NULL;
-+ static char *sockname = NULL, socknamebuf[PATH_MAX];
-
+-
- if (name == NULL) {
- dirname = esd_get_socket_dirname();
- name = malloc(strlen(dirname) + sizeof("/socket"));
@@ -61,6 +63,8 @@
- }
-
- return name;
++ static char *sockname = NULL, socknamebuf[PATH_MAX];
++
+ if (sockname != NULL)
+ return (sockname);
+ snprintf(socknamebuf, sizeof(socknamebuf), "%s/socket",
