Simple diff to remove -qt(4) multi-packages. The diff does not include
the devel/quirks bits.

Feedback, PLIST feedback? OK?

Rafael Sadowski

Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/gambatte/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile    17 Oct 2019 13:29:53 -0000      1.23
+++ Makefile    23 Aug 2020 19:43:51 -0000
@@ -1,19 +1,14 @@
 # $OpenBSD: Makefile,v 1.23 2019/10/17 13:29:53 cwen Exp $
 
-COMMENT-main =         highly accurate Game Boy Color emulator
-COMMENT-qt =           highly accurate Game Boy Color emulator with GUI
+COMMENT =              highly accurate Game Boy Color emulator
 
 REV =                  571
 V =                    0.5.0.${REV}
 DISTNAME =             gambatte_src-r${REV}
-PKGNAME-main =         gambatte-$V
-PKGNAME-qt =           gambatte-qt-$V
-REVISION-main =                4
-REVISION-qt =          4
+PKGNAME=               gambatte-$V
+REVISION=              5
 
-MULTI_PACKAGES =       -main -qt
-
-.include <bsd.port.arch.mk>
+#.include <bsd.port.arch.mk>
 
 CATEGORIES =           emulators
 
@@ -24,26 +19,25 @@ MAINTAINER =                Anthony J. Bentley <anthon
 # GPLv2 only
 PERMIT_PACKAGE =       Yes
 
-cWANTLIB =     c m pthread ${COMPILER_LIBCXX} z
-WANTLIB-main +=        ${cWANTLIB} SDL
-WANTLIB-qt +=  ${cWANTLIB} GL QtCore QtGui QtOpenGL X11 Xext Xrandr Xv 
ossaudio usbhid Xi
-WANTLIB-qt +=  ICE SM Xinerama Xrender fontconfig freetype
+WANTLIB += ${COMPILER_LIBCXX} SDL c m
 
 COMPILER =             base-clang ports-gcc base-gcc
 
 MASTER_SITES =         ${MASTER_SITE_SOURCEFORGE:=gambatte/}
 
-MODULES =              devel/qmake lang/python x11/qt4
-MODQMAKE_PROJECTS =    gambatte_qt
+MODULES =              lang/python
+
 SEPARATE_BUILD =       No
-CONFIGURE_STYLE =      qmake specific          # avoid qmake.port.mk add 
do-build
 
-LIB_DEPENDS-main =     ${MODGCC4_CPPLIBDEP} \
+LIB_DEPENDS =          ${MODGCC4_CPPLIBDEP} \
                        devel/sdl
 
 TEST_DEPENDS =         graphics/png
 
 MAKE_FILE =            ${FILESDIR}/Makefile
+
+CONFIGURE_STYLE =      none
+
 CONFIGURE_ARGS =       CC="${CC}" \
                        CXX="${CXX}" \
                        LINK="${CXX}" \
@@ -58,13 +52,9 @@ MAKE_FLAGS =         CC="${CC}" \
                        CXXFLAGS="${CXXFLAGS} -DHAVE_STDINT_H" \
                        PYTHON="${MODPY_BIN}"
 
-post-build:
-       ${MODQMAKE_build}
-
 do-install:
-       ${INSTALL_DATA} ${FILESDIR}/gambatte_sdl.6 \
-               ${FILESDIR}/gambatte_qt.6 ${PREFIX}/man/man6
-       ${INSTALL_PROGRAM} ${WRKDIST}/gambatte_sdl/gambatte_sdl \
-               ${WRKDIST}/gambatte_qt/bin/gambatte_qt ${PREFIX}/bin
+       ${INSTALL_DATA} ${FILESDIR}/gambatte_sdl.6 ${PREFIX}/man/man6
+       ${INSTALL_PROGRAM} ${WRKDIST}/gambatte_sdl/gambatte_sdl ${PREFIX}/bin
+
 
 .include <bsd.port.mk>
Index: pkg/DESCR
===================================================================
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR   23 Aug 2020 19:43:51 -0000
@@ -0,0 +1,3 @@
+Gambatte is an accuracy-focused, cross-platform Game Boy Color emulator.
+It is based on hundreds of corner case hardware tests, as well as
+previous documentation and reverse engineering efforts.
Index: pkg/DESCR-main
===================================================================
RCS file: pkg/DESCR-main
diff -N pkg/DESCR-main
--- pkg/DESCR-main      22 Dec 2015 04:20:22 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-Gambatte is an accuracy-focused, cross-platform Game Boy Color emulator.
-It is based on hundreds of corner case hardware tests, as well as
-previous documentation and reverse engineering efforts.
Index: pkg/DESCR-qt
===================================================================
RCS file: pkg/DESCR-qt
diff -N pkg/DESCR-qt
--- pkg/DESCR-qt        22 Dec 2015 04:20:22 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-Gambatte is an accuracy-focused, cross-platform Game Boy Color emulator.
-It is based on hundreds of corner case hardware tests, as well as
-previous documentation and reverse engineering efforts.
Index: pkg/PLIST
===================================================================
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST   23 Aug 2020 19:43:51 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD: PLIST,v$
+@pkgpath emulators/gambatte,-main
+@conflict gambatte-<=0.5.0.571p4
+@conflict gambatte-qt-<=0.5.0.571p4
+@bin bin/gambatte_sdl
+@man man/man6/gambatte_sdl.6
Index: pkg/PLIST-main
===================================================================
RCS file: pkg/PLIST-main
diff -N pkg/PLIST-main
--- pkg/PLIST-main      22 Dec 2015 04:20:22 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2015/12/22 04:20:22 bentley Exp $
-@bin bin/gambatte_sdl
-@man man/man6/gambatte_sdl.6
Index: pkg/PLIST-qt
===================================================================
RCS file: pkg/PLIST-qt
diff -N pkg/PLIST-qt
--- pkg/PLIST-qt        22 Dec 2015 04:20:22 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-qt,v 1.1 2015/12/22 04:20:22 bentley Exp $
-@bin bin/gambatte_qt
-@man man/man6/gambatte_qt.6

Reply via email to