Attachment 218797 Details for Bug 246328 – nicotine-v10.diff

[patch] nicotine-v10.diff

nicotine-v10.diff (text/plain), 3.42 KB, created by Daniel Menelkir on 2020-10-16 12:29:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Menelkir

Created: 2020-10-16 12:29:51 UTC

Size: 3.42 KB

patch

obsolete

>Index: net-p2p/nicotine-plus/Makefile
>===================================================================
>--- net-p2p/nicotine-plus/Makefile	(revision 317828)
>+++ net-p2p/nicotine-plus/Makefile	(working copy)
>@@ -1,68 +1,27 @@
>-# Created by: Adam Weinberger <adamw@FreeBSD.org>
> # $FreeBSD$
> 
>-PORTNAME=	plus
>-PORTVERSION=	1.2.16
>+PORTNAME=	nicotine-plus
>+PORTVERSION=	2.1.2
> CATEGORIES=	net-p2p
>-MASTER_SITES=	SF/nicotine-${PORTNAME}/nicotine-${PORTNAME}/${PORTVERSION}
>-PKGNAMEPREFIX=	nicotine-
>-DISTNAME=	${PKGNAMEPREFIX:S/-/+/}-${PORTVERSION}
> 
>-MAINTAINER=	acm@FreeBSD.org
>-COMMENT=	A fork of nicotine soulseek client
>+MAINTAINER=	menelkir@itroll.org
>+COMMENT=	Soulseek client
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb
>+LICENSE=	GPLv3
>+LICENSE_FILE=   ${WRKSRC}/COPYING
> 
>-CONFLICTS=	nicotine-[0-9]*
>-BROKEN=		does not build
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}gobject3>0:devel/py-gobject3@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}miniupnpc>0:net/py-miniupnpc@${PY_FLAVOR}
> 
>-USE_BZIP2=		yes
>-USE_GNOME=		pygtk2
>-USE_PYTHON=		yes
>-USE_PYDISTUTILS=	yes
>-USES=		gettext
>-PYDISTUTILS_PKGNAME=	nicotine
>+USES=           python:3.7+ gnome
> 
>-DOCSDIR=	share/doc/${PKGNAMEPREFIX:S/-//}
>-DATADIR=	share/${PKGNAMEPREFIX:S/-//}
>-MAN1=		nicotine-import-winconfig.1 nicotine.1
>+USE_GITHUB=	yes
>+GH_ACCOUNT=     Nicotine-Plus
>+GH_PROJECT=     ${PORTNAME}
>+GH_TAGNAME=     ${PORTVERSION}
> 
>-OPTIONS_DEFINE=	GEOIP PSYCO MUTAGEN LIBSEXY MINIUPNPC DOCS
>-OPTIONS_DEFINE_i386=	PSYCO
>-OPTIONS_DEFAULT=	GEOIP PSYCO MUTAGEN LIBSEXY MINIUPNPC
>-GEOIP_DESC=	Enable the GeoIP based country code blocker
>-PSYCO_DESC=	Enable Psyco, the optimizing Python compiler
>-MUTAGEN_DESC=	Enable Mutagen for audio metadata support
>-LIBSEXY_DESC=	Enable libsexy support
>-MINIUPNPC_DESC=	Enable upnp support
>+USE_GNOME=      gtk30
>+USE_PYTHON=     distutils
> 
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MGEOIP}
>-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/GeoIP.so:${PORTSDIR}/net/py-GeoIP
>-.endif
>-.if ${PORT_OPTIONS:MPSYCO}
>-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
>-.endif
>-.if ${PORT_OPTIONS:MMUTAGEN}
>-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
>-.endif
>-.if ${PORT_OPTIONS:MLIBSEXY}
>-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/sexy.so:${PORTSDIR}/x11-toolkits/py-sexy
>-.endif
>-.if ${PORT_OPTIONS:MMINIUPNPC}
>-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/miniupnpc.so:${PORTSDIR}/net/py-miniupnpc
>-.endif
>-
>-post-extract:
>-	@${MV} ${WRKSRC}/${PKGNAMEPREFIX:S/-//}.py ${WRKSRC}/${PKGNAMEPREFIX:S/-//}
>-
>-post-patch:
>-.if ! ${PORT_OPTIONS:MDOCS}
>-	@${REINPLACE_CMD} -i "" -e 's|^doc_files.*|doc_files = ""|g' ${WRKSRC}/setup.py
>-.endif
>-	@${REINPLACE_CMD} -e \
>-		"s|sys\.prefix|\"${PREFIX}\"|g" -e \
>-			"s|nicotine.py|nicotine|g" ${WRKSRC}/setup.py
>-
> .include <bsd.port.mk>
>Index: net-p2p/nicotine-plus/distinfo
>===================================================================
>--- net-p2p/nicotine-plus/distinfo	(revision 317828)
>+++ net-p2p/nicotine-plus/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (nicotine+-1.2.16.tar.bz2) = 71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d
>-SIZE (nicotine+-1.2.16.tar.bz2) = 3892006
>+TIMESTAMP = 1602851221
>+SHA256 (Nicotine-Plus-nicotine-plus-2.1.2_GH0.tar.gz) = 3ed18ade97183c632836eb8e304a515fc19a35babb46cc6e6747bcfd8205dcdf
>+SIZE (Nicotine-Plus-nicotine-plus-2.1.2_GH0.tar.gz) = 5091941

Actions: View | Diff

Attachments on bug 246328: 214308 | 214614 | 214894 | 215303 | 215318 | 215528 | 216913 | 216917 | 216948 | 218797 | 221812 | 223242 | 223361 | 223376 | 226066 | 226081 | 226101 | 226103 | 226658 | 227017