Attachment 200992 Details for Bug 234829 – Patch

[patch] Patch

amule.patch (text/plain), 7.60 KB, created by Dmitry Marakasov on 2019-01-10 17:19:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2019-01-10 17:19:21 UTC

Size: 7.60 KB

patch

obsolete

>Index: amule/Makefile
>===================================================================
>--- amule/Makefile	(revision 489869)
>+++ amule/Makefile	(working copy)
>@@ -12,13 +12,14 @@
> COMMENT=	All-platform eMule p2p client
> 
> LICENSE=	GPLv2+
>+LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING
> 
> LIB_DEPENDS=	libcryptopp.so:security/cryptopp
> 
> CONFLICTS=	amule-devel-[0-9]*
> 
>-USES=		bison compiler:c++11-lang desktop-file-utils gmake perl5 \
>-		pkgconfig shebangfix tar:xz
>+USES=		bison compiler:c++11-lang desktop-file-utils gmake \
>+		localbase:ldflags perl5 pkgconfig shebangfix tar:xz
> USE_PERL5=	build
> USE_WX=		2.8
> WX_CONF_ARGS=	absolute
>@@ -28,10 +29,11 @@
> CONFIGURE_ENV=	LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \
> 		docdir='$${prefix}/${DOCSDIR_REL}'
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include
> CXXFLAGS+=	`pkgconf --cflags-only-other libcryptopp`
>-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
>+LDFLAGS+=	-lpthread
> 
>+SHEBANG_FILES=	src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl
>+
> OPTIONS_DEFINE=	ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \
> 	FILEVIEW GEOIP MMAP MONOLITHIC NLS UPNP \
> 	WEBSERVER WXCAS XAS
>@@ -52,10 +54,6 @@
> 
> OPTIONS_SUB=	yes
> 
>-SHEBANG_FILES=	src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl
>-
>-LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING
>-
> DEBUG_CONFIGURE_ON=	--enable-debug
> 
> NLS_USES=	gettext
>@@ -66,6 +64,7 @@
> ALCC_CONFIGURE_ON=	--enable-alcc
> 
> AMULECMD_CONFIGURE_ON=	--enable-amulecmd
>+AMULECMD_USES=		readline
> 
> AMULEDAEMON_CONFIGURE_ON=	--enable-amule-daemon
> AMULEDAEMON_USE=	RC_SUBR=amuled
>@@ -76,6 +75,7 @@
> CAS_LIB_DEPENDS=	libgd.so:graphics/gd
> 
> ED2K_CONFIGURE_OFF=	--disable-ed2k
>+ED2K_CONFLICTS=		ed2k-hash*
> 
> FILEVIEW_CONFIGURE_ON=	--enable-fileview
> 
>@@ -90,6 +90,7 @@
> UPNP_CONFIGURE_OFF=	--disable-upnp
> 
> WEBSERVER_CONFIGURE_ON=	--enable-webserver
>+WEBSERVER_USES=		readline
> 
> WXCAS_CONFIGURE_ON=	--enable-wxcas
> 
>@@ -98,10 +99,6 @@
> 
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MED2K}
>-CONFLICTS+=		ed2k-hash*
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \
> 		-e '/if.*test/s/==/=/' \
>Index: amule/pkg-plist
>===================================================================
>--- amule/pkg-plist	(revision 489869)
>+++ amule/pkg-plist	(working copy)
>@@ -66,17 +66,17 @@
> %%NLS%%%%ED2K%%man/it/man1/ed2k.1.gz
> %%NLS%%%%WXCAS%%man/it/man1/wxcas.1.gz
> %%NLS%%%%XAS%%man/it/man1/xas.1.gz
>-%%ALC%%man/man1/alc.1.gz
>-%%ALCC%%man/man1/alcc.1.gz
>-%%MONOLITHIC%%man/man1/amule.1.gz
>-%%AMULECMD%%man/man1/amulecmd.1.gz
>-%%AMULEDAEMON%%man/man1/amuled.1.gz
>-%%AMULEGUI%%man/man1/amulegui.1.gz
>-%%WEBSERVER%%man/man1/amuleweb.1.gz
>-%%CAS%%man/man1/cas.1.gz
>-%%ED2K%%man/man1/ed2k.1.gz
>-%%WXCAS%%man/man1/wxcas.1.gz
>-%%XAS%%man/man1/xas.1.gz
>+%%NLS%%%%ALC%%man/man1/alc.1.gz
>+%%NLS%%%%ALCC%%man/man1/alcc.1.gz
>+%%NLS%%%%MONOLITHIC%%man/man1/amule.1.gz
>+%%NLS%%%%AMULECMD%%man/man1/amulecmd.1.gz
>+%%NLS%%%%AMULEDAEMON%%man/man1/amuled.1.gz
>+%%NLS%%%%AMULEGUI%%man/man1/amulegui.1.gz
>+%%NLS%%%%WEBSERVER%%man/man1/amuleweb.1.gz
>+%%NLS%%%%CAS%%man/man1/cas.1.gz
>+%%NLS%%%%ED2K%%man/man1/ed2k.1.gz
>+%%NLS%%%%WXCAS%%man/man1/wxcas.1.gz
>+%%NLS%%%%XAS%%man/man1/xas.1.gz
> %%NLS%%%%ALC%%man/ro/man1/alc.1.gz
> %%NLS%%%%ALCC%%man/ro/man1/alcc.1.gz
> %%NLS%%%%MONOLITHIC%%man/ro/man1/amule.1.gz
>Index: amule-devel/Makefile
>===================================================================
>--- amule-devel/Makefile	(revision 489781)
>+++ amule-devel/Makefile	(working copy)
>@@ -12,19 +12,21 @@
> MAINTAINER=	bar@FreeBSD.org
> COMMENT=	All-platform eMule p2p client
> 
>-LICENSE=	GPLv2 GPLv3
>-LICENSE_COMB=	dual
>+LICENSE=	GPLv2+
>+LICENSE_FILE=	${WRKSRC}/docs/COPYING
> 
> LIB_DEPENDS=	libcryptopp.so:security/cryptopp
> 
> CONFLICTS=	amule-[0-9]*
> 
>-USES=		bison desktop-file-utils gmake perl5 pkgconfig shebangfix \
>-		tar:bzip2
>+USES=		bison desktop-file-utils desktop-file-utils gmake \
>+		localbase:ldflags perl5 pkgconfig shebangfix tar:bzip2
> USE_PERL5=	build
> USE_WX=		2.8
> WX_CONF_ARGS=	absolute
> 
>+SHEBANG_FILES=	src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl
>+
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-denoise-level=0
> 
>@@ -31,9 +33,8 @@
> CONFIGURE_ENV=	LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \
> 		docdir='$${prefix}/${DOCSDIR_REL}'
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include
> CXXFLAGS+=	`pkgconf --cflags-only-other libcryptopp`
>-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
>+LDFLAGS+=	-lpthread
> 
> OPTIONS_DEFINE=	ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \
> 	FILEVIEW GEOIP MMAP MONOLITHIC NLS OPTIMIZED_CFLAGS UPNP \
>@@ -55,10 +56,6 @@
> 
> OPTIONS_SUB=	yes
> 
>-SHEBANG_FILES=	src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl
>-
>-LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING
>-
> DEBUG_CONFIGURE_ON=	--enable-debug
> 
> NLS_USES=	gettext
>@@ -69,6 +66,7 @@
> ALCC_CONFIGURE_ON=	--enable-alcc
> 
> AMULECMD_CONFIGURE_ON=	--enable-amulecmd
>+AMULECMD_USES=		readline
> 
> AMULEDAEMON_CONFIGURE_ON=	--enable-amule-daemon
> AMULEDAEMON_USE=	RC_SUBR=amuled
>@@ -79,6 +77,7 @@
> CAS_LIB_DEPENDS=	libgd.so:graphics/gd
> 
> ED2K_CONFIGURE_OFF=	--disable-ed2k
>+ED2K_CONFLICTS=		ed2k-hash*
> 
> FILEVIEW_CONFIGURE_ON=	--enable-fileview
> 
>@@ -94,6 +93,7 @@
> 
> WEBSERVER_CONFIGURE_ON=	--enable-webserver
> WEBSERVER_LIB_DEPENDS=	libpng.so:graphics/png
>+WEBSERVER_USES=		readline
> 
> WXCAS_CONFIGURE_ON=	--enable-wxcas
> 
>@@ -100,28 +100,18 @@
> XAS_CONFIGURE_ON=	--enable-xas
> XAS_USE=	PERL5+=run
> 
>-.include <bsd.port.options.mk>
>+OPTIMIZED_CFLAGS_CONFIGURE_ON=	--enable-optimize
> 
>-.if ${PORT_OPTIONS:MED2K}
>-CONFLICTS+=		ed2k-hash*
>-.endif
>-
>-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
>-CONFIGURE_ARGS+=	--enable-optimize
>-.endif
>-
>-post-patch:	.SILENT
>-	${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \
>+post-patch:
>+	@${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \
> 		-e '/if.*test/s/==/=/' \
> 		${WRKSRC}/configure
>-.if ! ${PORT_OPTIONS:MDOCS}
>-	${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \
>+
>+post-patch-DOCS-off:
>+	@${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \
> 		${WRKSRC}/docs/Makefile.in
>-.endif
> 
>-post-install:
>-.if ${PORT_OPTIONS:MFILEVIEW}
>+post-install-FILEVIEW-on:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${STAGEDIR}${PREFIX}/bin
>-.endif
> 
> .include <bsd.port.mk>
>Index: amule-devel/pkg-descr
>===================================================================
>--- amule-devel/pkg-descr	(revision 489781)
>+++ amule-devel/pkg-descr	(working copy)
>@@ -3,4 +3,4 @@
> aMule is a multiplatform fork of xMule
> client using wxWindows class library.
> 
>-WWW: http://www.amule.org
>+WWW: http://www.amule.org/
>Index: amule-devel/pkg-plist
>===================================================================
>--- amule-devel/pkg-plist	(revision 489781)
>+++ amule-devel/pkg-plist	(working copy)
>@@ -66,17 +66,17 @@
> %%NLS%%%%ED2K%%man/it/man1/ed2k.1.gz
> %%NLS%%%%WXCAS%%man/it/man1/wxcas.1.gz
> %%NLS%%%%XAS%%man/it/man1/xas.1.gz
>-%%ALC%%man/man1/alc.1.gz
>-%%ALCC%%man/man1/alcc.1.gz
>-%%MONOLITHIC%%man/man1/amule.1.gz
>-%%AMULECMD%%man/man1/amulecmd.1.gz
>-%%AMULEDAEMON%%man/man1/amuled.1.gz
>-%%AMULEGUI%%man/man1/amulegui.1.gz
>-%%WEBSERVER%%man/man1/amuleweb.1.gz
>-%%CAS%%man/man1/cas.1.gz
>-%%ED2K%%man/man1/ed2k.1.gz
>-%%WXCAS%%man/man1/wxcas.1.gz
>-%%XAS%%man/man1/xas.1.gz
>+%%NLS%%%%ALC%%man/man1/alc.1.gz
>+%%NLS%%%%ALCC%%man/man1/alcc.1.gz
>+%%NLS%%%%MONOLITHIC%%man/man1/amule.1.gz
>+%%NLS%%%%AMULECMD%%man/man1/amulecmd.1.gz
>+%%NLS%%%%AMULEDAEMON%%man/man1/amuled.1.gz
>+%%NLS%%%%AMULEGUI%%man/man1/amulegui.1.gz
>+%%NLS%%%%WEBSERVER%%man/man1/amuleweb.1.gz
>+%%NLS%%%%CAS%%man/man1/cas.1.gz
>+%%NLS%%%%ED2K%%man/man1/ed2k.1.gz
>+%%NLS%%%%WXCAS%%man/man1/wxcas.1.gz
>+%%NLS%%%%XAS%%man/man1/xas.1.gz
> %%NLS%%%%ALC%%man/ro/man1/alc.1.gz
> %%NLS%%%%ALCC%%man/ro/man1/alcc.1.gz
> %%NLS%%%%MONOLITHIC%%man/ro/man1/amule.1.gz

Actions: View | Diff

Attachments on bug 234829: 200992