Attachment 130801 Details for Bug 174806 – file.diff

[patch] file.diff

file.diff (text/plain), 4.50 KB, created by Marco Bröder on 2012-12-29 13:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Bröder

Created: 2012-12-29 13:10:01 UTC

Size: 4.50 KB

patch

obsolete

>diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
>index 5a54660..eea2a40 100644
>--- a/devel/diffuse/Makefile
>+++ b/devel/diffuse/Makefile
>@@ -1,13 +1,9 @@
>-# Ports collection makefile for:	diffuse
>-# Date created:		2009-02-22
>-# Whom:			Marco Broeder <marco.broeder@gmx.eu>
>-#
>+# Created by: Marco Broeder <marco.broeder@gmx.eu>
> # $FreeBSD: ports/devel/diffuse/Makefile,v 1.18 2012/11/17 05:55:40 svnexp Exp $
>-#
> 
> PORTNAME=	diffuse
> PORTVERSION=	0.4.6
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel python
> MASTER_SITES=	SF
> 
>@@ -19,7 +15,9 @@ LICENSE_COMB=	dual
> 
> NO_BUILD=	yes
> 
>-USE_PYTHON=	yes
>+PORTDOCS=	AUTHORS ChangeLog ChangeLog_ru README README_ru
>+
>+USE_PYTHON=	-2.7
> USE_GNOME=	pygtk2
> USE_BZIP2=	yes
> 
>@@ -27,15 +25,17 @@ MAN1=		diffuse.1
> 
> CONFLICTS=	tinker-[0-9]*
> 
>-NO_OPTIONS_SORT=	yes
>-OPTIONS_DEFINE=	MENU DATA NLS DOCS
>+OPTIONS_DEFINE=	DATA DOCS MENU NLS
> MENU_DESC=	Enable a desktop program menu entry
> DATA_DESC=	Enable syntax highlighting support
>-DOCS_DESC=	Install some documentation text files
>-OPTIONS_DEFAULT=	MENU DATA NLS DOCS
>+OPTIONS_DEFAULT=DATA DOCS MENU NLS
> 
> .include <bsd.port.options.mk>
> 
>+.if ${PORT_OPTIONS:MDATA}
>+PORTDATA=	syntax
>+.endif
>+
> .if ${PORT_OPTIONS:MMENU}
> USE_GNOME+=	desktopfileutils
> PLIST_SUB+=	MENU=""
>@@ -43,13 +43,7 @@ PLIST_SUB+=	MENU=""
> PLIST_SUB+=	MENU="@comment "
> .endif
> 
>-.if ${PORT_OPTIONS:MDATA}
>-PORTDATA=	syntax
>-.endif
>-
>-.if ${PORT_OPTIONS:MNLS} && !defined(WITHOUT_NLS)
>-# Both checks required. If option is selected, but WITHOUT_NLS is set
>-# in make.conf, it breaks pkg-plist.
>+.if ${PORT_OPTIONS:MNLS}
> USE_GETTEXT=	yes
> TRANSLATIONS=	de es it ja ko ru zh_CN
> MANLANG=	"" it ru
>@@ -58,12 +52,8 @@ PLIST_SUB+=	NLS=""
> PLIST_SUB+=	NLS="@comment "
> .endif
> 
>-.if ${PORT_OPTIONS:MDOCS}
>-PORTDOCS=	AUTHORS COPYING ChangeLog ChangeLog_ru README README_ru
>-.endif
>-
> post-patch:
>-.if ${PORT_OPTIONS:MDATA} && !defined(NOPORTDATA)
>+.if ${PORT_OPTIONS:MDATA}
> 	${REINPLACE_CMD} -e 's|../usr|${PREFIX}|g; s|/etc|${PREFIX}/etc|g' \
> 		${WRKSRC}/src/etc/${PORTNAME}rc
> .else
>@@ -76,13 +66,23 @@ post-patch:
> 		${WRKSRC}/src/usr/bin/${PORTNAME}
> 
> do-install:
>-	${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/${PORTNAME} \
>-		${PREFIX}/bin/
>+	${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/${PORTNAME} ${PREFIX}/bin/
> 	${INSTALL_DATA} ${WRKSRC}/src/etc/${PORTNAME}rc ${PREFIX}/etc/
> 	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/*.1 \
> 		${MANPREFIX}/man/man1/
> 
> post-install:
>+.if ${PORT_OPTIONS:MDATA}
>+	${MKDIR} ${DATADIR}/syntax
>+	(cd ${WRKSRC}/src/usr/share/${PORTNAME} && \
>+		${COPYTREE_SHARE} \* ${DATADIR})
>+.endif
>+
>+.if ${PORT_OPTIONS:MDOCS}
>+	${MKDIR} ${DOCSDIR}
>+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
>+.endif
>+
> .if ${PORT_OPTIONS:MMENU}
> 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/${PORTNAME}.png \
> 		${PREFIX}/share/pixmaps/
>@@ -91,30 +91,19 @@ post-install:
> 	${LOCALBASE}/bin/update-desktop-database -q
> .endif
> 
>-.if ${PORT_OPTIONS:MDATA} && !defined(NOPORTDATA)
>-	${MKDIR} ${DATADIR}/syntax
>-	(cd ${WRKSRC}/src/usr/share/${PORTNAME} && \
>-		${COPYTREE_SHARE} \* ${DATADIR})
>-.endif
>-
>-.if ${PORT_OPTIONS:MNLS} && !defined(WITHOUT_NLS)
>-	for x in ${TRANSLATIONS}; do \
>-		${MKDIR} ${WRKSRC}/translations/$${x}; \
>-		${LOCALBASE}/bin/msgfmt -c ${WRKSRC}/translations/$${x}.po \
>-			-o ${WRKSRC}/translations/$${x}/${PORTNAME}.mo; \
>-		${INSTALL_DATA} ${WRKSRC}/translations/$${x}/*.mo \
>-			${PREFIX}/share/locale/$${x}/LC_MESSAGES/; \
>-	done
>-	for y in ${MANLANG}; do \
>-		${MKDIR} ${MANPREFIX}/man/$${y}/man1; \
>-		${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/$${y}/man1/*.1 \
>-			${MANPREFIX}/man/$${y}/man1/; \
>-	done
>-.endif
>-
>-.if ${PORT_OPTIONS:MDOCS} && !defined(NOPORTDOCS)
>-	${MKDIR} ${DOCSDIR}
>-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
>+.if ${PORT_OPTIONS:MNLS}
>+.for x in ${TRANSLATIONS}
>+	${MKDIR} ${WRKSRC}/translations/${x}
>+	${LOCALBASE}/bin/msgfmt -c ${WRKSRC}/translations/${x}.po \
>+		-o ${WRKSRC}/translations/${x}/${PORTNAME}.mo
>+	${INSTALL_DATA} ${WRKSRC}/translations/${x}/*.mo \
>+		${PREFIX}/share/locale/${x}/LC_MESSAGES/
>+.endfor
>+.for y in ${MANLANG}
>+	${MKDIR} ${MANPREFIX}/man/${y}/man1
>+	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/${y}/man1/*.1 \
>+		${MANPREFIX}/man/${y}/man1/
>+.endfor
> .endif
> 
> .include <bsd.port.mk>
>diff --git a/devel/diffuse/pkg-descr b/devel/diffuse/pkg-descr
>index b64dd26..1c9f0e9 100644
>--- a/devel/diffuse/pkg-descr
>+++ b/devel/diffuse/pkg-descr
>@@ -16,4 +16,4 @@ Some key features of Diffuse:
> - unlimited undo
> - easy keyboard navigation
> 
>-WWW:    http://diffuse.sourceforge.net/
>+WWW: http://diffuse.sourceforge.net/

Actions: View | Diff

Attachments on bug 174806: 130801 | 130802