sync WANTLIB and update to 0.15; mbalmer ok.

This commit is contained in:
sthen 2009-06-21 14:01:28 +00:00
parent d951ad9450
commit 538ffe89d8
9 changed files with 48 additions and 58 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.15 2009/03/16 08:56:32 espie Exp $
# $OpenBSD: Makefile,v 1.16 2009/06/21 14:01:28 sthen Exp $
COMMENT= read and manipulate raw images from digital cameras
DISTNAME= ufraw-0.13
PKGNAME = ${DISTNAME}p0
DISTNAME= ufraw-0.15
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ufraw/}
@ -18,7 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= atk-1.0 c cairo expat fontconfig freetype \
gdk_pixbuf-2.0 gdk-x11-2.0 glib-2.0 glitz \
gdk_pixbuf-2.0 gdk-x11-2.0 gio-2.0 glib-2.0 glitz \
gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 \
m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \
pthread stdc++ X11 Xau Xcursor Xext Xfixes Xi \
@ -35,8 +34,7 @@ MODULES= devel/gettext
USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
AUTOCONF_VERSION= 2.61
CONFIGURE_STYLE= autoconf
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -pthread"
CONFIGURE_ARGS= --enable-extras

View File

@ -1,5 +1,5 @@
MD5 (ufraw-0.13.tar.gz) = ZHD3h6j2L24WQhYePI1Vew==
RMD160 (ufraw-0.13.tar.gz) = MHBTOGrttJuTK13QmPbeuYjWxig=
SHA1 (ufraw-0.13.tar.gz) = iAwh95B0g21rQOQjQ8haFP4Lpl8=
SHA256 (ufraw-0.13.tar.gz) = 4r65DJbkGWMbS32J6l61h6cUzybN58w99C0mH6GjQ7E=
SIZE (ufraw-0.13.tar.gz) = 662029
MD5 (ufraw-0.15.tar.gz) = bY9smKOIxDh4TNkJ3YLVQA==
RMD160 (ufraw-0.15.tar.gz) = 0k6QdhFMkJ47K7+HoSjHD2KIUpk=
SHA1 (ufraw-0.15.tar.gz) = 6Mf6lb+4ThjuU4SVhh5SUWyos7g=
SHA256 (ufraw-0.15.tar.gz) = E2kW05x7t26OFiAGa6olgYbBNjnWSth/SNRPqadmwzE=
SIZE (ufraw-0.15.tar.gz) = 976297

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1 2008/06/07 05:31:41 phessler Exp $
--- Makefile.in.orig Mon Nov 12 21:27:52 2007
+++ Makefile.in Wed Jun 4 12:39:59 2008
@@ -93,7 +93,7 @@ am__nikon_curve_SOURCES_DIST = nikon_curve.c
$OpenBSD: patch-Makefile_in,v 1.2 2009/06/21 14:01:28 sthen Exp $
--- Makefile.in.orig Tue Dec 23 07:47:19 2008
+++ Makefile.in Thu Jun 18 02:48:27 2009
@@ -94,7 +94,7 @@ am__nikon_curve_SOURCES_DIST = nikon_curve.c
nikon_curve_OBJECTS = $(am_nikon_curve_OBJECTS)
@MAKE_EXTRAS_TRUE@nikon_curve_DEPENDENCIES = $(am__DEPENDENCIES_1)
nikon_curve_LINK = $(CCLD) $(nikon_curve_CFLAGS) $(CFLAGS) \

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.1 2008/06/07 05:31:41 phessler Exp $
--- configure.ac.orig Sat Nov 10 16:24:32 2007
+++ configure.ac Fri Jun 6 21:46:05 2008
@@ -161,9 +161,11 @@ AC_CHECK_HEADER(jpeglib.h,
have_jpeg=${ac_cv_lib_jpeg_jpeg_CreateCompress:-no}
# Check for png headers and library.
-AC_CHECK_HEADER(png.h,
- AC_CHECK_LIB(png, png_create_info_struct))
-have_png=${ac_cv_lib_png_png_create_info_struct:-no}
+PKG_CHECK_MODULES(PNG, libpng,
+ [ have_png=yes
+ AC_DEFINE(HAVE_PNG, 1, have png) ],
+ [ have_png=no
+ AC_MSG_RESULT($PNG_PKG_ERRORS) ] )
# Check for tiff headers and library.
AC_CHECK_HEADER(tiffio.h,

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-nikon_curve_c,v 1.4 2008/06/07 05:31:41 phessler Exp $
--- nikon_curve.c.orig Sun Nov 11 03:10:38 2007
+++ nikon_curve.c Sat Dec 29 12:19:46 2007
$OpenBSD: patch-nikon_curve_c,v 1.5 2009/06/21 14:01:28 sthen Exp $
--- nikon_curve.c.orig Tue Dec 16 06:55:29 2008
+++ nikon_curve.c Thu Jun 18 02:48:27 2009
@@ -77,8 +77,8 @@ static const unsigned char *FileTypeHeaders[NUM_FILE_T
#ifdef _STAND_ALONE_
@ -51,7 +51,7 @@ $OpenBSD: patch-nikon_curve_c,v 1.4 2008/06/07 05:31:41 phessler Exp $
}
return NC_SUCCESS;
@@ -1723,7 +1719,7 @@ int ConvertNikonCurveData(char *inFileName, char *outF
@@ -1739,7 +1735,7 @@ int ConvertNikonCurveData(char *inFileName, char *outF
{
//Load the curve data from the ncv/ntc file
NikonData data;
@ -60,7 +60,7 @@ $OpenBSD: patch-nikon_curve_c,v 1.4 2008/06/07 05:31:41 phessler Exp $
if ( samplingRes <= 1 || outputRes <= 1 || samplingRes > MAX_RESOLUTION
|| outputRes > MAX_RESOLUTION )
@@ -1753,8 +1749,7 @@ int ConvertNikonCurveData(char *inFileName, char *outF
@@ -1769,8 +1765,7 @@ int ConvertNikonCurveData(char *inFileName, char *outF
}
//rename output files
@ -70,7 +70,7 @@ $OpenBSD: patch-nikon_curve_c,v 1.4 2008/06/07 05:31:41 phessler Exp $
//if the name has an extension, attempt to remove it
if (tmpstr[strlen(tmpstr)-4] == '.')
{
@@ -1764,19 +1759,19 @@ int ConvertNikonCurveData(char *inFileName, char *outF
@@ -1780,19 +1775,19 @@ int ConvertNikonCurveData(char *inFileName, char *outF
switch(i)
{
case TONE_CURVE:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ufraw-batch_c,v 1.3 2008/06/07 05:31:41 phessler Exp $
--- ufraw-batch.c.orig Sun Nov 11 02:04:01 2007
+++ ufraw-batch.c Sat Dec 29 12:15:06 2007
@@ -62,9 +62,9 @@ int main (int argc, char **argv)
$OpenBSD: patch-ufraw-batch_c,v 1.4 2009/06/21 14:01:28 sthen Exp $
--- ufraw-batch.c.orig Tue Jul 1 19:36:20 2008
+++ ufraw-batch.c Thu Jun 18 02:48:27 2009
@@ -63,9 +63,9 @@ int main (int argc, char **argv)
if (strlen(cmd.inputFilename)>0) {
status = conf_load(&conf, cmd.inputFilename);
if (status==UFRAW_SUCCESS) {

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ufraw_c,v 1.4 2008/06/07 05:31:41 phessler Exp $
--- ufraw.c.orig Sun Nov 11 02:04:39 2007
+++ ufraw.c Sat Dec 29 12:15:06 2007
@@ -85,9 +85,9 @@ int main (int argc, char **argv)
$OpenBSD: patch-ufraw_c,v 1.5 2009/06/21 14:01:28 sthen Exp $
--- ufraw.c.orig Wed Dec 10 04:06:53 2008
+++ ufraw.c Thu Jun 18 02:48:27 2009
@@ -95,9 +95,9 @@ int main (int argc, char **argv)
if (strlen(cmd.inputFilename)>0) {
status = conf_load(&conf, cmd.inputFilename);
if (status==UFRAW_SUCCESS) {

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-ufraw_developer_c,v 1.4 2008/06/07 05:31:41 phessler Exp $
--- ufraw_developer.c.orig Sun Nov 11 02:28:56 2007
+++ ufraw_developer.c Sat Dec 29 12:21:29 2007
@@ -42,7 +42,7 @@ developer_data *developer_init()
d->saturation = -1;
$OpenBSD: patch-ufraw_developer_c,v 1.5 2009/06/21 14:01:28 sthen Exp $
--- ufraw_developer.c.orig Tue Dec 23 05:41:34 2008
+++ ufraw_developer.c Thu Jun 18 02:48:27 2009
@@ -49,7 +49,7 @@ developer_data *developer_init()
#endif
for (i=0; i<profile_types; i++) {
d->profile[i] = NULL;
- strcpy(d->profileFile[i],"no such file");
@ -10,7 +10,7 @@ $OpenBSD: patch-ufraw_developer_c,v 1.4 2008/06/07 05:31:41 phessler Exp $
}
memset(&d->baseCurveData, 0, sizeof(d->baseCurveData));
d->baseCurveData.m_gamma = -1.0;
@@ -105,7 +105,7 @@ void developer_profile(developer_data *d, int type, pr
@@ -114,7 +114,7 @@ void developer_profile(developer_data *d, int type, pr
g_strlcpy(p->productName, cmsTakeProductName(d->profile[type]),
max_name);
else

View File

@ -1,20 +1,30 @@
@comment $OpenBSD: PLIST,v 1.4 2008/06/07 05:31:41 phessler Exp $
@comment $OpenBSD: PLIST,v 1.5 2009/06/21 14:01:28 sthen Exp $
@comment bin/dcraw
bin/nikon-curve
bin/ufraw
bin/ufraw-batch
@bin bin/nikon-curve
@bin bin/ufraw
@bin bin/ufraw-batch
lib/gimp/
lib/gimp/2.0/
lib/gimp/2.0/plug-ins/
lib/gimp/2.0/plug-ins/ufraw-gimp
@bin lib/gimp/2.0/plug-ins/ufraw-gimp
@man man/man1/ufraw.1
share/locale/ca/LC_MESSAGES/ufraw.mo
share/locale/cs/LC_MESSAGES/ufraw.mo
share/locale/da/LC_MESSAGES/ufraw.mo
share/locale/es/LC_MESSAGES/ufraw.mo
share/locale/fr/LC_MESSAGES/ufraw.mo
share/locale/it/LC_MESSAGES/ufraw.mo
share/locale/ja/LC_MESSAGES/ufraw.mo
share/locale/ko/LC_MESSAGES/ufraw.mo
share/locale/nb/LC_MESSAGES/ufraw.mo
share/locale/nl/LC_MESSAGES/ufraw.mo
share/locale/pl/LC_MESSAGES/ufraw.mo
share/locale/pt/LC_MESSAGES/ufraw.mo
share/locale/ru/LC_MESSAGES/ufraw.mo
share/locale/sr/LC_MESSAGES/ufraw.mo
share/locale/sr@latin/
share/locale/sr@latin/LC_MESSAGES/
share/locale/sr@latin/LC_MESSAGES/ufraw.mo
share/locale/sv/LC_MESSAGES/ufraw.mo
share/pixmaps/
share/pixmaps/ufraw.png