Date: Fri, 31 Jan 2003 02:58:02 +0900 (JST) From: UMENO Takashi <umeno@rr.iij4u.or.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/47683: Upadate port: graphics/zphoto to 0.4 Message-ID: <200301301758.h0UHw2wf083733@belldandy.unnumbered.net>
next in thread | raw e-mail | index | archive | help
>Number: 47683 >Category: ports >Synopsis: Upadate port: graphics/zphoto to 0.4 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jan 30 10:00:13 PST 2003 >Closed-Date: >Last-Modified: >Originator: UMENO Takashi >Release: FreeBSD 4.7-STABLE i386 >Organization: personal >Environment: System: FreeBSD belldandy.unnumbered.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Thu Jan 9 01:26:08 JST 2003 umeno@belldandy.unnumbered.net:/usr/src/sys/compile/SAKUYA16 i386 >Description: - Update to version 0.4 New file: files/patch-templates::all::Makefile.in files/patch-util.c files/patch-zphoto.c Remove file: files/patch-Makefile.in >How-To-Repeat: N/A >Fix: diff -urN zphoto.orig/Makefile zphoto/Makefile --- zphoto.orig/Makefile Sun Jul 21 02:25:27 2002 +++ zphoto/Makefile Wed Jan 29 00:51:37 2003 @@ -6,17 +6,17 @@ # PORTNAME= zphoto -PORTVERSION= 0.2 +PORTVERSION= 0.4 CATEGORIES= graphics www MASTER_SITES= http://namazu.org/~satoru/zphoto/ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= umeno@rr.iij4u.or.jp -#BUILD_DEPENDS= wget:${PORTSDIR}/ftp/wget LIB_DEPENDS= ming.3:${PORTSDIR}/graphics/ming \ Imlib2.1:${PORTSDIR}/graphics/imlib2 \ popt.0:${PORTSDIR}/devel/popt +RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ diff -urN zphoto.orig/distinfo zphoto/distinfo --- zphoto.orig/distinfo Sun Jul 21 02:25:27 2002 +++ zphoto/distinfo Wed Jan 29 00:52:24 2003 @@ -1 +1 @@ -MD5 (zphoto-0.2.tar.gz) = add4cb33908494af595a076db4ddad6a +MD5 (zphoto-0.4.tar.gz) = 585faf9925ec65c33a599feb014147df diff -urN zphoto.orig/files/patch-Makefile.in zphoto/files/patch-Makefile.in --- zphoto.orig/files/patch-Makefile.in Sun Jul 21 02:25:27 2002 +++ zphoto/files/patch-Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sun Jul 21 00:50:36 2002 -+++ Makefile.in Sun Jul 21 00:50:44 2002 -@@ -460,7 +460,7 @@ - - - Techno.fdb: -- wget http://opaque.net/ming/tutorial/flashdot.tgz -+ fetch http://opaque.net/ming/tutorial/flashdot.tgz - tar zxf flashdot.tgz Techno.fdb - - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN zphoto.orig/files/patch-templates::all::Makefile.in zphoto/files/patch-templates::all::Makefile.in --- zphoto.orig/files/patch-templates::all::Makefile.in Thu Jan 1 09:00:00 1970 +++ zphoto/files/patch-templates::all::Makefile.in Fri Jan 31 01:56:29 2003 @@ -0,0 +1,11 @@ +--- templates/all/Makefile.in.orig Tue Jan 28 22:56:04 2003 ++++ templates/all/Makefile.in Fri Jan 31 01:51:27 2003 +@@ -70,7 +70,7 @@ + ZPHOTO_URL = @ZPHOTO_URL@ + + templatesdir = $(pkgdatadir)/templates/all +-templates_DATA = zphoto.css ++templates_DATA = zphoto.css .photo.html + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../config.h + CONFIG_CLEAN_FILES = diff -urN zphoto.orig/files/patch-util.c zphoto/files/patch-util.c --- zphoto.orig/files/patch-util.c Thu Jan 1 09:00:00 1970 +++ zphoto/files/patch-util.c Wed Jan 29 00:55:59 2003 @@ -0,0 +1,11 @@ +--- util.c.orig Tue Jan 28 19:18:20 2003 ++++ util.c Wed Jan 29 00:55:26 2003 +@@ -57,7 +57,7 @@ + exit(2); + } + +-extern int vasprintf (char **ptr, const char *fmt, ...); ++/* extern int vasprintf (char **ptr, const char *fmt, ...); */ + + char * + zphoto_asprintf (const char *fmt, ...) diff -urN zphoto.orig/files/patch-zphoto.c zphoto/files/patch-zphoto.c --- zphoto.orig/files/patch-zphoto.c Thu Jan 1 09:00:00 1970 +++ zphoto/files/patch-zphoto.c Fri Jan 31 01:37:45 2003 @@ -0,0 +1,19 @@ +--- zphoto.c.orig Tue Jan 28 19:18:20 2003 ++++ zphoto.c Fri Jan 31 01:34:57 2003 +@@ -248,7 +248,7 @@ + int width, height; + char *photo_width, *photo_height; + +- photo_file_name = basename(options->input_photos[id]); ++ photo_file_name = zphoto_strdup(basename(options->input_photos[id])); + if (id > 0) + prev_file_name = + zphoto_modify_suffix(basename(options->input_photos[id - 1]), +@@ -283,6 +283,7 @@ + zphoto_create_date_string(date_string, BUFSIZ, + zphoto_get_mtime(options->input_photos[id])); + zphoto_template_add_subst(template, "photo_date", date_string); ++ free(photo_file_name); + free(prev_file_name); + free(next_file_name); + free(photo_width); diff -urN zphoto.orig/pkg-message zphoto/pkg-message --- zphoto.orig/pkg-message Sun Jul 21 02:25:27 2002 +++ zphoto/pkg-message Fri Jan 31 02:20:14 2003 @@ -4,12 +4,14 @@ sh or bash: $ ZPHOTO_TEMPLATE_DIR=%%PREFIX%%/share/zphoto/templates/en (english) $ ZPHOTO_TEMPLATE_DIR=%%PREFIX%%/share/zphoto/templates/ja (japanese) - $ ZPHOTO_FONT=%%PREFIX%%/share/zphoto/fonts/Techno.fdb + $ ZPHOTO_TEMPLATE_DIR=%%PREFIX%%/share/zphoto/templates/all (both) + $ ZPHOTO_FONT=%%PREFIX%%/share/zphoto/fonts/EfontSerifB.fdb $ export ZPHOTO_TEMPLATE_DIR ZPHOTO_FONT csh or tcsh: % setenv ZPHOTO_TEMPLATE_DIR %%PREFIX%%/share/zphoto/templates/en (english) % setenv ZPHOTO_TEMPLATE_DIR %%PREFIX%%/share/zphoto/templates/ja (japanese) - % setenv ZPHOTO_FONT %%PREFIX%%/share/zphoto/fonts/Techno.fdb + % setenv ZPHOTO_TEMPLATE_DIR %%PREFIX%%/share/zphoto/templates/all (both) + % setenv ZPHOTO_FONT %%PREFIX%%/share/zphoto/fonts/EfontSerifB.fdb ****************************************************************************** diff -urN zphoto.orig/pkg-plist zphoto/pkg-plist --- zphoto.orig/pkg-plist Sun Jul 21 02:25:27 2002 +++ zphoto/pkg-plist Fri Jan 31 01:54:04 2003 @@ -1,19 +1,25 @@ bin/zphoto +share/zphoto/templates/en/.photo.html share/zphoto/templates/en/index.html share/zphoto/templates/en/noflash.html share/zphoto/templates/en/zphoto.css +share/zphoto/templates/ja/.photo.html share/zphoto/templates/ja/index.html share/zphoto/templates/ja/noflash.html share/zphoto/templates/ja/zphoto.css +share/zphoto/templates/all/.photo.html share/zphoto/templates/all/zphoto.css -share/zphoto/templates/all/noflash.html.ja -share/zphoto/templates/all/noflash.html.en -share/zphoto/templates/all/index.html.ja share/zphoto/templates/all/index.html.en -share/zphoto/fonts/Techno.fdb +share/zphoto/templates/all/index.html.ja +share/zphoto/templates/all/noflash.html.en +share/zphoto/templates/all/noflash.html.ja +share/zphoto/doc/zphoto-ja.html +share/zphoto/doc/zphoto.html +share/zphoto/fonts/EfontSerifB.fdb @dirrm share/zphoto/templates/en @dirrm share/zphoto/templates/ja @dirrm share/zphoto/templates/all @dirrm share/zphoto/templates @dirrm share/zphoto/fonts +@dirrm share/zphoto/doc @dirrm share/zphoto >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301301758.h0UHw2wf083733>