Update to 1.7.2

PR:		ports/69162
Submitted by:	maintainer

7 files changed, 12 insertions, 134 deletions

diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index 0219be56bbc3..64e1cd3f2e39 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	vba
-PORTVERSION=	1.7.1
-PORTREVISION=	2
+PORTVERSION=	1.7.2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -33,16 +32,20 @@ CFLAGS+=	-O0
 .endif
 
 .ifndef(PROFILING)
-CONFIGURE_ARGS= --without-profiling --disable-dev
+CONFIGURE_ARGS+=	--without-profiling
 .endif
 
+CONFIGURE_ARGS+=	LIBS=-L${LOCALBASE}/lib
+
 DATA_FILES=	${WRKSRC}/src/VisualBoyAdvance.cfg
-PROG_FILES=	${WRKSRC}/src/VisualBoyAdvance ${WRKSRC}/src/TestEmu
+PROG_FILES=	${WRKSRC}/src/sdl/VisualBoyAdvance ${WRKSRC}/src/sdl/TestEmu
 DOC_FILES=	COPYING AUTHORS NEWS README ChangeLog INSTALL
 
 pre-everything::
+.ifndef(PROFILING)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You can enable profiling by defining PROFILING."
+.endif
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Due to a bug in gcc2 optimsations other than -O0 will be ignored on"
 	@${ECHO_MSG} "FreeBSD releases that didn't ship with gcc3 (prior 500035)."
diff --git a/emulators/vba/distinfo b/emulators/vba/distinfo
index 6ae83cad81d6..f0172a2daeb8 100644
--- a/emulators/vba/distinfo
+++ b/emulators/vba/distinfo
@@ -1,2 +1,2 @@
-MD5 (VisualBoyAdvance-src-1.7.1.tar.gz) = 4147eeac55ecf713397f19eae636eef3
-SIZE (VisualBoyAdvance-src-1.7.1.tar.gz) = 1001727
+MD5 (VisualBoyAdvance-src-1.7.2.tar.gz) = cc02339e3fd8efd9f23121b0a2f81fd8
+SIZE (VisualBoyAdvance-src-1.7.2.tar.gz) = 1410762
diff --git a/emulators/vba/files/patch-aa b/emulators/vba/files/patch-aa
index 1cff2d167f08..287dace14459 100644
--- a/emulators/vba/files/patch-aa
+++ b/emulators/vba/files/patch-aa
@@ -1,5 +1,5 @@
---- src/SDL.cpp.orig	Sun Feb  8 14:45:01 2004
-+++ src/SDL.cpp		Tue Feb 10 14:45:09 2004
+--- src/sdl/SDL.cpp.orig	Sun Feb  8 14:45:01 2004
++++ src/sdl/SDL.cpp		Tue Feb 10 14:45:09 2004
 @@ -621,7 +621,7 @@
    }
  #else
diff --git a/emulators/vba/files/patch-ab b/emulators/vba/files/patch-ab
deleted file mode 100644
index 6c8416155892..000000000000
--- a/emulators/vba/files/patch-ab
+++ /dev/null
@@ -1,103 +0,0 @@
-*** configure.orig	Sun Jan 11 22:22:03 2004
---- configure	Sun Jan 11 22:24:51 2004
-***************
-*** 5424,5521 ****
-  
-  fi
-  
-- echo "$as_me:$LINENO: checking for socklen_t" >&5
-- echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
-- cat >conftest.$ac_ext <<_ACEOF
-- #line $LINENO "configure"
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- #include <sys/socket.h>
-- socklen_t x;
-- 
-- int
-- main ()
-- {
-- 
--   ;
--   return 0;
-- }
-- _ACEOF
-- rm -f conftest.$ac_objext
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--   (eval $ac_compile) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } &&
--          { ac_try='test -s conftest.$ac_objext'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; }; then
--   echo "$as_me:$LINENO: result: yes" >&5
-- echo "${ECHO_T}yes" >&6
-- else
--   echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
-- 
-- cat >conftest.$ac_ext <<_ACEOF
-- #line $LINENO "configure"
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- #include <sys/socket.h>
-- int accept (int, struct sockaddr *, size_t *);
-- 
-- int
-- main ()
-- {
-- 
--   ;
--   return 0;
-- }
-- _ACEOF
-- rm -f conftest.$ac_objext
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--   (eval $ac_compile) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } &&
--          { ac_try='test -s conftest.$ac_objext'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; }; then
-- 
-- echo "$as_me:$LINENO: result: size_t" >&5
-- echo "${ECHO_T}size_t" >&6
-- cat >>confdefs.h <<\_ACEOF
-- #define socklen_t size_t
-- _ACEOF
-- 
-- else
--   echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
-- 
-- echo "$as_me:$LINENO: result: int" >&5
-- echo "${ECHO_T}int" >&6
-- cat >>confdefs.h <<\_ACEOF
-- #define socklen_t int
-- _ACEOF
-- 
-- fi
-- rm -f conftest.$ac_objext conftest.$ac_ext
-- fi
-- rm -f conftest.$ac_objext conftest.$ac_ext
-- 
-  echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-  echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-  if test "${ac_cv_c_bigendian+set}" = set; then
---- 5424,5429 ----
diff --git a/emulators/vba/files/patch-ac b/emulators/vba/files/patch-ac
deleted file mode 100644
index 48c1b41660b5..000000000000
--- a/emulators/vba/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.am.orig	Sun Feb  1 16:00:46 2004
-+++ src/Makefile.am		Tue Feb 10 15:03:25 2004
-@@ -18,7 +18,7 @@
- 	hq2x.cpp hq2x.h lq2x.h Text.cpp Text.h interp.h
- 
- VisualBoyAdvance_LDADD = gb/libgb.a @VBA_PROF@ @VBA_MMX@
--VisualBoyAdvance_LDFLAGS = `sdl-config --libs`
-+VisualBoyAdvance_LDFLAGS = `${SDL_CONFIG} --libs`
- 
- TestEmu_SOURCES = \
- 	TestEmu.cpp 2xSaI.cpp pixel.cpp motionblur.cpp admame.cpp \
diff --git a/emulators/vba/files/patch-ad b/emulators/vba/files/patch-ad
deleted file mode 100644
index c63276b54d0c..000000000000
--- a/emulators/vba/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Sun Feb  1 16:00:50 2004
-+++ src/Makefile.in	Tue Feb 10 15:03:46 2004
-@@ -157,7 +157,7 @@
- 
- 
- VisualBoyAdvance_LDADD = gb/libgb.a @VBA_PROF@ @VBA_MMX@
--VisualBoyAdvance_LDFLAGS = `sdl-config --libs`
-+VisualBoyAdvance_LDFLAGS = `${SDL_CONFIG} --libs`
- 
- TestEmu_SOURCES = \
- 	TestEmu.cpp 2xSaI.cpp pixel.cpp motionblur.cpp admame.cpp \
diff --git a/emulators/vba/pkg-plist b/emulators/vba/pkg-plist
index 5f0f21b7b05c..52ba75740154 100644
--- a/emulators/vba/pkg-plist
+++ b/emulators/vba/pkg-plist
@@ -7,4 +7,4 @@ bin/TestEmu
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
-@dirrm share/doc/vba
+%%PORTDOCS%%@dirrm %%DOCSDIR%%