On 2020/06/09 20:21, Marc Espie wrote:
> On Tue, Jun 09, 2020 at 07:52:53PM +0200, Rafael Sadowski wrote:
> > On Tue Jun 09, 2020 at 11:35:12AM -0600, Antoine Jacoutot wrote:
> > > CVSROOT: /cvs
> > > Module name: ports
> > > Changes by: [email protected] 2020/06/09 11:35:12
> > >
> > > Modified files:
> > > x11/qt5/qtwebkit: Makefile
> > >
> > > Log message:
> > > Unbreak PKGNAME.
> >
> > What was the problem? The EPOCH bump was intended and well tested.
Packaging failed.
> No, you can't do that.
>
> The only mechanism to do EPOCH bumps is through... EPOCH
>
> Rolling your own by embedding v0 in the PKGNAME is entirely unsupported
> and *will* break various things.
>
> Specifically, revision gets added in the wrong location, and pkg_create(1)
> rightfully protests, which is cool, because it would be much more annoying
> to fix later.
>
This would probably be better, there's no need to pull in the actual
version number via variables through the tree.
Untested but I think it's right.
Index: meta/qt5/Makefile
===================================================================
RCS file: /cvs/ports/meta/qt5/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- meta/qt5/Makefile 5 Apr 2020 15:43:05 -0000 1.12
+++ meta/qt5/Makefile 9 Jun 2020 18:27:08 -0000
@@ -6,7 +6,7 @@ COMMENT-examples = examples for Qt5, met
PKGNAME = qt5-${MODQT5_VERSION}
PKGNAME-main = ${PKGNAME}
PKGNAME-examples = qt5-examples-${MODQT5_VERSION}
-REVISION-main = 0
+REVISION-main = 1
MULTI_PACKAGES = -main -examples
@@ -44,7 +44,7 @@ RUN_DEPENDS-main = \
x11/qt5/qttranslations=${MODQT5_VERSION} \
x11/qt5/qtvirtualkeyboard,-main=${MODQT5_VERSION} \
x11/qt5/qtwebchannel,-main=${MODQT5_VERSION} \
- x11/qt5/qtwebkit=${MODQT5_WEBKIT_VERSION} \
+ x11/qt5/qtwebkit \
x11/qt5/qtwebsockets,-main=${MODQT5_VERSION} \
x11/qt5/qtx11extras=${MODQT5_VERSION} \
x11/qt5/qtxmlpatterns,-main=${MODQT5_VERSION} \
Index: x11/qt5/Makefile.version
===================================================================
RCS file: /cvs/ports/x11/qt5/Makefile.version,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile.version
--- x11/qt5/Makefile.version 16 May 2020 09:53:09 -0000 1.12
+++ x11/qt5/Makefile.version 9 Jun 2020 18:27:08 -0000
@@ -3,7 +3,6 @@
QT5_VERSION = 5.13.2
QT5_DIST_VERSION = 5.13.2
-QT5_WEBKIT_VERSION = 5.212.0alpha4v0
# This one is used for building dependencies for examples and documentation,
# which obviously should be in sync with core packages.
Index: x11/qt5/qt5.port.mk
===================================================================
RCS file: /cvs/ports/x11/qt5/qt5.port.mk,v
retrieving revision 1.26
diff -u -p -r1.26 qt5.port.mk
--- x11/qt5/qt5.port.mk 22 May 2020 07:33:47 -0000 1.26
+++ x11/qt5/qt5.port.mk 9 Jun 2020 18:27:08 -0000
@@ -139,7 +139,6 @@ SUBST_VARS += MODQT5_COMMENT
.include "Makefile.version"
MODQT5_VERSION = ${QT5_VERSION}
-MODQT5_WEBKIT_VERSION = ${QT5_WEBKIT_VERSION}
MODQT_VERSION ?= ${MODQT5_VERSION}
_MODQT5_PKGMATCH !=
Index: x11/qt5/docs/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/docs/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- x11/qt5/docs/Makefile 16 May 2020 09:43:44 -0000 1.12
+++ x11/qt5/docs/Makefile 9 Jun 2020 18:27:08 -0000
@@ -38,7 +38,6 @@ DOC_COMPONENTS = \
qtx11extras \
qtxmlpatterns
-MASTER_SITES0 =
https://download.qt.io/community_releases/${DIST_VERSION:R}/${QT5_WEBKIT_VERSION}-final/
DISTFILES =
${DOC_COMPONENTS:C/$/-everywhere-src-${QT5_DIST_VERSION}${EXTRACT_SUFX}/}
MODQT5_USE_CXX11 = No
Index: x11/qt5/qttools/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/qttools/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- x11/qt5/qttools/Makefile 5 Apr 2020 15:43:05 -0000 1.12
+++ x11/qt5/qttools/Makefile 9 Jun 2020 18:27:09 -0000
@@ -4,7 +4,7 @@ QT5NAME = QtTools
COMMENT-main = Qt development tools
COMMENT-webview = Webkit-based Qt Designer plugin
PKGNAME-webview = qwebview-${VERSION}
-REVISON-webview = 0
+REVISION-webview = 0
DPB_PROPERTIES = parallel
@@ -34,7 +34,7 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
LIB_DEPENDS-webview = ${LIB_DEPENDS} \
${BUILD_PKGPATH}>=${QT5_VERSION},<${QT5_NEXT_VERSION} \
- x11/qt5/qtwebkit>=${QT5_WEBKIT_VERSION}
+ x11/qt5/qtwebkit
FLAVORS = debug
PSEUDO_FLAVORS = bootstrap no_examples no_webview
Index: x11/qt5/qtwebkit/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- x11/qt5/qtwebkit/Makefile 9 Jun 2020 17:35:12 -0000 1.24
+++ x11/qt5/qtwebkit/Makefile 9 Jun 2020 18:27:09 -0000
@@ -8,8 +8,11 @@ CATEGORIES = www
DPB_PROPERTIES = parallel
-DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION:C/alpha4v0/-alpha4/}
-PKGNAME = qtwebkit-${QT5_WEBKIT_VERSION:S/v0//}
+VERSION = 5.212.0alpha4
+DISTNAME = qtwebkit-${VERSION:C/alpha/-alpha/}
+PKGNAME = qtwebkit-${VERSION}
+PKGSPEC = qtwebkit->=${VERSION}v0
+
EPOCH= 0
REVISION = 0
