Upgrade to version 0.5. This is autoconfiged, so builds easier, and

has slightly better Nikon support.
This commit is contained in:
Mark Murray 2005-10-27 20:23:18 +00:00
parent f7d384aab2
commit b030b015de
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=146508
12 changed files with 60 additions and 86 deletions

View file

@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= gimp-ufraw
PORTVERSION= 0.4
PORTVERSION= 0.5
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ufraw
@ -18,11 +18,21 @@ BUILD_DEPENDS= gimp:${PORTSDIR}/graphics/gimp
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack intltool intlhack gtk20 libartlgpl2
WANT_GNOME= yes
ALL_TARGET= build
INSTALL_TARGET= install-admin
.include <bsd.port.mk>
CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
CFLAGS="${CFLAGS} -I ${LOCALBASE}/include"
MAN1= ufraw.1
.include <bsd.port.pre.mk>
.if ${OSVERSION} <= 600000
BROKEN= "Needs memmem(3)"
.endif
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
MD5 (ufraw-0.4.tar.gz) = c66a2498b3fb74eef6f3b7ce5477d44a
SIZE (ufraw-0.4.tar.gz) = 101409
MD5 (ufraw-0.5.tar.gz) = ffb0ac06e226b8412afcbfa7f242d87b
SIZE (ufraw-0.5.tar.gz) = 284234

View file

@ -1,26 +0,0 @@
--- ./Makefile.orig Tue Apr 19 23:53:14 2005
+++ ./Makefile Tue Apr 19 23:56:49 2005
@@ -17,7 +17,7 @@
OBJECTS := $(filter-out dcraw.o,$(OBJECTS))
endif
CC = gcc
-CFLAGS += -std=gnu99 -DUFRAW_VERSION='"$(VER)"'
+CFLAGS += -std=gnu99 -DUFRAW_VERSION='"$(VER)"' -I/usr/local/include
# To check that deprecated features are not used:
#CFLAGS += -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
LDFLAGS += -llcms
@@ -91,12 +91,12 @@
ifdef UFRAW_NO_JPEG
CFLAGS += -DNO_JPEG
else
- LDFLAGS += -ljpeg
+ LDFLAGS += -L/usr/local/lib -ljpeg
endif
ifdef UFRAW_NO_TIFF
CFLAGS += -DNO_TIFF
else
- LDFLAGS += -ltiff
+ LDFLAGS += -L/usr/local/lib -ltiff
endif
ifdef UFRAW_NO_ZLIB
CFLAGS += -DNO_ZLIB

View file

@ -0,0 +1,11 @@
--- dcraw.c.orig Thu Sep 15 19:24:38 2005
+++ dcraw.c Thu Oct 27 21:16:01 2005
@@ -188,7 +188,7 @@
3 G R G R G R 3 B G B G B G 3 R G R G R G 3 G B G B G B
*/
-#ifndef __GLIBC__
+#if !defined(__GLIBC__) && !defined(__FreeBSD__)
char *memmem (char *haystack, size_t haystacklen,
char *needle, size_t needlelen)
{

View file

@ -1,11 +0,0 @@
--- ./ufraw_ufraw.c.orig Sun Apr 10 15:19:43 2005
+++ ./ufraw_ufraw.c Sun Apr 10 15:20:06 2005
@@ -123,7 +123,7 @@
for (i=0; i<cfg->curveCount; i++)
cfg->curve[i].black = cfg_default.curve[0].black;
}
- if (cfg->exposureLoad==load_auto) cfg->exposure = nan("");
+ if (cfg->exposureLoad==load_auto) cfg->exposure = __builtin_nanf("");
if (image==NULL) return UFRAW_SUCCESS;

View file

@ -1,2 +1,5 @@
bin/ufraw
bin/ufraw-batch
libexec/gimp/2.2/plug-ins/ufraw-gimp
share/applications/ufraw.desktop
share/pixmaps/ufraw.png

View file

@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= gimp-ufraw
PORTVERSION= 0.4
PORTVERSION= 0.5
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ufraw
@ -18,11 +18,21 @@ BUILD_DEPENDS= gimp:${PORTSDIR}/graphics/gimp
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack intltool intlhack gtk20 libartlgpl2
WANT_GNOME= yes
ALL_TARGET= build
INSTALL_TARGET= install-admin
.include <bsd.port.mk>
CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
CFLAGS="${CFLAGS} -I ${LOCALBASE}/include"
MAN1= ufraw.1
.include <bsd.port.pre.mk>
.if ${OSVERSION} <= 600000
BROKEN= "Needs memmem(3)"
.endif
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
MD5 (ufraw-0.4.tar.gz) = c66a2498b3fb74eef6f3b7ce5477d44a
SIZE (ufraw-0.4.tar.gz) = 101409
MD5 (ufraw-0.5.tar.gz) = ffb0ac06e226b8412afcbfa7f242d87b
SIZE (ufraw-0.5.tar.gz) = 284234

View file

@ -1,26 +0,0 @@
--- ./Makefile.orig Tue Apr 19 23:53:14 2005
+++ ./Makefile Tue Apr 19 23:56:49 2005
@@ -17,7 +17,7 @@
OBJECTS := $(filter-out dcraw.o,$(OBJECTS))
endif
CC = gcc
-CFLAGS += -std=gnu99 -DUFRAW_VERSION='"$(VER)"'
+CFLAGS += -std=gnu99 -DUFRAW_VERSION='"$(VER)"' -I/usr/local/include
# To check that deprecated features are not used:
#CFLAGS += -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
LDFLAGS += -llcms
@@ -91,12 +91,12 @@
ifdef UFRAW_NO_JPEG
CFLAGS += -DNO_JPEG
else
- LDFLAGS += -ljpeg
+ LDFLAGS += -L/usr/local/lib -ljpeg
endif
ifdef UFRAW_NO_TIFF
CFLAGS += -DNO_TIFF
else
- LDFLAGS += -ltiff
+ LDFLAGS += -L/usr/local/lib -ltiff
endif
ifdef UFRAW_NO_ZLIB
CFLAGS += -DNO_ZLIB

View file

@ -0,0 +1,11 @@
--- dcraw.c.orig Thu Sep 15 19:24:38 2005
+++ dcraw.c Thu Oct 27 21:16:01 2005
@@ -188,7 +188,7 @@
3 G R G R G R 3 B G B G B G 3 R G R G R G 3 G B G B G B
*/
-#ifndef __GLIBC__
+#if !defined(__GLIBC__) && !defined(__FreeBSD__)
char *memmem (char *haystack, size_t haystacklen,
char *needle, size_t needlelen)
{

View file

@ -1,11 +0,0 @@
--- ./ufraw_ufraw.c.orig Sun Apr 10 15:19:43 2005
+++ ./ufraw_ufraw.c Sun Apr 10 15:20:06 2005
@@ -123,7 +123,7 @@
for (i=0; i<cfg->curveCount; i++)
cfg->curve[i].black = cfg_default.curve[0].black;
}
- if (cfg->exposureLoad==load_auto) cfg->exposure = nan("");
+ if (cfg->exposureLoad==load_auto) cfg->exposure = __builtin_nanf("");
if (image==NULL) return UFRAW_SUCCESS;

View file

@ -1,2 +1,5 @@
bin/ufraw
bin/ufraw-batch
libexec/gimp/2.2/plug-ins/ufraw-gimp
share/applications/ufraw.desktop
share/pixmaps/ufraw.png