Attachment #133831 for bug #178371

View | Details | Raw Unified | Return to bug 178371
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	mupdf
PORTVERSION=	1.2
PORTEPOCH=	1
CATEGORIES=	graphics
MASTER_SITES=	GOOGLE_CODE \
		http://www.mupdf.com/download/
EXTRACT_SUFX=	-source.zip

MAINTAINER=	lichray@gmail.com
COMMENT=	Lightweight PDF viewer and toolkit

LICENSE=	AGPLv3

LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
		jpeg:${PORTSDIR}/graphics/jpeg \

		openjpeg:${PORTSDIR}/graphics/openjpeg

USE_GMAKE=	yes
MAKE_ARGS+=	build=release prefix=${PREFIX} verbose=1 mandir=${PREFIX}/man \
		XCFLAGS=-I${LOCALBASE}/include
USES=		pkgconfig
USE_XORG=	x11 xext
MAN1=		mupdf.1 mutool.1 mudraw.1

MAKE_JOBS_SAFE=	yes
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-source

OPTIONS_DEFINE=	SCROLL JS
OPTIONS_DEFAULT=SCROLL

SCROLL_DESC=	Build with scroll hacks
JS_DESC=	JavaScript support (V8 engine)

.include <bsd.port.options.mk>


EXTRA_PATCHES+=	${FILESDIR}/scroll_hack-apps_pdfapp.c
.endif

.if ${PORT_OPTIONS:MJS}
LIB_DEPENDS+=	v8:${PORTSDIR}/lang/v8
MAKE_ARGS+=	V8_PRESENT=1 V8LIBS=-lv8
.endif

post-patch:	.SILENT
	${REINPLACE_CMD} \
		-e '/install:/,/^$$/ { /-d/d; }' \

	${REINPLACE_CMD} -e 's/-pipe -O2 //' \
		-e 's|/usr/local|${LOCALBASE}|' \
		${WRKSRC}/Makerules
	${RM} -r ${WRKSRC}/thirdparty/*

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (mupdf-1.1-source.tar.gz) = e54666bbe1d9f0a5464349bfbeffcf676c4a0fcad3efb89eba1f20d4ac991f34	1	SHA256 (mupdf-1.2-source.zip) = 9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b
2	SIZE (mupdf-1.1-source.tar.gz) = 4281735	2	SIZE (mupdf-1.2-source.zip) = 13808821




--- Makefile.orig	2013-02-13 09:25:07.000000000 -0500
+++ Makefile	2013-05-06 13:00:30.619173583 -0400
@@ -12,19 +12,13 @@ default: all
 # Do not specify CFLAGS or LIBS on the make invocation line - specify
 # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
 # set a variable that was set on the command line.
-CFLAGS += $(XCFLAGS) -Ifitz -Ipdf -Ixps -Icbz -Iscripts
-LIBS += $(XLIBS) -lfreetype -ljbig2dec -ljpeg -lopenjpeg -lz -lm
+CFLAGS += -Ifitz -Ipdf -Ixps -Icbz -Iscripts $(XCFLAGS)
+LIBS += -lfreetype -ljbig2dec -ljpeg -lopenjpeg -lz -lm $(XLIBS)
 LIBS_V8 = $(LIBS) $(V8LIBS)
 
 include Makerules
 include Makethird
 
-THIRD_LIBS := $(FREETYPE_LIB)
-THIRD_LIBS += $(JBIG2DEC_LIB)
-THIRD_LIBS += $(JPEG_LIB)
-THIRD_LIBS += $(OPENJPEG_LIB)
-THIRD_LIBS += $(ZLIB_LIB)
-
 ifeq "$(verbose)" ""
 QUIET_AR = @ echo ' ' ' ' AR $@ ;
 QUIET_CC = @ echo ' ' ' ' CC $@ ;
@@ -169,14 +163,15 @@ $(MUTOOL) : $(addprefix $(OUT)/, pdfclea
 
 ifeq "$(NOX11)" ""
 MUVIEW := $(OUT)/mupdf
+ifeq "$(V8_PRESENT)" "1"
+$(MUVIEW) : $(FITZ_V8_LIB) $(THIRD_LIBS)
+$(MUVIEW) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
+	$(LINK_V8_CMD) $(X11_LIBS)
+else
 $(MUVIEW) : $(FITZ_LIB) $(THIRD_LIBS)
 $(MUVIEW) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
 	$(LINK_CMD) $(X11_LIBS)
-
-MUVIEW_V8 := $(OUT)/mupdf-v8
-$(MUVIEW_V8) : $(FITZ_V8_LIB) $(THIRD_LIBS)
-$(MUVIEW_V8) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
-	$(LINK_V8_CMD) $(X11_LIBS)
+endif
 endif
 
 MUJSTEST_V8 := $(OUT)/mujstest-v8
@@ -184,12 +179,6 @@ $(MUJSTEST_V8) : $(FITZ_V8_LIB) $(THIRD_
 $(MUJSTEST_V8) : $(addprefix $(OUT)/, jstest_main.o pdfapp.o)
 	$(LINK_V8_CMD)
 
-ifeq "$(V8_PRESENT)" "1"
-JSTARGETS := $(MUJSTEST_V8) $(FITZ_V8_LIB) $(MUVIEW_V8)
-else
-JSTARGETS :=
-endif
-
 # --- Format man pages ---
 
 %.txt: %.1
@@ -212,7 +201,7 @@ install: $(FITZ_LIB) $(MUVIEW) $(MUDRAW)
 	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(incdir) $(DESTDIR)$(mandir)/man1
 	install $(FITZ_LIB) $(DESTDIR)$(libdir)
 	install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(DESTDIR)$(incdir)
-	install $(MUVIEW) $(MUDRAW) $(MUBUSY) $(DESTDIR)$(bindir)
+	install $(MUVIEW) $(MUDRAW) $(MUTOOL) $(DESTDIR)$(bindir)
 	install $(wildcard apps/man/*.1) $(DESTDIR)$(mandir)/man1
 
 # --- Clean and Default ---




--- apps/pdfapp.c.orig	2013-02-26 12:07:15.000000000 -0500
+++ apps/pdfapp.c	2013-05-06 11:13:27.210765076 -0400
@@ -1142,11 +1142,15 @@ void pdfapp_onkey(pdfapp_t *app, int c)
 		break;
 
 	case 'j':
+ 		if (app->pany + fz_pixmap_height(app->ctx, app->image) <= app->winh)
+ 			goto pagedown;
 		app->pany -= fz_pixmap_height(app->ctx, app->image) / 10;
 		pdfapp_showpage(app, 0, 0, 1, 0);
 		break;
 
 	case 'k':
+ 		if (app->pany >= 0)
+ 			goto pageup;
 		app->pany += fz_pixmap_height(app->ctx, app->image) / 10;
 		pdfapp_showpage(app, 0, 0, 1, 0);
 		break;
@@ -1214,6 +1218,7 @@ void pdfapp_onkey(pdfapp_t *app, int c)
 	 */
 
 	case ',':

 		panto = PAN_TO_BOTTOM;
 		if (app->numberlen > 0)
 			app->pageno -= atoi(app->number);
@@ -1222,6 +1227,7 @@ void pdfapp_onkey(pdfapp_t *app, int c)
 		break;
 
 	case '.':

 		panto = PAN_TO_TOP;
 		if (app->numberlen > 0)
 			app->pageno += atoi(app->number);
@@ -1523,6 +1529,12 @@ void pdfapp_onmouse(pdfapp_t *app, int x
 				int isx = (modifiers & (1<<0));
 				int xstep = isx ? 20 * dir : 0;
 				int ystep = !isx ? 20 * dir : 0;

Lines 1-6 Link Here

(-)pkg-plist (-1 / +1 lines)
1	bin/mubusy
2	bin/mupdf	1	bin/mupdf
3	bin/mudraw	2	bin/mudraw
		3	bin/mutool
4	include/fitz.h	4	include/fitz.h
5	include/memento.h	5	include/memento.h
6	include/mucbz.h	6	include/mucbz.h

Return to bug 178371

Lines 2-18 Link Here

(-)Makefile (-6 / +14 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mupdf	4	PORTNAME= mupdf
5	PORTVERSION= 1.1	5	PORTVERSION= 1.2
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= GOOGLE_CODE \	8	MASTER_SITES= GOOGLE_CODE \
9	http://www.mupdf.com/download/	9	http://www.mupdf.com/download/
10	EXTRACT_SUFX= -source.tar.gz	10	EXTRACT_SUFX= -source.zip
11		11
12	MAINTAINER= lichray@gmail.com	12	MAINTAINER= lichray@gmail.com
13	COMMENT= Lightweight PDF viewer and toolkit	13	COMMENT= Lightweight PDF viewer and toolkit
14		14
15	LICENSE= GPLv3	15	LICENSE= AGPLv3
16		16
17	LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \	17	LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \
18	jpeg:${PORTSDIR}/graphics/jpeg \	18	jpeg:${PORTSDIR}/graphics/jpeg \
Lines 20-37 Link Here
20	openjpeg:${PORTSDIR}/graphics/openjpeg	20	openjpeg:${PORTSDIR}/graphics/openjpeg
21		21
22	USE_GMAKE= yes	22	USE_GMAKE= yes
23	MAKE_ARGS+= build=release prefix=${PREFIX} verbose=1 mandir=${PREFIX}/man	23	MAKE_ARGS+= build=release prefix=${PREFIX} verbose=1 mandir=${PREFIX}/man \
		24	XCFLAGS=-I${LOCALBASE}/include
24	USES= pkgconfig	25	USES= pkgconfig
25	USE_XORG= x11 xext	26	USE_XORG= x11 xext
26	MAN1= mupdf.1 mubusy.1 mudraw.1	27	MAN1= mupdf.1 mutool.1 mudraw.1
27		28
28	MAKE_JOBS_SAFE= yes	29	MAKE_JOBS_SAFE= yes
29	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source	30	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source
30		31
31	OPTIONS_DEFINE= SCROLL	32	OPTIONS_DEFINE= SCROLL JS
32	OPTIONS_DEFAULT=SCROLL	33	OPTIONS_DEFAULT=SCROLL
33		34
34	SCROLL_DESC= Build with scroll hacks	35	SCROLL_DESC= Build with scroll hacks
		36	JS_DESC= JavaScript support (V8 engine)
35		37
36	.include <bsd.port.options.mk>	38	.include <bsd.port.options.mk>
37		39
Lines 45-50 Link Here
45	EXTRA_PATCHES+= ${FILESDIR}/scroll_hack-apps_pdfapp.c	47	EXTRA_PATCHES+= ${FILESDIR}/scroll_hack-apps_pdfapp.c
46	.endif	48	.endif
47		49
		50	.if ${PORT_OPTIONS:MJS}
		51	LIB_DEPENDS+= v8:${PORTSDIR}/lang/v8
		52	MAKE_ARGS+= V8_PRESENT=1 V8LIBS=-lv8
		53	.endif
		54
48	post-patch: .SILENT	55	post-patch: .SILENT
49	${REINPLACE_CMD} \	56	${REINPLACE_CMD} \
50	-e '/install:/,/^$$/ { /-d/d; }' \	57	-e '/install:/,/^$$/ { /-d/d; }' \
Lines 56-60 Link Here
56	${REINPLACE_CMD} -e 's/-pipe -O2 //' \	63	${REINPLACE_CMD} -e 's/-pipe -O2 //' \
57	-e 's\|/usr/local\|${LOCALBASE}\|' \	64	-e 's\|/usr/local\|${LOCALBASE}\|' \
58	${WRKSRC}/Makerules	65	${WRKSRC}/Makerules
		66	${RM} -r ${WRKSRC}/thirdparty/*
59		67
60	.include <bsd.port.mk>	68	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-Makefile (+67 lines)
		1	--- Makefile.orig 2013-02-13 09:25:07.000000000 -0500
		2	+++ Makefile 2013-05-06 13:00:30.619173583 -0400
		3	@@ -12,19 +12,13 @@ default: all
		4	# Do not specify CFLAGS or LIBS on the make invocation line - specify
		5	# XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
		6	# set a variable that was set on the command line.
		7	-CFLAGS += $(XCFLAGS) -Ifitz -Ipdf -Ixps -Icbz -Iscripts
		8	-LIBS += $(XLIBS) -lfreetype -ljbig2dec -ljpeg -lopenjpeg -lz -lm
		9	+CFLAGS += -Ifitz -Ipdf -Ixps -Icbz -Iscripts $(XCFLAGS)
		10	+LIBS += -lfreetype -ljbig2dec -ljpeg -lopenjpeg -lz -lm $(XLIBS)
		11	LIBS_V8 = $(LIBS) $(V8LIBS)
		12
		13	include Makerules
		14	include Makethird
		15
		16	-THIRD_LIBS := $(FREETYPE_LIB)
		17	-THIRD_LIBS += $(JBIG2DEC_LIB)
		18	-THIRD_LIBS += $(JPEG_LIB)
		19	-THIRD_LIBS += $(OPENJPEG_LIB)
		20	-THIRD_LIBS += $(ZLIB_LIB)
		21	-
		22	ifeq "$(verbose)" ""
		23	QUIET_AR = @ echo ' ' ' ' AR $@ ;
		24	QUIET_CC = @ echo ' ' ' ' CC $@ ;
		25	@@ -169,14 +163,15 @@ $(MUTOOL) : $(addprefix $(OUT)/, pdfclea
		26
		27	ifeq "$(NOX11)" ""
		28	MUVIEW := $(OUT)/mupdf
		29	+ifeq "$(V8_PRESENT)" "1"
		30	+$(MUVIEW) : $(FITZ_V8_LIB) $(THIRD_LIBS)
		31	+$(MUVIEW) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
		32	+ $(LINK_V8_CMD) $(X11_LIBS)
		33	+else
		34	$(MUVIEW) : $(FITZ_LIB) $(THIRD_LIBS)
		35	$(MUVIEW) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
		36	$(LINK_CMD) $(X11_LIBS)
		37	-
		38	-MUVIEW_V8 := $(OUT)/mupdf-v8
		39	-$(MUVIEW_V8) : $(FITZ_V8_LIB) $(THIRD_LIBS)
		40	-$(MUVIEW_V8) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
		41	- $(LINK_V8_CMD) $(X11_LIBS)
		42	+endif
		43	endif
		44
		45	MUJSTEST_V8 := $(OUT)/mujstest-v8
		46	@@ -184,12 +179,6 @@ $(MUJSTEST_V8) : $(FITZ_V8_LIB) $(THIRD_
		47	$(MUJSTEST_V8) : $(addprefix $(OUT)/, jstest_main.o pdfapp.o)
		48	$(LINK_V8_CMD)
		49
		50	-ifeq "$(V8_PRESENT)" "1"
		51	-JSTARGETS := $(MUJSTEST_V8) $(FITZ_V8_LIB) $(MUVIEW_V8)
		52	-else
		53	-JSTARGETS :=
		54	-endif
		55	-
		56	# --- Format man pages ---
		57
		58	%.txt: %.1
		59	@@ -212,7 +201,7 @@ install: $(FITZ_LIB) $(MUVIEW) $(MUDRAW)
		60	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(incdir) $(DESTDIR)$(mandir)/man1
		61	install $(FITZ_LIB) $(DESTDIR)$(libdir)
		62	install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(DESTDIR)$(incdir)
		63	- install $(MUVIEW) $(MUDRAW) $(MUBUSY) $(DESTDIR)$(bindir)
		64	+ install $(MUVIEW) $(MUDRAW) $(MUTOOL) $(DESTDIR)$(bindir)
65	install $(wildcard apps/man/*.1) $(DESTDIR)$(mandir)/man1
66
67	# --- Clean and Default ---

Lines 1-22 Link Here

(-)files/scroll_hack-apps_pdfapp.c (-8 / +8 lines)
1	--- apps/pdfapp.c.orig 2012-03-29 05:46:53.000000000 -0500	1	--- apps/pdfapp.c.orig 2013-02-26 12:07:15.000000000 -0500
2	+++ apps/pdfapp.c 2012-04-07 16:43:55.030462608 -0500	2	+++ apps/pdfapp.c 2013-05-06 11:13:27.210765076 -0400
3	@@ -774,11 +774,15 @@ void pdfapp_onkey(pdfapp_t *app, int c)	3	@@ -1142,11 +1142,15 @@ void pdfapp_onkey(pdfapp_t *app, int c)
4	break;	4	break;
5		5
6	case 'j':	6	case 'j':
7	+ if (app->pany + fz_pixmap_height(app->ctx, app->image) <= app->winh)	7	+ if (app->pany + fz_pixmap_height(app->ctx, app->image) <= app->winh)
8	+ goto pagedown;	8	+ goto pagedown;
9	app->pany -= fz_pixmap_height(app->ctx, app->image) / 10;	9	app->pany -= fz_pixmap_height(app->ctx, app->image) / 10;
10	pdfapp_showpage(app, 0, 0, 1);	10	pdfapp_showpage(app, 0, 0, 1, 0);
11	break;	11	break;
12		12
13	case 'k':	13	case 'k':
14	+ if (app->pany >= 0)	14	+ if (app->pany >= 0)
15	+ goto pageup;	15	+ goto pageup;
16	app->pany += fz_pixmap_height(app->ctx, app->image) / 10;	16	app->pany += fz_pixmap_height(app->ctx, app->image) / 10;
17	pdfapp_showpage(app, 0, 0, 1);	17	pdfapp_showpage(app, 0, 0, 1, 0);
18	break;	18	break;
19	@@ -842,6 +846,7 @@ void pdfapp_onkey(pdfapp_t *app, int c)	19	@@ -1214,6 +1218,7 @@ void pdfapp_onkey(pdfapp_t *app, int c)
20	*/	20	*/
21		21
22	case ',':	22	case ',':
Lines 24-30 Link Here
24	panto = PAN_TO_BOTTOM;	24	panto = PAN_TO_BOTTOM;
25	if (app->numberlen > 0)	25	if (app->numberlen > 0)
26	app->pageno -= atoi(app->number);	26	app->pageno -= atoi(app->number);
27	@@ -850,6 +855,7 @@ void pdfapp_onkey(pdfapp_t *app, int c)	27	@@ -1222,6 +1227,7 @@ void pdfapp_onkey(pdfapp_t *app, int c)
28	break;	28	break;
29		29
30	case '.':	30	case '.':
Lines 32-38 Link Here
32	panto = PAN_TO_TOP;	32	panto = PAN_TO_TOP;
33	if (app->numberlen > 0)	33	if (app->numberlen > 0)
34	app->pageno += atoi(app->number);	34	app->pageno += atoi(app->number);
35	@@ -1039,6 +1045,12 @@ void pdfapp_onmouse(pdfapp_t *app, int x	35	@@ -1523,6 +1529,12 @@ void pdfapp_onmouse(pdfapp_t *app, int x
36	int isx = (modifiers & (1<<0));	36	int isx = (modifiers & (1<<0));
37	int xstep = isx ? 20 * dir : 0;	37	int xstep = isx ? 20 * dir : 0;
38	int ystep = !isx ? 20 * dir : 0;	38	int ystep = !isx ? 20 * dir : 0;