Date: Mon, 15 Sep 2008 21:47:59 +0800 (CST) From: Yi-Jheng Lin <yzlin@cs.nctu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Cc: yinjieh@csie.nctu.edu.tw Subject: ports/127398: [PATCH] graphics/flphoto: unbreak, fix build error Message-ID: <200809151347.m8FDlxQZ075544@stucgi.cs.nctu.edu.tw> Resent-Message-ID: <200809151350.m8FDo1gc011008@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 127398
>Category: ports
>Synopsis: [PATCH] graphics/flphoto: unbreak, fix build error
>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: Mon Sep 15 13:50:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Yi-Jheng Lin
>Release: FreeBSD 7.0-RELEASE-p4 amd64
>Organization:
NCTU CS
>Environment:
System: FreeBSD stucgi 7.0-RELEASE-p4 FreeBSD 7.0-RELEASE-p4 #0: Fri Sep 5 14:56:26 CST
>Description:
[DESCRIBE CHANGES]
- Fix build error
- Add NOPORTDOCS support
Added file(s):
- files/patch-camera.cxx
Port maintainer (yinjieh@csie.nctu.edu.tw) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- flphoto-1.3.1_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/flphoto/Makefile /amd/account/gcs/96/9655630/dev/ports/graphics/flphoto/Makefile
--- /usr/ports/graphics/flphoto/Makefile 2008-08-22 03:03:21.172177020 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/graphics/flphoto/Makefile 2008-09-15 21:37:49.000000000 +0800
@@ -19,8 +19,6 @@
LIB_DEPENDS= gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
fltk.1:${PORTSDIR}/x11-toolkits/fltk
-BROKEN= does not compile
-
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
@@ -36,11 +34,13 @@
${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
+.if !defined(NOPORTDOCS)
@${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}
+.endif
.for lang in de en_CA en_GB es fr it nl pt
@${MKDIR} ${PREFIX}/share/locale/${lang}
${INSTALL_DATA} ${WRKSRC}/po/${lang}.po \
diff -ruN --exclude=CVS /usr/ports/graphics/flphoto/files/patch-camera.cxx /amd/account/gcs/96/9655630/dev/ports/graphics/flphoto/files/patch-camera.cxx
--- /usr/ports/graphics/flphoto/files/patch-camera.cxx 1970-01-01 08:00:00.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/graphics/flphoto/files/patch-camera.cxx 2008-09-15 21:34:23.000000000 +0800
@@ -0,0 +1,10 @@
+--- camera.cxx.orig 2008-09-15 21:32:33.000000000 +0800
++++ camera.cxx 2008-09-15 21:33:49.000000000 +0800
+@@ -42,6 +42,7 @@
+ # define fl_mkdir(p) mkdir(p)
+ #else
+ # include <unistd.h>
++# include <sys/stat.h>
+ # define fl_mkdir(p) mkdir(p, 0777)
+ #endif // WIN32 && !__CYGWIN__
+ #include <errno.h>
diff -ruN --exclude=CVS /usr/ports/graphics/flphoto/pkg-plist /amd/account/gcs/96/9655630/dev/ports/graphics/flphoto/pkg-plist
--- /usr/ports/graphics/flphoto/pkg-plist 2007-02-10 03:02:23.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/graphics/flphoto/pkg-plist 2008-09-15 21:38:14.000000000 +0800
@@ -1,37 +1,37 @@
bin/flphoto
-%%DOCSDIR%%/README
-%%DOCSDIR%%/about.html
-%%DOCSDIR%%/albums.html
-%%DOCSDIR%%/camera.jpg
-%%DOCSDIR%%/contents.html
-%%DOCSDIR%%/crop.jpg
-%%DOCSDIR%%/download.html
-%%DOCSDIR%%/export-dir.jpg
-%%DOCSDIR%%/export-general.jpg
-%%DOCSDIR%%/export-images.jpg
-%%DOCSDIR%%/export-thumbnails.jpg
-%%DOCSDIR%%/export-watermark.jpg
-%%DOCSDIR%%/export.html
-%%DOCSDIR%%/flphoto.jpg
-%%DOCSDIR%%/flphoto.png
-%%DOCSDIR%%/images.html
-%%DOCSDIR%%/import.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/jpeg.jpg
-%%DOCSDIR%%/license.html
-%%DOCSDIR%%/options-image.jpg
-%%DOCSDIR%%/options-memcard.jpg
-%%DOCSDIR%%/options-slideshow.jpg
-%%DOCSDIR%%/options.html
-%%DOCSDIR%%/print-calendar.jpg
-%%DOCSDIR%%/print-general.jpg
-%%DOCSDIR%%/print-matted.jpg
-%%DOCSDIR%%/print-printer.jpg
-%%DOCSDIR%%/print.html
-%%DOCSDIR%%/relnotes.html
-%%DOCSDIR%%/scale.jpg
-%%DOCSDIR%%/slideshow.html
-%%DOCSDIR%%/view.html
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/about.html
+%%PORTDOCS%%%%DOCSDIR%%/albums.html
+%%PORTDOCS%%%%DOCSDIR%%/camera.jpg
+%%PORTDOCS%%%%DOCSDIR%%/contents.html
+%%PORTDOCS%%%%DOCSDIR%%/crop.jpg
+%%PORTDOCS%%%%DOCSDIR%%/download.html
+%%PORTDOCS%%%%DOCSDIR%%/export-dir.jpg
+%%PORTDOCS%%%%DOCSDIR%%/export-general.jpg
+%%PORTDOCS%%%%DOCSDIR%%/export-images.jpg
+%%PORTDOCS%%%%DOCSDIR%%/export-thumbnails.jpg
+%%PORTDOCS%%%%DOCSDIR%%/export-watermark.jpg
+%%PORTDOCS%%%%DOCSDIR%%/export.html
+%%PORTDOCS%%%%DOCSDIR%%/flphoto.jpg
+%%PORTDOCS%%%%DOCSDIR%%/flphoto.png
+%%PORTDOCS%%%%DOCSDIR%%/images.html
+%%PORTDOCS%%%%DOCSDIR%%/import.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/jpeg.jpg
+%%PORTDOCS%%%%DOCSDIR%%/license.html
+%%PORTDOCS%%%%DOCSDIR%%/options-image.jpg
+%%PORTDOCS%%%%DOCSDIR%%/options-memcard.jpg
+%%PORTDOCS%%%%DOCSDIR%%/options-slideshow.jpg
+%%PORTDOCS%%%%DOCSDIR%%/options.html
+%%PORTDOCS%%%%DOCSDIR%%/print-calendar.jpg
+%%PORTDOCS%%%%DOCSDIR%%/print-general.jpg
+%%PORTDOCS%%%%DOCSDIR%%/print-matted.jpg
+%%PORTDOCS%%%%DOCSDIR%%/print-printer.jpg
+%%PORTDOCS%%%%DOCSDIR%%/print.html
+%%PORTDOCS%%%%DOCSDIR%%/relnotes.html
+%%PORTDOCS%%%%DOCSDIR%%/scale.jpg
+%%PORTDOCS%%%%DOCSDIR%%/slideshow.html
+%%PORTDOCS%%%%DOCSDIR%%/view.html
share/locale/de/flphoto_de
share/locale/en_CA/flphoto_en_CA
share/locale/en_GB/flphoto_en_GB
@@ -40,4 +40,4 @@
share/locale/it/flphoto_it
share/locale/nl/flphoto_nl
share/locale/pt/flphoto_pt
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- flphoto-1.3.1_3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809151347.m8FDlxQZ075544>