Attachment 199683 Details for Bug 233662 – djvulibre adoption patch

[patch] djvulibre adoption patch

djvulibre.diff (text/plain), 3.94 KB, created by Lorenzo Salvadore on 2018-11-30 11:58:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lorenzo Salvadore

Created: 2018-11-30 11:58:37 UTC

Size: 3.94 KB

patch

obsolete

>diff -Nru /usr/local/poudriere/ports/official/graphics/djvulibre/Makefile /usr/local/poudriere/ports/experimental/graphics/djvulibre/Makefile
>--- /usr/local/poudriere/ports/official/graphics/djvulibre/Makefile	2016-06-27 23:30:34.000000000 +0200
>+++ /usr/local/poudriere/ports/experimental/graphics/djvulibre/Makefile	2018-11-30 12:28:11.761040000 +0100
>@@ -1,4 +1,3 @@
>-# Created by: Mikhail Teterin <mi@aldan.algebra.com>
> # $FreeBSD: head/graphics/djvulibre/Makefile 417685 2016-06-27 21:30:34Z rene $
> 
> PORTNAME=	djvulibre
>@@ -7,7 +6,7 @@
> CATEGORIES=	graphics www
> MASTER_SITES=	SF/djvu/DjVuLibre/${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	phascolarctos@protonmail.ch
> COMMENT=	DjVu base libraries and utilities
> 
> LICENSE=	GPLv2+
>@@ -15,20 +14,22 @@
> 
> LIB_DEPENDS=	libtiff.so:graphics/tiff
> 
>+USES=		cpe gmake iconv jpeg libtool
>+USE_LDCONFIG=	yes
>+
>+CPE_VENDOR=	djvulibre_project
>+CONFLICTS=	djvulibre-nox11-3*
>+
>+PORTDOCS=	*.djvu *.pdf *.txt
>+
> INSTALL_TARGET=	install-strip
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
>+CONFIGURE_WITH=	pkgconfigdir="${LOCALBASE}/libdata/pkgconfig"
> CONFIGURE_ENV=	JPEG_CFLAGS="-I${LOCALBASE}/include" \
> 		JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \
> 		TIFF_CFLAGS="-I${LOCALBASE}/include" \
> 		TIFF_LIBS="-L${LOCALBASE}/lib -ltiff"
>-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
>-USES=		cpe gmake iconv jpeg libtool
>-CPE_VENDOR=	djvulibre_project
>-USE_LDCONFIG=	yes
>-CONFLICTS=	djvulibre-nox11-3*
>-
>-PORTDOCS=	*.djvu *.pdf *.txt
>+LDFLAGS+=	-L${LOCALBASE}/lib
> 
> OPTIONS_DEFINE=		DESKTOPFILES DOCS ANY2DJVU
> OPTIONS_DEFAULT=	DESKTOPFILES
>diff -Nru /usr/local/poudriere/ports/official/graphics/djvulibre/pkg-plist /usr/local/poudriere/ports/experimental/graphics/djvulibre/pkg-plist
>--- /usr/local/poudriere/ports/official/graphics/djvulibre/pkg-plist	2016-06-14 19:41:06.000000000 +0200
>+++ /usr/local/poudriere/ports/experimental/graphics/djvulibre/pkg-plist	2018-11-30 00:14:03.899690000 +0100
>@@ -1,4 +1,18 @@
> %%ANY2DJVU%%bin/any2djvu
>+%%ANY2DJVU%%man/man1/any2djvu.1.gz
>+%%DESKTOPFILES%%share/icons/hicolor/128x128/mimetypes/djvu.png
>+%%DESKTOPFILES%%share/icons/hicolor/16x16/mimetypes/djvu.png
>+%%DESKTOPFILES%%share/icons/hicolor/20x20/mimetypes/djvu.png
>+%%DESKTOPFILES%%share/icons/hicolor/22x22/mimetypes/djvu.png
>+%%DESKTOPFILES%%share/icons/hicolor/24x24/mimetypes/djvu.png
>+%%DESKTOPFILES%%share/icons/hicolor/256x256/mimetypes/djvu.png
>+%%DESKTOPFILES%%share/icons/hicolor/32x32/mimetypes/djvu.png
>+%%DESKTOPFILES%%share/icons/hicolor/48x48/mimetypes/djvu.png
>+%%DESKTOPFILES%%share/icons/hicolor/64x64/mimetypes/djvu.png
>+%%DESKTOPFILES%%share/icons/hicolor/72x72/mimetypes/djvu.png
>+%%DESKTOPFILES%%share/icons/hicolor/96x96/mimetypes/djvu.png
>+%%DESKTOPFILES%%share/icons/hicolor/scalable/mimetypes/djvu.svgz
>+%%DESKTOPFILES%%share/mime/packages/djvulibre-mime.xml
> bin/bzz
> bin/c44
> bin/cjb2
>@@ -23,7 +37,6 @@
> lib/libdjvulibre.so.21
> lib/libdjvulibre.so.21.6.0
> libdata/pkgconfig/ddjvuapi.pc
>-%%ANY2DJVU%%man/man1/any2djvu.1.gz
> man/man1/bzz.1.gz
> man/man1/c44.1.gz
> man/man1/cjb2.1.gz
>@@ -60,16 +73,3 @@
> share/djvu/pubtext/DjVuMessages.dtd
> share/djvu/pubtext/DjVuOCR.dtd
> share/djvu/pubtext/DjVuXML-s.dtd
>-%%DESKTOPFILES%%share/icons/hicolor/16x16/mimetypes/djvu.png
>-%%DESKTOPFILES%%share/icons/hicolor/20x20/mimetypes/djvu.png
>-%%DESKTOPFILES%%share/icons/hicolor/22x22/mimetypes/djvu.png
>-%%DESKTOPFILES%%share/icons/hicolor/24x24/mimetypes/djvu.png
>-%%DESKTOPFILES%%share/icons/hicolor/32x32/mimetypes/djvu.png
>-%%DESKTOPFILES%%share/icons/hicolor/48x48/mimetypes/djvu.png
>-%%DESKTOPFILES%%share/icons/hicolor/64x64/mimetypes/djvu.png
>-%%DESKTOPFILES%%share/icons/hicolor/72x72/mimetypes/djvu.png
>-%%DESKTOPFILES%%share/icons/hicolor/96x96/mimetypes/djvu.png
>-%%DESKTOPFILES%%share/icons/hicolor/128x128/mimetypes/djvu.png
>-%%DESKTOPFILES%%share/icons/hicolor/256x256/mimetypes/djvu.png
>-%%DESKTOPFILES%%share/icons/hicolor/scalable/mimetypes/djvu.svgz
>-%%DESKTOPFILES%%share/mime/packages/djvulibre-mime.xml

Flags:

salvadore: maintainer-approval+

Actions: View | Diff

Attachments on bug 233662: 199683 | 199684 | 199715 | 199791 | 200189