From umeno@belldandy.unnumbered.net  Sun Jul 18 06:58:17 2004
Return-Path: <umeno@belldandy.unnumbered.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3580916A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 18 Jul 2004 06:58:17 +0000 (GMT)
Received: from belldandy.unnumbered.net (gateway.unnumbered.net [61.197.240.129])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7730443D48
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 18 Jul 2004 06:58:14 +0000 (GMT)
	(envelope-from umeno@belldandy.unnumbered.net)
Received: from belldandy.unnumbered.net (localhost.unnumbered.net [127.0.0.1])
	by belldandy.unnumbered.net (8.12.11/8.12.11) with ESMTP id i6I6wCAI080674
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 18 Jul 2004 15:58:12 +0900 (JST)
	(envelope-from umeno@belldandy.unnumbered.net)
Received: (from umeno@localhost)
	by belldandy.unnumbered.net (8.12.11/8.12.11/Submit) id i6I6wCcp080673;
	Sun, 18 Jul 2004 15:58:12 +0900 (JST)
	(envelope-from umeno)
Message-Id: <200407180658.i6I6wCcp080673@belldandy.unnumbered.net>
Date: Sun, 18 Jul 2004 15:58:12 +0900 (JST)
From: UMENO Takashi <umeno@rr.iij4u.or.jp>
Reply-To: UMENO Takashi <umeno@rr.iij4u.or.jp>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Maintainer Update: graphics/zphoto to 1.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         69232
>Category:       ports
>Synopsis:       Maintainer Update: graphics/zphoto to 1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 18 07:00:47 GMT 2004
>Closed-Date:    Wed Jul 21 12:50:29 GMT 2004
>Last-Modified:  Wed Jul 21 12:50:29 GMT 2004
>Originator:     UMENO Takashi
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
individual
>Environment:
System: FreeBSD belldandy.unnumbered.net 4.10-STABLE FreeBSD 4.10-STABLE #0: Tue Jul 13 05:35:24 JST 2004 umeno@belldandy.unnumbered.net:/usr/src/sys/compile/SAKUYA22 i386


	
>Description:
Maintainer Update: graphics/zphoto to 1.1
New file: 
files/patch-templates::default::all::Makefile.in

add knobs:
WITHOUT_AVIPLAY. WITHOUT_ZIP

>How-To-Repeat:
N/A
>Fix:

	

diff -urN zphoto.orig/Makefile zphoto/Makefile
--- zphoto.orig/Makefile	Tue May 11 07:42:34 2004
+++ zphoto/Makefile	Sun Jul 18 13:48:55 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zphoto
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	graphics www
 MASTER_SITES=	http://namazu.org/~satoru/zphoto/
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,33 +16,42 @@
 
 LIB_DEPENDS=	ming.3:${PORTSDIR}/graphics/ming \
 		Imlib2.2:${PORTSDIR}/graphics/imlib2 \
-		popt.0:${PORTSDIR}/devel/popt \
-		aviplay.0:${PORTSDIR}/multimedia/avifile
+		popt.0:${PORTSDIR}/devel/popt
+.if !defined (WITHOUT_AVIPLAY)
+LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/multimedia/avifile
+.endif
 .if defined (WITH_WXGTK)
 LIB_DEPENDS+=	wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk
 .elif defined (WITH_WXGTK2)
 LIB_DEPENDS+=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
 .endif
+.if !defined (WITHOUT_ZIP)
 RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+.endif
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 	       	CPPFLAGS="-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS}"
-.if defined (WITH_WXGTK) || (WITH_WXGTK2)
+.if defined (WITH_WXGTK)
+CONFIGURE_ARGS+=	--with-wx-config=wxgtk-2.4-config
 PLIST+=		${PKGDIR}/pkg-plist.wxzphoto
+.elif defined (WITH_WXGTK2)
+CONFIGURE_ARGS+=	--with-wx-config=wxgtk2-2.4-config
 .else
-CONFIGURE_ARGS=	--disable-wx
+CONFIGURE_ARGS+=	--disable-wx
+.endif
+.if defined (WITHOUT_AVIPLAY)
+CONFIGURE_ARGS+=	--disable-avifile
+.endif
+.if defined (WITHOUT_ZIP)
+CONFIGURE_ARGS+=	--disable-zip
 .endif
 USE_GMAKE=	yes
 USE_XLIB=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|<ming.h>|<ming/ming.h>|g' ${WRKSRC}/*.c ${WRKSRC}/configure
-.if defined (WITH_WXGTK)
-	@${REINPLACE_CMD} -e 's|wxgtk2-config||g' -e 's|wxgtk2-2.5-config||g' -e 's|wxgtk2-2.4-config||g' ${WRKSRC}/configure
-.elif defined (WITH_WXGTK2)
-	@${REINPLACE_CMD} -e 's|wx-config||g' -e 's|wxgtk-config||g' ${WRKSRC}/configure
-.endif
+
 .include <bsd.port.mk>
diff -urN zphoto.orig/distinfo zphoto/distinfo
--- zphoto.orig/distinfo	Tue May 11 07:42:34 2004
+++ zphoto/distinfo	Wed Jul  7 07:26:00 2004
@@ -1,2 +1,2 @@
-MD5 (zphoto-1.0.tar.gz) = 7cba659b913468124b664bcde52efece
-SIZE (zphoto-1.0.tar.gz) = 419086
+MD5 (zphoto-1.1.tar.gz) = 20df560de202e188e383c22db9a3f637
+SIZE (zphoto-1.1.tar.gz) = 412429
diff -urN zphoto.orig/files/patch-templates::default::all::Makefile.in zphoto/files/patch-templates::default::all::Makefile.in
--- zphoto.orig/files/patch-templates::default::all::Makefile.in	Thu Jan  1 09:00:00 1970
+++ zphoto/files/patch-templates::default::all::Makefile.in	Sat Jul 17 21:52:23 2004
@@ -0,0 +1,14 @@
+--- templates/default/all/Makefile.in.orig	Tue Jul  6 01:48:10 2004
++++ templates/default/all/Makefile.in	Sat Jul 17 21:49:48 2004
+@@ -363,7 +363,10 @@
+ 
+ all: zphoto.css .photo.html
+ 	@perl -e 'while (($$f = shift)) { $$f =~ m!.*/([^/]*)/([^/]*)$$!; \
+-		  print "cp -p $$f $$2.$$1\n"}' $(top_srcdir)/templates/default/*/*.{html,js}\
++		  print "cp -p $$f $$2.$$1\n"}' $(top_srcdir)/templates/default/*/*.html\
++	| sh
++	@perl -e 'while (($$f = shift)) { $$f =~ m!.*/([^/]*)/([^/]*)$$!; \
++		  print "cp -p $$f $$2.$$1\n"}' $(top_srcdir)/templates/default/*/*.js\
+ 	| sh
+ 
+ install-data-local:
diff -urN zphoto.orig/pkg-plist zphoto/pkg-plist
--- zphoto.orig/pkg-plist	Tue May 11 07:42:34 2004
+++ zphoto/pkg-plist	Sun Jul 18 00:15:21 2004
@@ -5,12 +5,14 @@
 share/zphoto/templates/default/en/zphoto.css
 share/zphoto/templates/default/en/flash-colors.txt
 share/zphoto/templates/default/en/css-colors.txt
+share/zphoto/templates/default/en/zoom.js
 share/zphoto/templates/default/ja/.photo.html
 share/zphoto/templates/default/ja/index.html
 share/zphoto/templates/default/ja/noflash.html
 share/zphoto/templates/default/ja/zphoto.css
 share/zphoto/templates/default/ja/flash-colors.txt
 share/zphoto/templates/default/ja/css-colors.txt
+share/zphoto/templates/default/ja/zoom.js
 share/zphoto/templates/default/all/.photo.html
 share/zphoto/templates/default/all/zphoto.css
 share/zphoto/templates/default/all/index.html.en
@@ -19,8 +21,14 @@
 share/zphoto/templates/default/all/noflash.html.ja
 share/zphoto/templates/default/all/flash-colors.txt
 share/zphoto/templates/default/all/css-colors.txt
+share/zphoto/templates/default/all/zoom.js.en
+share/zphoto/templates/default/all/zoom.js.ja
 share/zphoto/doc/zphoto-ja.html
 share/zphoto/doc/zphoto.html
+share/zphoto/doc/images/wxzphoto-linux-mini.png
+share/zphoto/doc/images/wxzphoto-linux.png
+share/zphoto/doc/images/wxzphoto-mini.png
+share/zphoto/doc/images/wxzphoto.png
 share/zphoto/fonts/EfontSerifB.fdb
 share/locale/ja/LC_MESSAGES/zphoto.mo
 share/locale/ja_JP.SJIS/LC_MESSAGES/zphoto.mo
@@ -30,5 +38,6 @@
 @dirrm share/zphoto/templates/default
 @dirrm share/zphoto/templates
 @dirrm share/zphoto/fonts
+@dirrm share/zphoto/doc/images
 @dirrm share/zphoto/doc
 @dirrm share/zphoto


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Wed Jul 21 12:50:19 GMT 2004 
State-Changed-Why:  
Superseded by ports/69363 

http://www.freebsd.org/cgi/query-pr.cgi?pr=69232 
>Unformatted:
