Attachment 140548 Details for Bug 187171 – file.diff

[patch] file.diff

file.diff (text/plain), 3.23 KB, created by Marco Bröder on 2014-03-01 11:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Bröder

Created: 2014-03-01 11:10:00 UTC

Size: 3.23 KB

patch

obsolete

>diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
>index 72e1c25..b952fc7 100644
>--- a/devel/diffuse/Makefile
>+++ b/devel/diffuse/Makefile
>@@ -1,4 +1,4 @@
>-# Created by: Marco Broeder <marco.broeder@gmx.eu>
>+# Created by: Marco Broeder <marco.broeder@posteo.eu>
> # $FreeBSD: head/devel/diffuse/Makefile 330307 2013-10-14 12:00:22Z wg $
> 
> PORTNAME=	diffuse
>@@ -6,7 +6,7 @@ PORTVERSION=	0.4.7
> CATEGORIES=	devel python
> MASTER_SITES=	SF
> 
>-MAINTAINER=	marco.broeder@gmx.eu
>+MAINTAINER=	marco.broeder@posteo.eu
> COMMENT=	Graphical N-way diff and merge tool written in python
> 
> LICENSE=	GPLv2 GPLv3
>@@ -20,28 +20,26 @@ USE_GNOME=	pygtk2
> 
> CONFLICTS=	tinker-[0-9]*
> 
>+PORTDATA=	syntax
> PORTDOCS=	AUTHORS ChangeLog ChangeLog_ru README README_ru
> 
> OPTIONS_DEFINE=	DATA DOCS MENU NLS
> DATA_DESC=	Enable syntax highlighting support
> MENU_DESC=	Enable a desktop program menu entry
>-OPTIONS_DEFAULT=DATA DOCS MENU NLS
>+OPTIONS_DEFAULT=DATA MENU
> OPTIONS_SUB=	yes
> MENU_USES=	desktop-file-utils
> NLS_USES=	gettext
> 
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MDATA}
>-PORTDATA=	syntax
>-.endif
>-
>-.if ${PORT_OPTIONS:MNLS}
> TRANSLATIONS=	cs de es it ja ko pl ru zh_CN
> MANUALS=	cs it ru
>-.endif
>+
>+.include <bsd.port.options.mk>
> 
> post-patch:
>+	${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|g; \
>+		s|../../etc|${PREFIX}/etc|g' ${WRKSRC}/src/usr/bin/${PORTNAME}
>+
> .if ${PORT_OPTIONS:MDATA}
> 	${REINPLACE_CMD} -e 's|../usr|${PREFIX}|g; s|/etc|${PREFIX}/etc|g' \
> 		${WRKSRC}/src/etc/${PORTNAME}rc
>@@ -50,35 +48,25 @@ post-patch:
> 		import ${PREFIX}|g; s|/etc|${PREFIX}/etc|g' \
> 		${WRKSRC}/src/etc/${PORTNAME}rc
> .endif
>-	${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|g; \
>-		s|../../etc|${PREFIX}/etc|g' ${WRKSRC}/src/usr/bin/${PORTNAME}
> 
> do-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/${PORTNAME} \
> 		${STAGEDIR}${PREFIX}/bin/
> 	${INSTALL_DATA} ${WRKSRC}/src/etc/${PORTNAME}rc \
> 		${STAGEDIR}${PREFIX}/etc/
>-	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/*.1 \
>-		${STAGEDIR}${MANPREFIX}/man/man1/
> 
>-.if ${PORT_OPTIONS:MDATA}
>-	@${MKDIR} ${STAGEDIR}${DATADIR}/${PORTDATA}
>+	@${MKDIR} ${STAGEDIR}${DATADIR}
> 	(cd ${WRKSRC}/src/usr/share/${PORTNAME} && \
> 		${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/)
>-.endif
> 
>-.if ${PORT_OPTIONS:MDOCS}
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/)
>-.endif
> 
>-.if ${PORT_OPTIONS:MMENU}
>-	${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/${PORTNAME}.png \
>-		${STAGEDIR}${PREFIX}/share/pixmaps/
> 	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
> 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/applications/*.desktop \
> 		${STAGEDIR}${DESKTOPDIR}/
>-.endif
>+	${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/${PORTNAME}.png \
>+		${STAGEDIR}${PREFIX}/share/pixmaps/
> 
> .if ${PORT_OPTIONS:MNLS}
> .for x in ${TRANSLATIONS}
>@@ -88,11 +76,15 @@ do-install:
> 	${INSTALL_DATA} ${WRKSRC}/translations/${x}/*.mo \
> 		${STAGEDIR}${PREFIX}/share/locale/${x}/LC_MESSAGES/
> .endfor
>+.endif
>+
> .for y in ${MANUALS}
> 	@${MKDIR} ${STAGEDIR}${MANPREFIX}/man/${y}/man1
> 	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/${y}/man1/*.1 \
> 		${STAGEDIR}${MANPREFIX}/man/${y}/man1/
> .endfor
>-.endif
>+
>+	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/*.1 \
>+		${STAGEDIR}${MANPREFIX}/man/man1/
> 
> .include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 187171: 140548