Date: Mon, 17 Oct 2005 04:00:23 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/87536: Update port: graphics/flphoto to 1.2 Message-ID: <20051017040023.0554f234.tkato432@yahoo.com> Resent-Message-ID: <200510161910.j9GJAF9F090154@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 87536
>Category: ports
>Synopsis: Update port: graphics/flphoto to 1.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 16 19:10:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.11-RELEASE-p13 i386
>Organization:
>Environment:
>Description:
- Update to version 1.2
Remove file:
files/patch-Makefile.in
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/flphoto/Makefile graphics/flphoto/Makefile
--- /usr/ports/graphics/flphoto/Makefile Wed Feb 4 18:59:22 2004
+++ graphics/flphoto/Makefile Sun Oct 16 01:46:06 2005
@@ -6,8 +6,7 @@
#
PORTNAME= flphoto
-PORTVERSION= 1.1
-PORTREVISION= 1
+PORTVERSION= 1.2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= fltk
@@ -19,13 +18,33 @@
LIB_DEPENDS= gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
fltk.1:${PORTSDIR}/x11-toolkits/fltk
-USE_X_PREFIX= yes
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
USE_BZIP2= yes
+USE_X_PREFIX= yes
+USE_REINPLACE= yes
GNU_CONFIGURE= yes
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAN1= flphoto.1
MAN5= album.5
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|@OPTIM@|-DHAVE_CONFIG_H|g' ${WRKSRC}/Makefile.in
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/flphoto ${PREFIX}/bin/flphoto
+ ${INSTALL_MAN} ${WRKSRC}/doc/flphoto.man ${MANPREFIX}/man/man1/flphoto.1
+ ${INSTALL_MAN} ${WRKSRC}/doc/album.man ${MAN5PREFIX}/man/man5/album.5
+ @${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.jpg ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}
+.for lang in de en_CA en_GB es fr it nl pt
+ @${MKDIR} ${PREFIX}/share/locale/${lang}
+ ${INSTALL_DATA} ${WRKSRC}/po/${lang}.po \
+ ${PREFIX}/share/locale/${lang}/flphoto_${lang}
+.endfor
.include <bsd.port.mk>
diff -urN /usr/ports/graphics/flphoto/distinfo graphics/flphoto/distinfo
--- /usr/ports/graphics/flphoto/distinfo Thu Jan 29 20:25:44 2004
+++ graphics/flphoto/distinfo Sun Oct 16 01:22:31 2005
@@ -1,2 +1,2 @@
-MD5 (flphoto-1.1-source.tar.bz2) = 2cf2938ea1c6f88f9df279a77ec8af96
-SIZE (flphoto-1.1-source.tar.bz2) = 408538
+MD5 (flphoto-1.2-source.tar.bz2) = 13c9b6803b2fd159e8f082b7735ce8ab
+SIZE (flphoto-1.2-source.tar.bz2) = 501459
diff -urN /usr/ports/graphics/flphoto/files/patch-Makefile.in graphics/flphoto/files/patch-Makefile.in
--- /usr/ports/graphics/flphoto/files/patch-Makefile.in Tue Dec 9 05:01:56 2003
+++ graphics/flphoto/files/patch-Makefile.in Thu Jan 1 09:00:00 1970
@@ -1,18 +0,0 @@
---- Makefile.in.orig Sun Sep 14 01:00:35 2003
-+++ Makefile.in Mon Dec 8 20:48:49 2003
-@@ -182,15 +182,9 @@
- $(CP) flphoto$(EXEEXT) $(DESTDIR)$(bindir)
- $(FLTKCONFIG) --post $(DESTDIR)$(bindir)/flphoto$(EXEEXT)
- echo Installing flPhoto manpages in $(DESTDIR)$(mandir)
-- -$(MKDIR) $(DESTDIR)$(mandir)/cat1
-- $(RM) $(DESTDIR)$(mandir)/cat1/flphoto.$(CAT1EXT)
-- $(CP) $(srcdir)/doc/flphoto.1 $(DESTDIR)$(mandir)/cat1/flphoto.$(CAT1EXT)
- -$(MKDIR) $(DESTDIR)$(mandir)/man1
- $(RM) $(DESTDIR)$(mandir)/man1/flphoto.1
- $(CP) $(srcdir)/doc/flphoto.man $(DESTDIR)$(mandir)/man1/flphoto.1
-- -$(MKDIR) $(DESTDIR)$(mandir)/cat5
-- $(RM) $(DESTDIR)$(mandir)/cat5/album.$(CAT5EXT)
-- $(CP) $(srcdir)/doc/album.5 $(DESTDIR)$(mandir)/cat5/album.$(CAT5EXT)
- -$(MKDIR) $(DESTDIR)$(mandir)/man5
- $(RM) $(DESTDIR)$(mandir)/man5/album.5
- $(CP) $(srcdir)/doc/album.man $(DESTDIR)$(mandir)/man5/album.5
diff -urN /usr/ports/graphics/flphoto/pkg-plist graphics/flphoto/pkg-plist
--- /usr/ports/graphics/flphoto/pkg-plist Tue Dec 9 05:01:56 2003
+++ graphics/flphoto/pkg-plist Sun Oct 16 01:45:35 2005
@@ -1,31 +1,34 @@
bin/flphoto
-share/doc/flphoto/COPYING
-share/doc/flphoto/README
-share/doc/flphoto/about.html
-share/doc/flphoto/slideshow.html
-share/doc/flphoto/relnotes.html
-share/doc/flphoto/print.html
-share/doc/flphoto/license.html
-share/doc/flphoto/index.html
-share/doc/flphoto/import.html
-share/doc/flphoto/images.html
-share/doc/flphoto/export.html
-share/doc/flphoto/download.html
-share/doc/flphoto/contents.html
-share/doc/flphoto/albums.html
-share/doc/flphoto/view.html
-share/doc/flphoto/camera.jpg
-share/doc/flphoto/scale.jpg
-share/doc/flphoto/print4.jpg
-share/doc/flphoto/print3.jpg
-share/doc/flphoto/print2.jpg
-share/doc/flphoto/print.jpg
-share/doc/flphoto/jpeg.jpg
-share/doc/flphoto/flphoto.jpg
-share/doc/flphoto/export.jpg
-share/doc/flphoto/crop.jpg
-share/doc/flphoto/slideshow.jpg
-share/doc/flphoto/flphoto.png
+%%DOCSDIR%%/README
+%%DOCSDIR%%/about.html
+%%DOCSDIR%%/albums.html
+%%DOCSDIR%%/camera.jpg
+%%DOCSDIR%%/contents.html
+%%DOCSDIR%%/crop.jpg
+%%DOCSDIR%%/download.html
+%%DOCSDIR%%/export.html
+%%DOCSDIR%%/export.jpg
+%%DOCSDIR%%/flphoto.jpg
+%%DOCSDIR%%/flphoto.png
+%%DOCSDIR%%/images.html
+%%DOCSDIR%%/import.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/jpeg.jpg
+%%DOCSDIR%%/license.html
+%%DOCSDIR%%/options.html
+%%DOCSDIR%%/options1.jpg
+%%DOCSDIR%%/options2.jpg
+%%DOCSDIR%%/options3.jpg
+%%DOCSDIR%%/print.html
+%%DOCSDIR%%/print.jpg
+%%DOCSDIR%%/print2.jpg
+%%DOCSDIR%%/print3.jpg
+%%DOCSDIR%%/print4.jpg
+%%DOCSDIR%%/relnotes.html
+%%DOCSDIR%%/scale.jpg
+%%DOCSDIR%%/slideshow.html
+%%DOCSDIR%%/slideshow.jpg
+%%DOCSDIR%%/view.html
share/locale/de/flphoto_de
share/locale/en_CA/flphoto_en_CA
share/locale/en_GB/flphoto_en_GB
@@ -34,4 +37,4 @@
share/locale/it/flphoto_it
share/locale/nl/flphoto_nl
share/locale/pt/flphoto_pt
-@dirrm share/doc/flphoto
+@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051017040023.0554f234.tkato432>