5 files changed, 29 insertions, 34 deletions

diff --git a/devel/eboxy/Makefile b/devel/eboxy/Makefile
index 4586d6de9e85..4c3399dd611d 100644
--- a/devel/eboxy/Makefile
+++ b/devel/eboxy/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	eboxy
-PORTVERSION=	0.3
+PORTVERSION=	0.3.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.bluelightning.org/ebox/files/eboxy/
@@ -15,19 +15,24 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libSDL_gui.a:${PORTSDIR}/x11-toolkits/sdl_gui
-LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt \
-		xml2:${PORTSDIR}/textproc/libxml2 \
-		SDL-1.1:${PORTSDIR}/devel/sdl12 \
-		SDL_ttf:${PORTSDIR}/graphics/sdl_ttf \
-		SDL_image:${PORTSDIR}/graphics/sdl_image
+BUILD_DEPENDS=	${LOCALBASE}/lib/libSDL_gui.so:${PORTSDIR}/x11-toolkits/sdl_gui
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
+		SDL_ttf.3:${PORTSDIR}/graphics/sdl_ttf \
+		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
+		xml2.5:${PORTSDIR}/textproc/libxml2
+RUN_DEPENDS=	${LOCALBASE}/lib/libSDL_gui.so:${PORTSDIR}/x11-toolkits/sdl_gui
 
-USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lgnugetopt -lstdc++"
+
+USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"  LDFLAGS="${LDFLAGS}" \
+		SDL_CONFIG="${SDL_CONFIG}"
+CONFIGURE_ARGS=	--disable-lirc
+
+CPPFLAGS=	`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
+LDFLAGS=	`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lgnugetopt
 
 post-patch:
 	@${GREP} -lR "malloc.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
diff --git a/devel/eboxy/distinfo b/devel/eboxy/distinfo
index b5d48e61b17c..0370537925ec 100644
--- a/devel/eboxy/distinfo
+++ b/devel/eboxy/distinfo
@@ -1 +1 @@
-MD5 (eboxy-0.3.tar.gz) = 2a85c84e6bc4e2e6de78aa41184b74c5
+MD5 (eboxy-0.3.1.tar.gz) = e7d11cdf13f70ddacd1e31d510af5dc0
diff --git a/devel/eboxy/files/patch-Makefile.in b/devel/eboxy/files/patch-Makefile.in
deleted file mode 100644
index 0f29a20d1c1e..000000000000
--- a/devel/eboxy/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- eboxy/Makefile.in.orig	Mon Sep 16 02:51:19 2002
-+++ eboxy/Makefile.in	Mon Sep 16 02:51:38 2002
-@@ -327,7 +327,7 @@
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	if test -f $$p; then \
- 	echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
--	$(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	$(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed 's/$$/$(EXEEXT)/'`; \
- 	else :; fi; \
- 	done
- 
diff --git a/devel/eboxy/files/patch-main.cpp b/devel/eboxy/files/patch-main.cpp
deleted file mode 100644
index 4b707d10678b..000000000000
--- a/devel/eboxy/files/patch-main.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- eboxy/main.cpp.orig	Mon Sep 16 02:35:53 2002
-+++ eboxy/main.cpp	Mon Sep 16 02:36:03 2002
-@@ -19,6 +19,7 @@
- #include "config.h"
- #endif
- 
-+#define __GNU_LIBRARY__
- #include <ctype.h>
- #include <stdio.h>
- #include <iostream.h>
diff --git a/devel/eboxy/files/patch-pluginmanager.cpp b/devel/eboxy/files/patch-pluginmanager.cpp
new file mode 100644
index 000000000000..97c8d8b8eb9c
--- /dev/null
+++ b/devel/eboxy/files/patch-pluginmanager.cpp
@@ -0,0 +1,11 @@
+--- eboxy/pluginmanager.cpp.orig	Sat Sep 28 20:41:36 2002
++++ eboxy/pluginmanager.cpp	Tue Oct  8 04:19:13 2002
+@@ -79,7 +79,7 @@
+   }
+   else {
+     // Load failed
+-    char *errorstr = dlerror();
++    const char *errorstr = dlerror();
+     cerr << "Couldn't load plugin " << libfile << endl;
+     cerr << errorstr << endl;
+     delete plugin;