From e3822fffe2b748b2cec87d058358b6bc957b67d7 Mon Sep 17 00:00:00 2001 From: joerg Date: Wed, 15 Sep 2010 13:15:29 +0000 Subject: Update to mupdf-0.7. No changelog, but this moves to external dependencies on the pkgsrc side. --- print/mupdf/Makefile | 35 +++----- print/mupdf/PLIST | 14 ++-- print/mupdf/distinfo | 11 +-- print/mupdf/files/mupdf.pc | 2 +- print/mupdf/patches/patch-aa | 29 ------- print/mupdf/patches/patch-ab | 44 ++++++++++ print/mupdf/patches/patch-ac | 196 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 266 insertions(+), 65 deletions(-) delete mode 100644 print/mupdf/patches/patch-aa create mode 100644 print/mupdf/patches/patch-ab create mode 100644 print/mupdf/patches/patch-ac (limited to 'print/mupdf') diff --git a/print/mupdf/Makefile b/print/mupdf/Makefile index 7321aa003d8..2bd619a7bb5 100644 --- a/print/mupdf/Makefile +++ b/print/mupdf/Makefile @@ -1,47 +1,36 @@ -# $NetBSD: Makefile,v 1.3 2010/03/15 12:03:19 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2010/09/15 13:15:29 joerg Exp $ # -DISTNAME= mupdf-r940 -PKGNAME= ${DISTNAME:S/-r/-0.0./} +DISTNAME= mupdf-0.7 CATEGORIES= print -MASTER_SITES= http://ccxvii.net/mupdf/download/ +MASTER_SITES= http://ccxvii.net/mupdf/download/ \ + http://ccxvii.net/mupdf/download/archive/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ccxvii.net/mupdf/ COMMENT= Lightweight PDF viewer and toolkit LICENSE= gnu-gpl-v3 -BUILD_DEPENDS+= jam-[0-9]*:../../devel/jam - PKG_DESTDIR_SUPPORT= user-destdir -USE_TOOLS+= pkg-config +USE_TOOLS+= pkg-config gmake -WRKSRC= ${WRKDIR}/mupdf -MAKE_ENV+= OS=pkgsrc -MAKE_ENV+= FT=${BUILDLINK_PREFIX.freetype2} +USE_LIBTOOL= yes -INSTALLATION_DIRS+= bin include lib/pkgconfig share/doc/mupdf +INSTALLATION_DIRS+= bin include lib/pkgconfig +INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} -do-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} jam '-sBUILD=release' +post-build: sed -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/build/*/mupdf ${DESTDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/fitz/fitz.h ${DESTDIR}${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/fitz/fitz_base.h ${DESTDIR}${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/fitz/fitz_draw.h ${DESTDIR}${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/fitz/fitz_stream.h ${DESTDIR}${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/fitz/fitz_tree.h ${DESTDIR}${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/mupdf/mupdf.h ${DESTDIR}${PREFIX}/include - ${INSTALL_LIB} ${WRKSRC}/build/*/libmupdf.a ${DESTDIR}${PREFIX}/lib +post-install: ${INSTALL_DATA} ${WRKSRC}/mupdf.pc ${DESTDIR}${PREFIX}/lib/pkgconfig - ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mupdf .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/jbig2dec/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.include "../../graphics/openjpeg/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/mupdf/PLIST b/print/mupdf/PLIST index e14f8d0149b..2064f45e82c 100644 --- a/print/mupdf/PLIST +++ b/print/mupdf/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/18 10:07:32 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2010/09/15 13:15:29 joerg Exp $ bin/mupdf +bin/pdfclean +bin/pdfdraw +bin/pdfextract +bin/mupdf-pdfinfo +bin/pdfshow include/fitz.h -include/fitz_base.h -include/fitz_draw.h -include/fitz_stream.h -include/fitz_tree.h include/mupdf.h -lib/libmupdf.a +lib/libmupdf.la lib/pkgconfig/mupdf.pc -share/doc/mupdf/README diff --git a/print/mupdf/distinfo b/print/mupdf/distinfo index 9d9fa66ca05..135d5e90666 100644 --- a/print/mupdf/distinfo +++ b/print/mupdf/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2010/03/15 12:03:19 wiz Exp $ +$NetBSD: distinfo,v 1.3 2010/09/15 13:15:29 joerg Exp $ -SHA1 (mupdf-r940.tar.gz) = d3b293e5b5465d2f775d27d7bd6d607c1fbdd890 -RMD160 (mupdf-r940.tar.gz) = 872d495ff4cce1286b032cd2e867fe979e5391c1 -Size (mupdf-r940.tar.gz) = 3611853 bytes -SHA1 (patch-aa) = aa576dfe6591271101ca63cf3cb05c4a1eb90b79 +SHA1 (mupdf-0.7.tar.gz) = 3e97cefa9a65b770cc1be7584d6a5da9dc064d84 +RMD160 (mupdf-0.7.tar.gz) = 82723652fb967be7665cfc55f4b2bb7c3ff55b69 +Size (mupdf-0.7.tar.gz) = 3557621 bytes +SHA1 (patch-ab) = ab4f0f5518dcc8e76ef2578f8c539b94e95d4f0a +SHA1 (patch-ac) = 2c2b4a64b486e0b628e1a097c71f8e011daf85f5 diff --git a/print/mupdf/files/mupdf.pc b/print/mupdf/files/mupdf.pc index 1214ef6ba1a..573483243a2 100644 --- a/print/mupdf/files/mupdf.pc +++ b/print/mupdf/files/mupdf.pc @@ -5,6 +5,6 @@ includedir=${prefix}/include Name: mupdf Description: library for PDF files -Version: 0.0.937 +Version: 0.7 Libs: -Wl,-R${libdir} -L${libdir} -lmupdf Cflags: -I${includedir} diff --git a/print/mupdf/patches/patch-aa b/print/mupdf/patches/patch-aa deleted file mode 100644 index ff2413f852b..00000000000 --- a/print/mupdf/patches/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2010/02/18 10:07:32 wiz Exp $ - ---- Jamrules.orig 2010-01-21 00:27:14.000000000 +0000 -+++ Jamrules -@@ -73,6 +73,24 @@ if $(OS) = LINUX - if $(HAVE_OPENJPEG) { LINKLIBS += -lopenjpeg ; } - } - -+if $(OS) = pkgsrc -+{ -+ Echo Building for pkgsrc ; -+ -+ BUILD_X11APP = true ; -+ -+ CCFLAGS = -Wall -std=gnu99 -I${FT}/include/freetype2 -I${PREFIX}/include ; -+ LINKFLAGS = -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib ; -+ LINKLIBS = -lfreetype -ljpeg -lz -lm ; -+ APPLINKLIBS = -lX11 -lXext -lpthread ; -+ -+ if $(BUILD) = debug { OPTIM = -g -O0 -fno-inline ; } -+ if $(BUILD) = release { OPTIM = -O3 ; } -+ -+ if $(HAVE_JBIG2DEC) { LINKLIBS += -ljbig2dec ; } -+ if $(HAVE_OPENJPEG) { LINKLIBS += -lopenjpeg ; } -+} -+ - if $(OS) = MACOSX - { - Echo Building for MACOSX ; diff --git a/print/mupdf/patches/patch-ab b/print/mupdf/patches/patch-ab new file mode 100644 index 00000000000..e2a2c775be5 --- /dev/null +++ b/print/mupdf/patches/patch-ab @@ -0,0 +1,44 @@ +$NetBSD: patch-ab,v 1.1 2010/09/15 13:15:29 joerg Exp $ + +--- Makerules.orig 2010-08-25 14:12:08.000000000 +0000 ++++ Makerules +@@ -19,39 +19,6 @@ ifeq "$(build)" "native" + CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -march=native -mfpmath=sse + endif + +-ifeq "$(OS)" "Linux" + SYS_FREETYPE_INC := `pkg-config --cflags freetype2` + X11LIBS := -lX11 -lXext + PDFVIEW_EXE = $(X11VIEW_EXE) +-endif +- +-ifeq "$(OS)" "FreeBSD" +-SYS_FREETYPE_INC := `pkg-config --cflags freetype2` +-LDFLAGS += -L/usr/local/lib +-X11LIBS := -lX11 -lXext +-PDFVIEW_EXE = $(X11VIEW_EXE) +-endif +- +-# Mac OS X build depends on some thirdparty libs +-ifeq "$(OS)" "Darwin" +-SYS_FREETYPE_INC := -I/usr/X11R6/include/freetype2 +-CFLAGS += -I/usr/X11R6/include +-LDFLAGS += -L/usr/X11R6/lib +-X11LIBS := -lX11 -lXext +-PDFVIEW_EXE = $(X11VIEW_EXE) +-ifeq "$(arch)" "amd64" +-CFLAGS += -m64 +-LDFLAGS += -m64 +-else +-CFLAGS += -m32 +-LDFLAGS += -m32 +-endif +-endif +- +-# MinGW build depends on thirdparty libs +-ifeq "$(OS)" "MINGW" +-WINDRES ?= windres +-W32LIBS := -lgdi32 -lcomdlg32 -luser32 -ladvapi32 -lshell32 -mwindows +-PDFVIEW_EXE = $(WINVIEW_EXE) +-endif +- diff --git a/print/mupdf/patches/patch-ac b/print/mupdf/patches/patch-ac new file mode 100644 index 00000000000..f42e6d1581d --- /dev/null +++ b/print/mupdf/patches/patch-ac @@ -0,0 +1,196 @@ +$NetBSD: patch-ac,v 1.1 2010/09/15 13:15:29 joerg Exp $ + +--- Makefile.orig 2010-08-25 14:12:08.000000000 +0000 ++++ Makefile +@@ -41,32 +41,21 @@ CFLAGS += $(THIRD_INCS) $(SYS_FREETYPE_I + # Build commands + # + +-ifneq "$(verbose)" "" +- + GENFILE_CMD = $(firstword $^) $@ $(wordlist 2, 999, $^) + CC_CMD = $(CC) -o $@ -c $< $(CFLAGS) +-LD_CMD = $(CC) -o $@ $^ $(LDFLAGS) $(LIBS) +-AR_CMD = rm -f $@ && $(AR) cru $@ $^ +- +-else +- +-GENFILE_CMD = @ echo GENFILE $@ && $(firstword $^) $@ $(wordlist 2, 999, $^) +-CC_CMD = @ echo CC $@ && $(CC) -o $@ -c $< $(CFLAGS) +-LD_CMD = @ echo LD $@ && $(CC) -o $@ $^ $(LDFLAGS) $(LIBS) +-AR_CMD = @ echo AR $@ && rm -f $@ && $(AR) cru $@ $^ +- +-endif ++LD_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS) ++AR_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^ + + # + # Code generation tools + # + + FONTDUMP_EXE := $(OBJDIR)/fontdump +-$(FONTDUMP_EXE): $(OBJDIR)/fontdump.o ++$(FONTDUMP_EXE): $(OBJDIR)/fontdump.lo + $(LD_CMD) + + CMAPDUMP_EXE := $(OBJDIR)/cmapdump +-$(CMAPDUMP_EXE): $(OBJDIR)/cmapdump.o ++$(CMAPDUMP_EXE): $(OBJDIR)/cmapdump.lo + $(LD_CMD) + + # +@@ -112,7 +101,7 @@ FITZ_SRC := \ + fitz/stm_buffer.c \ + fitz/stm_open.c \ + fitz/stm_read.c +-FITZ_OBJ := $(FITZ_SRC:fitz/%.c=$(OBJDIR)/%.o) ++FITZ_OBJ := $(FITZ_SRC:fitz/%.c=$(OBJDIR)/%.lo) + $(FITZ_OBJ): $(FITZ_HDR) + + DRAW_SRC := $(DRAW_ARCH_SRC) \ +@@ -128,8 +117,8 @@ DRAW_SRC := $(DRAW_ARCH_SRC) \ + draw/pathscan.c \ + draw/pathstroke.c \ + draw/porterduff.c +-DRAW_OBJ := $(DRAW_SRC:draw/%.c=$(OBJDIR)/%.o) +-DRAW_OBJ := $(DRAW_OBJ:draw/%.s=$(OBJDIR)/%.o) ++DRAW_OBJ := $(DRAW_SRC:draw/%.c=$(OBJDIR)/%.lo) ++DRAW_OBJ := $(DRAW_OBJ:draw/%.s=$(OBJDIR)/%.lo) + $(DRAW_OBJ): $(FITZ_HDR) + + MUPDF_HDR := $(FITZ_HDR) mupdf/mupdf.h +@@ -166,19 +155,19 @@ MUPDF_SRC := \ + mupdf/pdf_unicode.c \ + mupdf/pdf_xobject.c \ + mupdf/pdf_xref.c +-MUPDF_OBJ := $(MUPDF_SRC:mupdf/%.c=$(OBJDIR)/%.o) ++MUPDF_OBJ := $(MUPDF_SRC:mupdf/%.c=$(OBJDIR)/%.lo) + $(MUPDF_OBJ): $(MUPDF_HDR) + +-$(OBJDIR)/%.o: fitz/%.c +- $(CC_CMD) +-$(OBJDIR)/%.o: draw/%.c +- $(CC_CMD) +-$(OBJDIR)/%.o: draw/%.s +- $(CC_CMD) +-$(OBJDIR)/%.o: mupdf/%.c +- $(CC_CMD) +-$(OBJDIR)/%.o: $(GENDIR)/%.c +- $(CC_CMD) ++$(OBJDIR)/%.lo: fitz/%.c ++ libtool --mode=compile $(CC_CMD) ++$(OBJDIR)/%.lo: draw/%.c ++ libtool --mode=compile $(CC_CMD) ++$(OBJDIR)/%.lo: draw/%.s ++ libtool --mode=compile $(CC_CMD) ++$(OBJDIR)/%.lo: mupdf/%.c ++ libtool --mode=compile $(CC_CMD) ++$(OBJDIR)/%.lo: $(GENDIR)/%.c ++ libtool --mode=compile $(CC_CMD) + + # + # Generated font file dumps +@@ -217,7 +206,7 @@ FONT_SRC := \ + $(GENDIR)/font_base14.c \ + $(GENDIR)/font_cjk.c + +-FONT_OBJ := $(FONT_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.o) ++FONT_OBJ := $(FONT_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.lo) + + + # +@@ -287,13 +276,13 @@ CMAP_SRC := \ + $(GENDIR)/cmap_japan.c \ + $(GENDIR)/cmap_korea.c + +-CMAP_OBJ := $(CMAP_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.o) ++CMAP_OBJ := $(CMAP_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.lo) + + # + # Library + # + +-MUPDF_LIB = $(OBJDIR)/libmupdf.a ++MUPDF_LIB = $(OBJDIR)/libmupdf.la + $(MUPDF_LIB): $(FITZ_OBJ) $(DRAW_OBJ) $(MUPDF_OBJ) $(CMAP_OBJ) $(FONT_OBJ) + $(AR_CMD) + +@@ -303,40 +292,40 @@ $(MUPDF_LIB): $(FITZ_OBJ) $(DRAW_OBJ) $( + + APPS = $(PDFSHOW_EXE) $(PDFCLEAN_EXE) $(PDFDRAW_EXE) $(PDFEXTRACT_EXE) $(PDFINFO_EXE) $(PDFVIEW_EXE) + +-$(OBJDIR)/%.o: apps/%.c +- $(CC_CMD) ++$(OBJDIR)/%.lo: apps/%.c ++ libtool --mode=compile $(CC_CMD) + + PDFSHOW_SRC=apps/pdfshow.c +-PDFSHOW_OBJ=$(PDFSHOW_SRC:apps/%.c=$(OBJDIR)/%.o) ++PDFSHOW_OBJ=$(PDFSHOW_SRC:apps/%.c=$(OBJDIR)/%.lo) + PDFSHOW_EXE=$(OBJDIR)/pdfshow + $(PDFSHOW_OBJ): $(MUPDF_HDR) + $(PDFSHOW_EXE): $(PDFSHOW_OBJ) $(MUPDF_LIB) $(THIRD_LIBS) + $(LD_CMD) + + PDFCLEAN_SRC=apps/pdfclean.c +-PDFCLEAN_OBJ=$(PDFCLEAN_SRC:apps/%.c=$(OBJDIR)/%.o) ++PDFCLEAN_OBJ=$(PDFCLEAN_SRC:apps/%.c=$(OBJDIR)/%.lo) + PDFCLEAN_EXE=$(OBJDIR)/pdfclean + $(PDFCLEAN_OBJ): $(MUPDF_HDR) + $(PDFCLEAN_EXE): $(PDFCLEAN_OBJ) $(MUPDF_LIB) $(THIRD_LIBS) + $(LD_CMD) + + PDFDRAW_SRC=apps/pdfdraw.c +-PDFDRAW_OBJ=$(PDFDRAW_SRC:apps/%.c=$(OBJDIR)/%.o) ++PDFDRAW_OBJ=$(PDFDRAW_SRC:apps/%.c=$(OBJDIR)/%.lo) + PDFDRAW_EXE=$(OBJDIR)/pdfdraw + $(PDFDRAW_OBJ): $(MUPDF_HDR) + $(PDFDRAW_EXE): $(PDFDRAW_OBJ) $(MUPDF_LIB) $(THIRD_LIBS) + $(LD_CMD) + + PDFEXTRACT_SRC=apps/pdfextract.c +-PDFEXTRACT_OBJ=$(PDFEXTRACT_SRC:apps/%.c=$(OBJDIR)/%.o) ++PDFEXTRACT_OBJ=$(PDFEXTRACT_SRC:apps/%.c=$(OBJDIR)/%.lo) + PDFEXTRACT_EXE=$(OBJDIR)/pdfextract + $(PDFEXTRACT_OBJ): $(MUPDF_HDR) + $(PDFEXTRACT_EXE): $(PDFEXTRACT_OBJ) $(MUPDF_LIB) $(THIRD_LIBS) + $(LD_CMD) + + PDFINFO_SRC=apps/pdfinfo.c +-PDFINFO_OBJ=$(PDFINFO_SRC:apps/%.c=$(OBJDIR)/%.o) +-PDFINFO_EXE=$(OBJDIR)/pdfinfo ++PDFINFO_OBJ=$(PDFINFO_SRC:apps/%.c=$(OBJDIR)/%.lo) ++PDFINFO_EXE=$(OBJDIR)/mupdf-pdfinfo + $(PDFINFO_OBJ): $(MUPDF_HDR) + $(PDFINFO_EXE): $(PDFINFO_OBJ) $(MUPDF_LIB) $(THIRD_LIBS) + $(LD_CMD) +@@ -344,7 +333,7 @@ $(PDFINFO_EXE): $(PDFINFO_OBJ) $(MUPDF_L + PDFAPP_HDR = apps/pdfapp.h + + X11VIEW_SRC=apps/x11_main.c apps/x11_image.c apps/pdfapp.c +-X11VIEW_OBJ=$(X11VIEW_SRC:apps/%.c=$(OBJDIR)/%.o) ++X11VIEW_OBJ=$(X11VIEW_SRC:apps/%.c=$(OBJDIR)/%.lo) + X11VIEW_EXE=$(OBJDIR)/mupdf + + $(X11VIEW_OBJ): $(MUPDF_HDR) $(PDFAPP_HDR) +@@ -353,7 +342,7 @@ $(X11VIEW_EXE): $(X11VIEW_OBJ) $(MUPDF_L + + WINVIEW_SRC=apps/win_main.c apps/pdfapp.c + WINVIEW_RES=apps/win_res.rc +-WINVIEW_OBJ=$(WINVIEW_SRC:apps/%.c=$(OBJDIR)/%.o) $(WINVIEW_RES:apps/%.rc=$(OBJDIR)/%.o) ++WINVIEW_OBJ=$(WINVIEW_SRC:apps/%.c=$(OBJDIR)/%.lo) $(WINVIEW_RES:apps/%.rc=$(OBJDIR)/%.lo) + WINVIEW_EXE=$(OBJDIR)/mupdf.exe + + $(OBJDIR)/%.o: apps/%.rc +@@ -378,7 +367,7 @@ nuke: + rm -rf build + + install: $(OBJDIR) $(GENDIR) $(MUPDF_LIB) $(APPS) +- install -d $(prefix)/bin $(prefix)/lib $(prefix)/include +- install $(APPS) $(prefix)/bin +- install $(MUPDF_LIB) $(prefix)/lib +- install $(MUPDF_HDR) $(prefix)/include ++ mkdir -p $(prefix)/bin $(prefix)/lib $(prefix)/include ++ libtool --mode=install ${BSD_INSTALL_PROGRAM} $(APPS) $(prefix)/bin ++ libtool --mode=install ${BSD_INSTALL_LIB} $(MUPDF_LIB) $(prefix)/lib ++ ${BSD_INSTALL_DATA} $(MUPDF_HDR) $(prefix)/include -- cgit v1.2.3