Tue Feb 16 03:45:19 2016 UTC ()
fixes to build with wxGTK30 when wx-config is not in ${PREFIX}/bin


(dbj)
diff -r1.50 -r1.51 pkgsrc/databases/pgadmin3/Makefile
diff -r1.13 -r1.14 pkgsrc/databases/pgadmin3/distinfo
diff -r0 -r1.1 pkgsrc/databases/pgadmin3/patches/manual-acinclude.m4
diff -r0 -r1.3 pkgsrc/databases/pgadmin3/patches/patch-configure
cvs diff -r1.50 -r1.51 pkgsrc/databases/pgadmin3/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/pgadmin3/Makefile 2016/02/16 01:07:22 1.50
+++ pkgsrc/databases/pgadmin3/Makefile 2016/02/16 03:45:18 1.51
@@ -1,34 +1,32 @@ @@ -1,34 +1,32 @@
1# $NetBSD: Makefile,v 1.50 2016/02/16 01:07:22 dbj Exp $ 1# $NetBSD: Makefile,v 1.51 2016/02/16 03:45:18 dbj Exp $
2 2
3DISTNAME= pgadmin3-1.20.0 3DISTNAME= pgadmin3-1.20.0
4CATEGORIES= databases 4CATEGORIES= databases
5MASTER_SITES= ${MASTER_SITE_PGSQL:=pgadmin3/release/v${PKGVERSION_NOREV}/src/} 5MASTER_SITES= ${MASTER_SITE_PGSQL:=pgadmin3/release/v${PKGVERSION_NOREV}/src/}
6 6
7MAINTAINER= joerg@NetBSD.org 7MAINTAINER= joerg@NetBSD.org
8HOMEPAGE= http://www.pgadmin.org/ 8HOMEPAGE= http://www.pgadmin.org/
9COMMENT= Graphical PostgreSQL client and administration tool 9COMMENT= Graphical PostgreSQL client and administration tool
10LICENSE= postgresql-license 10LICENSE= postgresql-license
11 11
12USE_LANGUAGES= c99 c++ 12USE_LANGUAGES= c99 c++
13USE_TOOLS+= echo gmake sed 13USE_TOOLS+= echo gmake sed
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15 15
16REPLACE_SH= pgadmin/ver_svn.sh 16REPLACE_SH= pgadmin/ver_svn.sh
17 17
18.include "options.mk" 18.include "options.mk"
19 19
20CONFIGURE_ARGS+= --with-wx=${BUILDLINK_PREFIX.wxGTK30} 
21CONFIGURE_ARGS+= --with-wx-version=3.0 
22CONFIGURE_ARGS+= --with-libxml2=${BUILDLINK_PREFIX.libxml2} 20CONFIGURE_ARGS+= --with-libxml2=${BUILDLINK_PREFIX.libxml2}
23CONFIGURE_ARGS+= --with-libxslt=${BUILDLINK_PREFIX.libxslt} 21CONFIGURE_ARGS+= --with-libxslt=${BUILDLINK_PREFIX.libxslt}
24 22
25.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
26 24
27.if ${OPSYS} == "Darwin" 25.if ${OPSYS} == "Darwin"
28CONFIGURE_ARGS+= --with-arch-${MACHINE_ARCH} 26CONFIGURE_ARGS+= --with-arch-${MACHINE_ARCH}
29.endif 27.endif
30 28
31.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 29.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
32.include "../../textproc/libxml2/buildlink3.mk" 30.include "../../textproc/libxml2/buildlink3.mk"
33.include "../../textproc/libxslt/buildlink3.mk" 31.include "../../textproc/libxslt/buildlink3.mk"
34.include "../../x11/wxGTK30/buildlink3.mk" 32.include "../../x11/wxGTK30/buildlink3.mk"
cvs diff -r1.13 -r1.14 pkgsrc/databases/pgadmin3/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/pgadmin3/distinfo 2015/11/03 01:56:24 1.13
+++ pkgsrc/databases/pgadmin3/distinfo 2016/02/16 03:45:18 1.14
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.13 2015/11/03 01:56:24 agc Exp $ 1$NetBSD: distinfo,v 1.14 2016/02/16 03:45:18 dbj Exp $
2 2
3SHA1 (pgadmin3-1.20.0.tar.gz) = 70ade343c286ef4413961317d41477b47aac675a 3SHA1 (pgadmin3-1.20.0.tar.gz) = 70ade343c286ef4413961317d41477b47aac675a
4RMD160 (pgadmin3-1.20.0.tar.gz) = 3f2902b68a915d88bc93c10b897f4c163459b03e 4RMD160 (pgadmin3-1.20.0.tar.gz) = 3f2902b68a915d88bc93c10b897f4c163459b03e
5SHA512 (pgadmin3-1.20.0.tar.gz) = 83521a16d60bf8c9cffb03e4fb401a31e28f764c31608c0b223f7c88a14a09f665c976f3472debd4ad8b6cd54f0fbd2b8de352c296180e6ea6f8088cb45447bc 5SHA512 (pgadmin3-1.20.0.tar.gz) = 83521a16d60bf8c9cffb03e4fb401a31e28f764c31608c0b223f7c88a14a09f665c976f3472debd4ad8b6cd54f0fbd2b8de352c296180e6ea6f8088cb45447bc
6Size (pgadmin3-1.20.0.tar.gz) = 14394997 bytes 6Size (pgadmin3-1.20.0.tar.gz) = 14394997 bytes
 7SHA1 (patch-configure) = 52be492c191e3a249bcbf88075f0f2a2f1a0f76a
7SHA1 (patch-pgadmin_ctl_ctlMenuToolbar.cpp) = c3c2ed84d9cd2d06bb1f63af86008c24b2c39d3f 8SHA1 (patch-pgadmin_ctl_ctlMenuToolbar.cpp) = c3c2ed84d9cd2d06bb1f63af86008c24b2c39d3f
File Added: pkgsrc/databases/pgadmin3/patches/Attic/manual-acinclude.m4
$NetBSD: manual-acinclude.m4,v 1.1 2016/02/16 03:45:19 dbj Exp $

Remove code that insists wx-config is in a directory named bin

--- acinclude.m4.orig	2013-07-19 08:53:33.000000000 +0000
+++ acinclude.m4
@@ -87,15 +87,6 @@ AC_DEFUN([LOCATE_WXWIDGETS],
 		WX_CONFIG=${WX_HOME}/bin/wx-config
 	], 
 	[
-		WX_HOME=/usr/local/wx2
-		if test ! -f "${WX_HOME}/bin/wx-config"
-		then
-			WX_HOME=/usr/local
-			if test ! -f "${WX_HOME}/bin/wx-config"
-			then
-				WX_HOME=/usr
-				if test ! -f "${WX_HOME}/bin/wx-config"
-				then
 		    # Search the path
 				    AC_PATH_PROGS(WX_CONFIG, wx-config)
 		    if test ! -f "${WX_CONFIG}"
@@ -104,10 +95,6 @@ AC_DEFUN([LOCATE_WXWIDGETS],
 		    else
 					   WX_HOME=`${WX_CONFIG} --prefix`
 		    fi
-				fi
-			fi
-		fi
-		WX_CONFIG=${WX_HOME}/bin/wx-config
 	])
 ])
 
@@ -730,9 +717,8 @@ AC_SUBST(EDB_LIBPQ)
 ################################################
 AC_DEFUN([SETUP_WXWIDGETS],
 [
-	if test -n "${WX_HOME}"
+	if test -n "${WX_CONFIG}"
 	then
-		LDFLAGS="$LDFLAGS -L${WX_HOME}/lib"
 		WX_OLD_LDFLAGS="$LDFLAGS"
 		WX_OLD_CPPFLAGS="$CPPFLAGS"
File Added: pkgsrc/databases/pgadmin3/patches/patch-configure
$NetBSD: patch-configure,v 1.3 2016/02/16 03:45:19 dbj Exp $

Remove code that insists wx-config is in a directory named bin

--- configure.orig	2014-12-15 15:10:17.000000000 +0000
+++ configure
@@ -6466,15 +6466,6 @@ if test "${with_wx+set}" = set; then :
 
 else
 
-		WX_HOME=/usr/local/wx2
-		if test ! -f "${WX_HOME}/bin/wx-config"
-		then
-			WX_HOME=/usr/local
-			if test ! -f "${WX_HOME}/bin/wx-config"
-			then
-				WX_HOME=/usr
-				if test ! -f "${WX_HOME}/bin/wx-config"
-				then
 		    # Search the path
 				    for ac_prog in wx-config
 do
@@ -6527,10 +6518,6 @@ done
 		    else
 					   WX_HOME=`${WX_CONFIG} --prefix`
 		    fi
-				fi
-			fi
-		fi
-		WX_CONFIG=${WX_HOME}/bin/wx-config
 
 fi
 
@@ -6557,9 +6544,8 @@ $as_echo "failed" >&6; }
 $as_echo "ok" >&6; }
 
 
-	if test -n "${WX_HOME}"
+	if test -n "${WX_CONFIG}"
 	then
-		LDFLAGS="$LDFLAGS -L${WX_HOME}/lib"
 		WX_OLD_LDFLAGS="$LDFLAGS"
 		WX_OLD_CPPFLAGS="$CPPFLAGS"