pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/45670: Please, pull up emulators/yabause to latest stable
The following reply was made to PR pkg/45670; it has been noted by GNATS.
From: diro%nixsyspaus.org@localhost
To: gnats-bugs%NetBSD.org@localhost
Cc:
Subject: Re: pkg/45670: Please, pull up emulators/yabause to latest stable
Date: Tue, 29 Nov 2011 16:15:02 -0500
On Tue, Nov 29, 2011 at 09:05:07PM +0000, Thomas Klausner wrote:
>
> No, since it's hardcoded:
> ./src/gtk/CMakeLists.txt:install(FILES "doc/yabause.1" DESTINATION
> "share/man/man1" RENAME "${YAB_PORT_NAME}.1")
> ./src/qt/CMakeLists.txt:install(FILES "doc/yabause.1" DESTINATION
> "share/man/man1" RENAME "${YAB_PORT_NAME}.1")
>
> If you want to avoid a patch, use the SUBST framework to replace
> 'share/man' with '${PKGMANDIR}'.
Thanks. I recently came to the same conclusion after viewing those files and
also from CMake's IRC channel. The Yabause team have been notified of the
issue and will be fixing that- to use ${PKGMANDIR} or ${MANDIR}, if set- in
the next release. Here's the final diff of the Makefile:
# diff Makefile Makefile.new
3,4c3
< DISTNAME= yabause-0.9.10
< PKGREVISION= 5
---
> DISTNAME= yabause-0.9.11
15,16c14
< GNU_CONFIGURE= yes
< USE_TOOLS+= gmake
---
> USE_CMAKE= yes
17a16
> USE_LANGUAGES+= c c++
18a18,26
> SUBST_CLASSES+= pkgmandir
> SUBST_STAGE.pkgmandir= pre-configure
> SUBST_FILES.pkgmandir= src/gtk/CMakeLists.txt
> src/qt/CMakeLists.txt
> SUBST_SED.pkgmandir= -e "s,share/man,${PKGMANDIR},"
> SUBST_MESSAGE.pkgmandir= Fixing hardcoded manual paths.
>
> .include "options.mk"
>
> .include "../../graphics/glut/buildlink3.mk"
20,21d27
< BUILDLINK_API_DEPENDS.gtkglext+= gtkglext>=1.2.0nb4
< .include "../../graphics/gtkglext/buildlink3.mk"
and options.mk:
# $NetBSD$
PKG_OPTIONS_VAR= PKG_OPTIONS.yabause
PKG_SUPPORTED_OPTIONS= doxygen gtk openal qt
PKG_SUGGESTED_OPTIONS= gtk
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdoxygen)
BUILD_DEPENDS+= doxygen>=1.6.3:../../devel/doxygen
.endif
.if !empty(PKG_OPTIONS:Mgtk)
CONFIGURE_ENV+= YAB_PORTS=gtk
CMAKE_ARGS+= -DYAB_PORTS=gtk
CMAKE_ARGS+=
-DGTK2_GDKCONFIG_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.gtk2}/lib/gtk-2.0/include
CMAKE_ARGS+=
-DGTK2_GLIB_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include/glib/glib-2.0
CMAKE_ARGS+=
-DGTK2_GLIBCONFIG_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/lib/glib-2.0/include
BUILDLINK_API_DEPENDS.gtkglext+= gtkglext>=1.2.0nb4
.include "../../graphics/gtkglext/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mopenal)
.include "../../audio/openal/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mqt)
CONFIGURE_ENV+= YAB_PORTS=qt
CMAKE_ARGS+= -DYAB_PORTS=qt
.include "../../x11/qt4-tools/buildlink3.mk"
.endif
Tested the gtk port with and without the openal option. I don't have the
disk space to build qt4-tools and test the QT4 port, nor the hardware/software
to test the Windows, Dreamcast or Wii ports. If someone could test at least
the QT4 port, that would be great.
Home |
Main Index |
Thread Index |
Old Index