diff options
| author | dbj <dbj@pkgsrc.org> | 2016-02-16 03:40:44 +0000 |
|---|---|---|
| committer | dbj <dbj@pkgsrc.org> | 2016-02-16 03:40:44 +0000 |
| commit | 86507f1d7f07ace227fd60e64a89900e73e4c513 (patch) | |
| tree | d9b3b093aa9beb1f11296a2656ad01963d74842a /x11 | |
| parent | af1610a0f866bff293ac63ec8b38c9f31685a6ef (diff) | |
| download | pkgsrc-86507f1d7f07ace227fd60e64a89900e73e4c513.tar.gz | |
remove symlinks for wx-config and wxrc in ${PREFIX}/bin
this avoids conflicts with wxGTK28 and
is the rest of the fix for PR pkg/50389
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/wxGTK30/Makefile | 6 | ||||
| -rw-r--r-- | x11/wxGTK30/PLIST | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/x11/wxGTK30/Makefile b/x11/wxGTK30/Makefile index b3129428be8..b364df1abf1 100644 --- a/x11/wxGTK30/Makefile +++ b/x11/wxGTK30/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2016/01/19 04:19:15 dbj Exp $ +# $NetBSD: Makefile,v 1.13 2016/02/16 03:40:44 dbj Exp $ VERSION= 3.0.2 -PKGREVISION= 3 +PKGREVISION= 4 DISTNAME= wxWidgets-${VERSION} PKGNAME= wxGTK30-${VERSION} CATEGORIES= x11 @@ -85,9 +85,7 @@ post-install: ${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 ${LN} -sf ../libexec/wx-3.0/wx-config ${DESTDIR}${PREFIX}/bin/wx-config-3.0 .include "../../graphics/MesaLib/buildlink3.mk" diff --git a/x11/wxGTK30/PLIST b/x11/wxGTK30/PLIST index 06c5d4eaf95..991b7aec7ea 100644 --- a/x11/wxGTK30/PLIST +++ b/x11/wxGTK30/PLIST @@ -1,7 +1,5 @@ -@comment $NetBSD: PLIST,v 1.7 2016/01/19 04:19:15 dbj Exp $ -bin/wx-config +@comment $NetBSD: PLIST,v 1.8 2016/02/16 03:40:44 dbj Exp $ bin/wx-config-3.0 -bin/wxrc bin/wxrc-3.0 include/wx-3.0/wx/aboutdlg.h include/wx-3.0/wx/accel.h |