install everything in version specific directory except for a few symlinks in bin

This is a partial fix for PR pkg/50389
for now we need to keep the conflicting links in bin until we have a fix for dependencies

2 files changed, 47 insertions, 39 deletions

diff --git a/x11/wxGTK30/Makefile b/x11/wxGTK30/Makefile
index b62762f4eba..aec68f0236f 100644
--- a/x11/wxGTK30/Makefile
+++ b/x11/wxGTK30/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2015/12/29 04:54:40 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2016/01/19 03:49:29 dbj Exp $
 
 VERSION=	3.0.2
-PKGREVISION=	2
+PKGREVISION=	3
 DISTNAME=	wxWidgets-${VERSION}
 PKGNAME=	wxGTK30-${VERSION}
 CATEGORIES=	x11
@@ -20,7 +20,6 @@ PATCH_DIST_STRIP.${DISTNAME}-libtool.diff.bz2= -p1
 
 USE_TOOLS+=		pkg-config msgfmt
 USE_LIBTOOL=		YES
-USE_PKGLOCALEDIR=	YES
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 USE_GNU_CONFIGURE_HOST=	no
@@ -36,13 +35,15 @@ CONFIGURE_ARGS+=	--enable-mediactrl
 # wxregexu symbols are not exported properly as of 3.0.1
 # http://trac.wxwidgets.org/ticket/16571
 CONFIGURE_ARGS+=	--disable-visibility
+CONFIGURE_ARGS+=	--bindir=${PREFIX}/libexec/wx-3.0
+CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/share/wx-3.0
 
-DOCDIR=			share/doc/wxGTK
-PKGLOCALEDIR=		share
+DOCDIR=			share/wx-3.0/doc/wxGTK
 
 INSTALL_MAKE_FLAGS+=	LN_S="ln -fs"
 
-INSTALLATION_DIRS=	${DOCDIR}
+INSTALLATION_DIRS+=	${DOCDIR}
+INSTALLATION_DIRS+=	bin
 
 REPLACE_SH=		wx-config.in wx-config-inplace.in
 
@@ -83,6 +84,10 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/lgpl.txt ${DESTDIR}${PREFIX}/${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/changes.txt ${DESTDIR}${PREFIX}/${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/readme.txt ${DESTDIR}${PREFIX}/${DOCDIR}
+	# Create symlinks for now.  Eventually we may want to use ALTERNATIVES
+	${LN} -sf ../libexec/wx-3.0/wxrc ${DESTDIR}${PREFIX}/bin/wxrc
+	${LN} -sf ../libexec/wx-3.0/wxrc-3.0 ${DESTDIR}${PREFIX}/bin/wxrc-3.0
+	${LN} -sf ../libexec/wx-3.0/wx-config ${DESTDIR}${PREFIX}/bin/wx-config
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/wxGTK30/PLIST b/x11/wxGTK30/PLIST
index 42e3646a904..d4ec4c30a86 100644
--- a/x11/wxGTK30/PLIST
+++ b/x11/wxGTK30/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2015/01/07 13:22:58 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.6 2016/01/19 03:49:29 dbj Exp $
 bin/wx-config
 bin/wxrc
 bin/wxrc-3.0
@@ -730,35 +730,38 @@ lib/libwx_gtk2u_xrc-3.0.la
 lib/libwxregexu-3.0.la
 lib/wx/config/gtk2-unicode-3.0
 lib/wx/include/gtk2-unicode-3.0/wx/setup.h
-share/aclocal/wxwin.m4
-share/bakefile/presets/wx.bkl
-share/bakefile/presets/wx_presets.py
-share/bakefile/presets/wx_unix.bkl
-share/bakefile/presets/wx_win32.bkl
-share/bakefile/presets/wx_xrc.bkl
-share/doc/wxGTK/changes.txt
-share/doc/wxGTK/lgpl.txt
-share/doc/wxGTK/licence.txt
-share/doc/wxGTK/readme.txt
-share/locale/ca/LC_MESSAGES/wxstd.mo
-share/locale/cs/LC_MESSAGES/wxstd.mo
-share/locale/da/LC_MESSAGES/wxstd.mo
-share/locale/de/LC_MESSAGES/wxstd.mo
-share/locale/el/LC_MESSAGES/wxstd.mo
-share/locale/es/LC_MESSAGES/wxstd.mo
-share/locale/fi/LC_MESSAGES/wxstd.mo
-share/locale/fr/LC_MESSAGES/wxstd.mo
-share/locale/hu/LC_MESSAGES/wxstd.mo
-share/locale/id/LC_MESSAGES/wxstd.mo
-share/locale/it/LC_MESSAGES/wxmsw.mo
-share/locale/it/LC_MESSAGES/wxstd.mo
-share/locale/ja/LC_MESSAGES/wxstd.mo
-share/locale/nl/LC_MESSAGES/wxstd.mo
-share/locale/pl/LC_MESSAGES/wxstd.mo
-share/locale/ru/LC_MESSAGES/wxstd.mo
-share/locale/sl/LC_MESSAGES/wxstd.mo
-share/locale/sv/LC_MESSAGES/wxstd.mo
-share/locale/tr/LC_MESSAGES/wxstd.mo
-share/locale/uk/LC_MESSAGES/wxstd.mo
-share/locale/zh_CN/LC_MESSAGES/wxstd.mo
-share/locale/zh_TW/LC_MESSAGES/wxstd.mo
+libexec/wx-3.0/wx-config
+libexec/wx-3.0/wxrc
+libexec/wx-3.0/wxrc-3.0
+share/wx-3.0/aclocal/wxwin.m4
+share/wx-3.0/bakefile/presets/wx.bkl
+share/wx-3.0/bakefile/presets/wx_presets.py
+share/wx-3.0/bakefile/presets/wx_unix.bkl
+share/wx-3.0/bakefile/presets/wx_win32.bkl
+share/wx-3.0/bakefile/presets/wx_xrc.bkl
+share/wx-3.0/doc/wxGTK/changes.txt
+share/wx-3.0/doc/wxGTK/lgpl.txt
+share/wx-3.0/doc/wxGTK/licence.txt
+share/wx-3.0/doc/wxGTK/readme.txt
+share/wx-3.0/locale/ca/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/cs/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/da/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/de/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/el/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/es/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/fi/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/fr/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/hu/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/id/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/it/LC_MESSAGES/wxmsw.mo
+share/wx-3.0/locale/it/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/ja/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/nl/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/pl/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/ru/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/sl/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/sv/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/tr/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/uk/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/zh_CN/LC_MESSAGES/wxstd.mo
+share/wx-3.0/locale/zh_TW/LC_MESSAGES/wxstd.mo