diff options
author | dbj <dbj@pkgsrc.org> | 2016-01-19 03:48:06 +0000 |
---|---|---|
committer | dbj <dbj@pkgsrc.org> | 2016-01-19 03:48:06 +0000 |
commit | 3988ab6b39385d20530bc92f33420d23b31cf83a (patch) | |
tree | 7eb05fd97f13c84ddc9e009f675b7c15b6fc2539 /x11 | |
parent | 3053f90d7a5fec69470eb1a09a871fb81c882a4b (diff) | |
download | pkgsrc-3988ab6b39385d20530bc92f33420d23b31cf83a.tar.gz |
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
Diffstat (limited to 'x11')
-rw-r--r-- | x11/wxGTK28/Makefile | 11 | ||||
-rw-r--r-- | x11/wxGTK28/Makefile.common | 11 | ||||
-rw-r--r-- | x11/wxGTK28/PLIST | 59 | ||||
-rw-r--r-- | x11/wxGTK28/distinfo | 5 | ||||
-rw-r--r-- | x11/wxGTK30/Makefile | 17 | ||||
-rw-r--r-- | x11/wxGTK30/PLIST | 69 |
6 files changed, 94 insertions, 78 deletions
diff --git a/x11/wxGTK28/Makefile b/x11/wxGTK28/Makefile index 808da22561b..56518b03a0a 100644 --- a/x11/wxGTK28/Makefile +++ b/x11/wxGTK28/Makefile @@ -1,16 +1,17 @@ -# $NetBSD: Makefile,v 1.42 2015/04/25 14:25:20 tnn Exp $ +# $NetBSD: Makefile,v 1.43 2016/01/19 03:48:06 dbj Exp $ # .include "../../x11/wxGTK28/Makefile.common" PKGNAME= ${DISTNAME:S/wxGTK/wxGTK28/} -PKGREVISION= 8 +PKGREVISION= 9 COMMENT= GTK-based implementation of the wxWidgets GUI library BUILD_TARGET= all INSTALL_TARGET= install -INSTALLATION_DIRS= ${DOCDIR} +INSTALLATION_DIRS+= ${DOCDIR} +INSTALLATION_DIRS+= bin REPLACE_SH= wx-config.in wx-config-inplace.in @@ -31,6 +32,10 @@ post-build: post-install: ${INSTALL_DATA} ${WRKSRC}/docs/licence.txt ${DESTDIR}${DOCDIR} + # Create symlinks for now. Eventually we may want to use ALTERNATIVES + ${LN} -sf ../libexec/wx-2.8/wxrc ${DESTDIR}${PREFIX}/bin/wxrc + ${LN} -sf ../libexec/wx-2.8/wxrc-2.8 ${DESTDIR}${PREFIX}/bin/wxrc-2.8 + ${LN} -sf ../libexec/wx-2.8/wx-config ${DESTDIR}${PREFIX}/bin/wx-config .include "../../mk/bsd.prefs.mk" diff --git a/x11/wxGTK28/Makefile.common b/x11/wxGTK28/Makefile.common index 66228779ab9..f7182842d23 100644 --- a/x11/wxGTK28/Makefile.common +++ b/x11/wxGTK28/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2014/05/25 18:21:31 bouyer Exp $ +# $NetBSD: Makefile.common,v 1.17 2016/01/19 03:48:06 dbj Exp $ # # used by x11/wxGTK28/Makefile # used by x11/wxGTK28-contrib/Makefile @@ -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 @@ -34,14 +33,13 @@ CONFIGURE_ARGS+= --with-zlib=sys CONFIGURE_ARGS+= --with-regex=builtin CONFIGURE_ARGS+= --enable-mediactrl CONFIGURE_ARGS+= --enable-graphics_ctx +CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec/wx-2.8 +CONFIGURE_ARGS+= --datadir=${PREFIX}/share/wx-2.8 -DOCDIR= ${PREFIX}/share/doc/wxGTK -PKGLOCALEDIR= share +DOCDIR= ${PREFIX}/share/wx-2.8/doc/wxGTK CONFIGURE_DIRS= build-non-unicode build-unicode -INSTALL_MAKE_FLAGS+= LN_S="ln -fs" - #CONFIGURE_ARGS+= --enable-debug #PLIST_SUBST+= DEBUG_LIB=d DEBUG_CONFIG=-config @@ -53,6 +51,7 @@ SUBST_MESSAGE.fix-paths= Fixing absolute paths. SUBST_FILES.fix-paths= configure SUBST_SED.fix-paths= -e 's,/usr/pkg/include,${PREFIX}/include,g' SUBST_SED.fix-paths+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_SED.fix-paths+= -e 's,/usr/X11/,${X11BASE}/,g' pre-configure: mkdir ${WRKSRC}/build-non-unicode ${WRKSRC}/build-unicode diff --git a/x11/wxGTK28/PLIST b/x11/wxGTK28/PLIST index f9b001d0abc..c010d1f0713 100644 --- a/x11/wxGTK28/PLIST +++ b/x11/wxGTK28/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2012/01/20 12:02:24 drochner Exp $ +@comment $NetBSD: PLIST,v 1.5 2016/01/19 03:48:06 dbj Exp $ bin/wx-config bin/wxrc bin/wxrc-2.8 @@ -571,30 +571,33 @@ lib/wx/config/gtk2-ansi${DEBUG_CONFIG}-2.8 lib/wx/config/gtk2-unicode${DEBUG_CONFIG}-2.8 lib/wx/include/gtk2-ansi${DEBUG_CONFIG}-2.8/wx/setup.h lib/wx/include/gtk2-unicode${DEBUG_CONFIG}-2.8/wx/setup.h -share/aclocal/wxwin.m4 -share/bakefile/presets/wx.bkl -share/bakefile/presets/wx_unix.bkl -share/bakefile/presets/wx_win32.bkl -share/doc/wxGTK/licence.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-2.8/wx-config +libexec/wx-2.8/wxrc +libexec/wx-2.8/wxrc-2.8 +share/wx-2.8/aclocal/wxwin.m4 +share/wx-2.8/bakefile/presets/wx.bkl +share/wx-2.8/bakefile/presets/wx_unix.bkl +share/wx-2.8/bakefile/presets/wx_win32.bkl +share/wx-2.8/doc/wxGTK/licence.txt +share/wx-2.8/locale/ca/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/cs/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/da/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/de/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/el/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/es/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/fi/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/fr/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/hu/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/id/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/it/LC_MESSAGES/wxmsw.mo +share/wx-2.8/locale/it/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/ja/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/nl/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/pl/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/ru/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/sl/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/sv/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/tr/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/uk/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/zh_CN/LC_MESSAGES/wxstd.mo +share/wx-2.8/locale/zh_TW/LC_MESSAGES/wxstd.mo diff --git a/x11/wxGTK28/distinfo b/x11/wxGTK28/distinfo index 0fb69e49fb4..c68d280315b 100644 --- a/x11/wxGTK28/distinfo +++ b/x11/wxGTK28/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2015/11/22 22:16:04 mef Exp $ +$NetBSD: distinfo,v 1.19 2016/01/19 03:48:06 dbj Exp $ SHA1 (wxGTK-2.8.12-libtool.diff.bz2) = f2c9b8a06c08101325ffe09ad77f4800f7aa8730 RMD160 (wxGTK-2.8.12-libtool.diff.bz2) = 05b763aa44a8e8c8ad565af2a188d7c6437f2133 @@ -8,7 +8,8 @@ SHA1 (wxGTK-2.8.12.tar.bz2) = a8d31ef924ae49e97690646b13d5a2a7be7dda10 RMD160 (wxGTK-2.8.12.tar.bz2) = c401f141ed9fb085c7b79a2f0db788ce6ae9309f SHA512 (wxGTK-2.8.12.tar.bz2) = 7a28bc9571813c58ff4f67b46d9aa6abf9cdda201da7659f4bbb8ac365fb0653e5abe392222f756a0cf20cb11f5746783bf887b1f3b68b95a7ea388ad8f7c14e Size (wxGTK-2.8.12.tar.bz2) = 9292767 bytes -SHA1 (patch-aa) = ad2fcc73ffe0db67cb9ef5fe87fb1248f7b7675c +SHA1 (patch-aa) = 2c597a180afe1ca8a27cc816197ae9e5598ca99d SHA1 (patch-ab) = 6f6278ec6b92a39abe29ec09053cd7007cd32fef SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c SHA1 (patch-include_wx_debug.h) = bc25a486361194d8d70c69bcd833e085fbcbdec3 +SHA1 (patch-setup.h.in) = 4f798bd013dc008644e3f86be89ecb8bf13aef1d 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 |