ports/163671: Update port: graphics/panoglview - 0.2.2 release, UNICODE option is on by default, fixup configure and build when UNICODE is off

[Iouri V. Ivliev]

>Number:         163671
>Category:       ports
>Synopsis:       Update port: graphics/panoglview - 0.2.2 release, UNICODE option is on by default, fixup configure and build when UNICODE is off
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 28 15:30:21 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Iouri V. Ivliev
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
EsterDev, Ltd
>Environment:
FreeBSD smaug.esterdev.com 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Dec 26 00:31:29 UTC 2011     root at smaug.esterdev.com:/usr/obj/usr/src/sys/SMAUG  amd64
>Description:
Update panoglview to 0.2.2 release.
Change default of UNICODE option to "on".
Unfortunately I cannot test this port on powerpc, so it remains broken with "Does not configure on powerpc" reason.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN panoglview.orig/Makefile panoglview/Makefile
--- panoglview.orig/Makefile	2011-12-28 07:55:21.000000000 +0400
+++ panoglview/Makefile	2011-12-28 18:29:26.393048945 +0400
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	panoglview
-PORTVERSION=	0.2.1
-PORTREVISION=	4
+PORTVERSION=	0.2.2
 CATEGORIES=	graphics
-MASTER_SITES=	SF/hugin/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	hugin/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ii at any.com.ru
 COMMENT=	Panorama viewer using OpenGL
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	WX_CONFIG_NAME=wxgtk2-${WX_VERSION}-config \
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	WX_CONFIG_NAME=${WX_CONFIG} \
 		PATH="$${PATH}:${LOCALBASE}/bin"
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -lwx_gtk2_gl-${WX_VERSION}
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 CXXFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include -ftemplate-depth-64
-USE_XORG=	x11
 USE_GMAKE=	yes
 
 USE_WX=		2.6+
@@ -29,7 +29,7 @@
 
 PLIST_FILES=	bin/panoglview
 
-OPTIONS=	UNICODE	"Use UNICODE version of the wxgtk (NLS broken!)"	off
+OPTIONS=	UNICODE	"Use UNICODE version of the wxgtk"	on
 
 .include <bsd.port.pre.mk>
 
@@ -39,10 +39,9 @@
 
 .if defined(WITH_UNICODE)
 WX_UNICODE=	yes
-WX_RC=		wxrc-gtk2u-${WX_VERSION}
 CONFIGURE_ARGS+=	--with-unicode
 .else
-WX_RC=		wxrc-gtk2-${WX_VERSION}
+.undef WX_UNICODE
 CONFIGURE_ARGS+=	--without-unicode
 .endif
 
diff -ruN panoglview.orig/distinfo panoglview/distinfo
--- panoglview.orig/distinfo	2011-07-03 18:11:51.000000000 +0400
+++ panoglview/distinfo	2011-12-28 17:42:52.175920356 +0400
@@ -1,2 +1,2 @@
-SHA256 (panoglview-0.2.1.tar.gz) = 28de4375cd3234d87b563e8807925aa0c234f393c9d9f34562aa8913c8ab8fcf
-SIZE (panoglview-0.2.1.tar.gz) = 467291
+SHA256 (panoglview-0.2.2.tar.gz) = 0726c5cde08e41c88d9e1002f2743dc7f7d39d553d49605a7cf4b8bb9d47349a
+SIZE (panoglview-0.2.2.tar.gz) = 341134
diff -ruN panoglview.orig/files/patch-configure panoglview/files/patch-configure
--- panoglview.orig/files/patch-configure	1970-01-01 03:00:00.000000000 +0300
+++ panoglview/files/patch-configure	2011-12-28 18:19:56.537608647 +0400
@@ -0,0 +1,15 @@
+--- configure.orig	2008-07-23 21:14:06.000000000 +0000
++++ configure	2011-12-28 14:19:01.165970190 +0000
+@@ -3911,11 +3911,7 @@
+ 	" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+-  if test "x$with_unicode" = 'xyes' ; then
+-	WX_GL_LIBS="`$WX_CONFIG_PATH --gl-libs`"
+-  else
+-	WX_GL_LIBS="`$WX_CONFIG_PATH --unicode --gl-libs`"
+-  fi
++  WX_GL_LIBS="`$WX_CONFIG_WITH_ARGS --gl-libs`"
+ 
+ fi
+ 


>Release-Note:
>Audit-Trail:
>Unformatted: