svn commit: r555009 - in head/ports-mgmt/octopkg: . files

[Mikael Urankar]

Author: mikael
Date: Fri Nov 13 09:27:22 2020
New Revision: 555009
URL: https://svnweb.freebsd.org/changeset/ports/555009

Log:
  ports-mgmt/octopkg: Update to 0.3.1
  
  Changelog:
    https://github.com/aarnt/octopkg/releases/tag/v0.3.0
    https://github.com/aarnt/octopkg/releases/tag/v0.3.1
  
  PR:		248835
  Approved by:	maintainer timeout

Deleted:
  head/ports-mgmt/octopkg/files/
Modified:
  head/ports-mgmt/octopkg/Makefile
  head/ports-mgmt/octopkg/distinfo

Modified: head/ports-mgmt/octopkg/Makefile
==============================================================================
--- head/ports-mgmt/octopkg/Makefile	Fri Nov 13 07:14:41 2020	(r555008)
+++ head/ports-mgmt/octopkg/Makefile	Fri Nov 13 09:27:22 2020	(r555009)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	octopkg
-PORTVERSION=	0.2.0
-PORTREVISION=	7
+PORTVERSION=	0.3.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	ports-mgmt
 
@@ -13,23 +12,38 @@ COMMENT=	Graphical front-end to the FreeBSD pkg-ng pac
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		qmake compiler:c++11-lib qt:5
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	aarnt
 
-USE_QT=		core concurrent declarative gui network xml widgets concurrent \
+USE_QT=		core concurrent declarative gui linguist network xml widgets \
 		buildtools_build
-USES=		qmake compiler:c++11-lib qt:5
 
-PLIST_FILES=	bin/${PORTNAME} share/pixmaps/octopi_green.png
+PLIST_FILES=	bin/${PORTNAME} \
+		lib/${PORTNAME}/${PORTNAME}-doas \
+		share/applications/${PORTNAME}.desktop
 
-DESKTOP_ENTRIES=	"OctoPkg" "A powerful pkgng front-end" \
-			"${PREFIX}/share/pixmaps/octopi_green.png" \
-			"${PORTNAME}" "System;" false
+post-patch:
+	${REINPLACE_CMD} 's#/usr/lib#${PREFIX}/lib#' \
+		${WRKSRC}/src/strconstants.cpp
+	${REINPLACE_CMD} 's#/usr/local#${PREFIX}#' \
+		${WRKSRC}/src/constants.h \
+		${WRKSRC}/src/main.cpp
 
+do-configure:
+	cd ${WRKSRC} && ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS}
+	cd ${WRKSRC}/doas && ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS}
+
+do-build:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
+	cd ${WRKSRC}/doas && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
+
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/resources/images/octopi_green.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/
+	${INSTALL_PROGRAM} ${WRKSRC}/doas/${PORTNAME}-doas ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \
+		${STAGEDIR}${PREFIX}/share/applications
 
 .include <bsd.port.mk>

Modified: head/ports-mgmt/octopkg/distinfo
==============================================================================
--- head/ports-mgmt/octopkg/distinfo	Fri Nov 13 07:14:41 2020	(r555008)
+++ head/ports-mgmt/octopkg/distinfo	Fri Nov 13 09:27:22 2020	(r555009)
@@ -1,2 +1,3 @@
-SHA256 (aarnt-octopkg-v0.2.0_GH0.tar.gz) = 91da866a033ce767562b271dade024e607e5561e27475c2a6d23f9792e7d3511
-SIZE (aarnt-octopkg-v0.2.0_GH0.tar.gz) = 157609
+TIMESTAMP = 1604135135
+SHA256 (aarnt-octopkg-v0.3.1_GH0.tar.gz) = a3270b7dd39d21130e2c958c9b564ff7875441baafbf21cfec052b1505c5124e
+SIZE (aarnt-octopkg-v0.3.1_GH0.tar.gz) = 350822