svn commit: r318641 - in head/graphics/cinepaint: . files
Martin Wilke
miwi at FreeBSD.org
Tue May 21 05:43:30 UTC 2013
Author: miwi
Date: Tue May 21 05:43:22 2013
New Revision: 318641
URL: http://svnweb.freebsd.org/changeset/ports/318641
Log:
- Update to 1.0.4
PR: 178595
Submitted by: Ports Fury
Added:
head/graphics/cinepaint/files/patch-app__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-app__cms.c (contents, props changed)
head/graphics/cinepaint/files/patch-app__depth__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-app__gradient.c (contents, props changed)
head/graphics/cinepaint/files/patch-app__install.c (contents, props changed)
head/graphics/cinepaint/files/patch-app__layers_dialog.c (contents, props changed)
head/graphics/cinepaint/files/patch-app__main.c (contents, props changed)
head/graphics/cinepaint/files/patch-app__menus.c (contents, props changed)
head/graphics/cinepaint/files/patch-cinepaint-gtk.pc.in (contents, props changed)
head/graphics/cinepaint/files/patch-cinepainttool.in (contents, props changed)
head/graphics/cinepaint/files/patch-configure.in (contents, props changed)
head/graphics/cinepaint/files/patch-lib__fl_i18n__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__blur__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__jhead__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__cineon__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__collect__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__compose__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__dbbrowser__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__decompose__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__dicom__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__edge__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__fits__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__gauss_rle__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__gbr__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__hdr__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__iff__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__iol__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__jpeg__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__mblur__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__median__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__minimum__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__noisify__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__openexr__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__pdf__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__pdf__pdf.cpp (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__pic__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__png__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__png__png.c (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__pnm__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__psd__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__psd_save__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__rawphoto__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__retinex__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__screenshot__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__script-fu__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__sgi__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__sharpen__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__snoise__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__sobel__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__spread__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__tga__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__tiff__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__unsharp__Makefile.am (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins__xwd__Makefile.am (contents, props changed)
Modified:
head/graphics/cinepaint/Makefile
head/graphics/cinepaint/distinfo (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins-icc_examin-icc_examin_icc_helfer_fltk.cpp (contents, props changed)
head/graphics/cinepaint/files/patch-plug-ins-png-png.c (contents, props changed)
head/graphics/cinepaint/pkg-plist (contents, props changed)
Modified: head/graphics/cinepaint/Makefile
==============================================================================
--- head/graphics/cinepaint/Makefile Tue May 21 04:42:48 2013 (r318640)
+++ head/graphics/cinepaint/Makefile Tue May 21 05:43:22 2013 (r318641)
@@ -1,76 +1,83 @@
-# New ports collection makefile for: cinepaint
-# Date created: 11 Oct 2003
-# Whom: David Yeske <dyeske at gmail.com>
-#
+# Created by: David Yeske <dyeske at gmail.com>
# $FreeBSD$
-#
PORTNAME= cinepaint
-PORTVERSION= 0.22
-PORTREVISION= 10
+DISTVERSION= 1.0-4
CATEGORIES= graphics
-MASTER_SITES= SF/${PORTNAME}/CinePaint/CinePaint-${PORTVERSION}-1
-DISTNAME= ${PORTNAME}-${PORTVERSION}-1
+MASTER_SITES= SF/${PORTNAME}/CinePaint/CinePaint-${DISTVERSION}
MAINTAINER= ports at FreeBSD.org
-COMMENT= An editing tool used for painting and retouching of movies
+COMMENT= Editing tool used for painting and retouching of movies
-LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
+LICENSE= GPLv2 LGPL21 MIT
+LICENSE_COMB= multi
+
+LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \
+ ftgl:${PORTSDIR}/graphics/ftgl \
+ jpeg:${PORTSDIR}/graphics/jpeg \
+ lcms:${PORTSDIR}/graphics/lcms \
png15:${PORTSDIR}/graphics/png \
- lcms.1:${PORTSDIR}/graphics/lcms \
- tiff.4:${PORTSDIR}/graphics/tiff \
- ftgl.2:${PORTSDIR}/graphics/ftgl
+ tiff:${PORTSDIR}/graphics/tiff \
+ fltk:${PORTSDIR}/x11-toolkits/fltk
-USE_AUTOTOOLS= libtool
-GNU_CONFIGURE= yes
+OPTIONS_DEFINE= OYRANOS PRINT
+OYRANOS_DESC= ICC profile support via Oyranos
+PRINT_DESC= Gutenprint (gimp-print) plugin
+
+USES= gettext pkgconfig
+USE_XORG= xmu
+USE_GNOME= gtk20
+USE_GHOSTSCRIPT_RUN=yes
USE_PYTHON= yes
-USE_GNOME= gtk12
-USES= gettext
+USE_GMAKE= yes
+USE_AUTOTOOLS= libtoolize aclocal automake autoconf
+LIBTOOLIZE_ARGS=--force
+ACLOCAL_ARGS= -I aclocal
+AUTOMAKE_ARGS= --copy --force-missing --foreign
USE_LDCONFIG= yes
-USE_XORG= xpm xi xext xft xinerama
-
-MAN1= cinepaint.1 cinepainttool.1
-
-PLIST_SUB= VER=${PORTVERSION}-1
+MAKE_JOBS_SAFE= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-1
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS_DEFINE= OPENEXR
-OPTIONS_DEFAULT= OPENEXR
-OPENEXR_DESC= Use OpenEXR
+PLIST_SUB= VER="${DISTVERSION}"
-CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -lintl
+MAN1= cinepaint.1 cinepainttool.1
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MOPENEXR}
-LIB_DEPENDS+= IlmImf:${PORTSDIR}/graphics/OpenEXR \
- fltk.1:${PORTSDIR}/x11-toolkits/fltk
-CONFIGURE_ARGS+= --with-openexr-prefix=${LOCALBASE}
-CFLAGS+= -I${LOCALBASE}/include/openEXR
-PLIST_SUB+= OPENEXR:=""
+.if ${PORT_OPTIONS:MOYRANOS}
+LIB_DEPENDS+= oyranos:${PORTSDIR}/graphics/oyranos
.else
-PLIST_SUB+= OPENEXR:="@comment "
+CONFIGURE_ENV+= ac_cv_path_OY_CONFIG=no
.endif
-CPPFLAGS+= ${CFLAGS}
+.if ${PORT_OPTIONS:MPRINT}
+LIB_DEPENDS+= gutenprint:${PORTSDIR}/print/gutenprint-base
+PLIST_SUB+= PRINT=""
+.else
+CONFIGURE_ARGS+= --disable-print
+PLIST_SUB+= PRINT="@comment "
+.endif
+
+post-extract:
+ @${LN} -sf gimprc.in ${WRKSRC}/cinepaintrc.in
+ @${LN} -sf gimprc_user.in ${WRKSRC}/cinepaintrc_user.in
post-patch:
@${REINPLACE_CMD} -e \
- 's| -Wall||' \
- ${WRKSRC}/configure
-
- @${REINPLACE_CMD} -E -e \
- 's|-LINUX.+$$|| ; s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.in
-
+ '/^pkgconfigdir/s|$$(libdir)|$$(prefix)/libdata| ; \
+ s|gimprc|cinepaintrc|g' \
+ ${WRKSRC}/Makefile.am
+ @${REINPLACE_CMD} -e \
+ '/cms-profile-path/s|".*"|"${LOCALBASE}/share/color/icc"| ; \
+ s|/usr/share|${LOCALBASE}/share|' \
+ ${WRKSRC}/cinepaintrc.in
+ @${REINPLACE_CMD} -e \
+ 's|gimprc|cinepaintrc|g' \
+ ${WRKSRC}/user_install.in
@${REINPLACE_CMD} -e \
's|static GDrawableType|static GImageType|' \
${WRKSRC}/plug-ins/psd/psd.c
- @${FIND} ${WRKSRC} -type f -name "*.c" -o -name "*.cpp" -o -name "*.cxx" -o -name "*.h" | ${XARGS} \
- ${REINPLACE_CMD} -e '/^#include <FL/s|.h>$$|.H>|; /^#include "FL/s|.h"$$|.H"|; \
- s|fl_file_chooser.H|Fl_File_Chooser.H|g; s|#include <Fl|#include <FL|g; s|<FL/gl.H>|<FL/gl.h>|'
-
.include <bsd.port.mk>
Modified: head/graphics/cinepaint/distinfo
==============================================================================
--- head/graphics/cinepaint/distinfo Tue May 21 04:42:48 2013 (r318640)
+++ head/graphics/cinepaint/distinfo Tue May 21 05:43:22 2013 (r318641)
@@ -1,2 +1,2 @@
-SHA256 (cinepaint-0.22-1.tar.gz) = bb08a9210658959772df12408769d660999ede168b7431514e1f3cead07c0fea
-SIZE (cinepaint-0.22-1.tar.gz) = 12380745
+SHA256 (cinepaint-1.0-4.tar.gz) = 57a748ed4b9ce93ace379a5476f815e741a863425a6d5181646b49e7cba2578e
+SIZE (cinepaint-1.0-4.tar.gz) = 12167016
Added: head/graphics/cinepaint/files/patch-app__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-app__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- app/Makefile.am.orig
++++ app/Makefile.am
+@@ -420,7 +420,8 @@
+ $(GTK_LIBS) \
+ $(X_LIBS) \
+ $(OYRANOS_LIBS) \
+- $(LCMS_LIB)
++ $(LCMS_LIB) \
++ -lm
+
+ cinepaint_remote_LDADD = \
+ $(GTK_LIBS) \
Added: head/graphics/cinepaint/files/patch-app__cms.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-app__cms.c Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,263 @@
+--- app/cms.c.orig
++++ app/cms.c
+@@ -37,16 +37,9 @@
+ #endif
+
+ #ifdef HAVE_OY
+-#include <oyranos/oyranos.h>
+-#ifndef OYRANOS_VERSION
+-#define OYRANOS_VERSION 0
+-#endif
+-#if OYRANOS_VERSION < 108
+-#include <arpa/inet.h> /* ntohl */
+-#include <oyranos/oyranos_monitor.h>
+-#else
+-#include <oyranos/oyranos_alpha.h>
+-#endif
++#include <oyranos_devices.h>
++#include <oyObject_s.h>
++#include <oyProfiles_s.h>
+ #endif
+
+ #include "config.h"
+@@ -114,7 +107,7 @@
+ cmsHPROFILE handle;
+ char *data; /* save original data for profile i/o */
+ size_t size;
+- char cspace[8];
++ const char *cspace;
+ };
+
+ /* same for transform */
+@@ -348,7 +341,7 @@
+
+ #ifdef HAVE_OY
+ # if OYRANOS_VERSION > 107
+-int iccMessageFunc( int code, const oyStruct_s * context, const char * format, ... )
++int iccMessageFunc( int code, const oyPointer * context, const char * format, ... )
+ {
+ char* text = 0, *pos = 0;
+ va_list list;
+@@ -359,10 +352,10 @@
+ return 0;
+
+
+- if(context && oyOBJECT_NONE < context->type_)
++ if(context && oyOBJECT_NONE < ((oyStruct_s*)context)->type_)
+ {
+- type_name = oyStruct_TypeToText( context );
+- id = oyObject_GetId( context->oy_ );
++ type_name = oyStruct_TypeToText( (oyStruct_s*)context );
++ id = oyObject_GetId( ((oyStruct_s*)context)->oy_ );
+ }
+
+ text = (char*)calloc(sizeof(char), 4096);
+@@ -463,7 +456,7 @@
+ const char *display_name = gdk_get_display ();
+
+ test = oyGetMonitorProfile( display_name, &test_size, my_alloc_func );
+- printf("%s:%d %s() monitor profile size: %d\n",__FILE__,__LINE__,__func__,
++ printf("%s:%d %s() monitor profile size: %lu\n",__FILE__,__LINE__,__func__,
+ test_size );
+
+ if (test == NULL || !test_size)
+@@ -566,36 +559,36 @@
+
+ const char*
+ cms_get_color_space_name (cmsHPROFILE hProfile)
+-{ static gchar name[10];
++{ static char *name = 10;
+
+ switch (cmsGetColorSpace (hProfile))
+ {
+- case icSigXYZData: sprintf(name, _("XYZ")); break;
+- case icSigLabData: sprintf(name, _("Lab")); break;
+- case icSigLuvData: sprintf(name, _("Luv")); break;
+- case icSigYCbCrData: sprintf(name, _("YCbCr")); break;
+- case icSigYxyData: sprintf(name, _("Yxy")); break;
+- case icSigRgbData: sprintf(name, _("Rgb")); break;
+- case icSigGrayData: sprintf(name, _("Gray")); break;
+- case icSigHsvData: sprintf(name, _("Hsv")); break;
+- case icSigHlsData: sprintf(name, _("Hls")); break;
+- case icSigCmykData: sprintf(name, _("Cmyk")); break;
+- case icSigCmyData: sprintf(name, _("Cmy")); break;
+- case icSig2colorData: sprintf(name, _("2color")); break;
+- case icSig3colorData: sprintf(name, _("3color")); break;
+- case icSig4colorData: sprintf(name, _("4color")); break;
+- case icSig5colorData: sprintf(name, _("5color")); break;
+- case icSig6colorData: sprintf(name, _("6color")); break;
+- case icSig7colorData: sprintf(name, _("7color")); break;
+- case icSig8colorData: sprintf(name, _("8color")); break;
+- case icSig9colorData: sprintf(name, _("9color")); break;
+- case icSig10colorData: sprintf(name, _("10color")); break;
+- case icSig11colorData: sprintf(name, _("11color")); break;
+- case icSig12colorData: sprintf(name, _("12color")); break;
+- case icSig13colorData: sprintf(name, _("13color")); break;
+- case icSig14colorData: sprintf(name, _("14color")); break;
+- case icSig15colorData: sprintf(name, _("15color")); break;
+- default: name[0] = '\0';
++ case icSigXYZData: name = _("XYZ"); break;
++ case icSigLabData: name = _("Lab"); break;
++ case icSigLuvData: name = _("Luv"); break;
++ case icSigYCbCrData: name = _("YCbCr"); break;
++ case icSigYxyData: name = _("Yxy"); break;
++ case icSigRgbData: name = _("Rgb"); break;
++ case icSigGrayData: name = _("Gray"); break;
++ case icSigHsvData: name = _("Hsv"); break;
++ case icSigHlsData: name = _("Hls"); break;
++ case icSigCmykData: name = _("Cmyk"); break;
++ case icSigCmyData: name = _("Cmy"); break;
++ case icSig2colorData: name = _("2color"); break;
++ case icSig3colorData: name = _("3color"); break;
++ case icSig4colorData: name = _("4color"); break;
++ case icSig5colorData: name = _("5color"); break;
++ case icSig6colorData: name = _("6color"); break;
++ case icSig7colorData: name = _("7color"); break;
++ case icSig8colorData: name = _("8color"); break;
++ case icSig9colorData: name = _("9color"); break;
++ case icSig10colorData: name = _("10color"); break;
++ case icSig11colorData: name = _("11color"); break;
++ case icSig12colorData: name = _("12color"); break;
++ case icSig13colorData: name = _("13color"); break;
++ case icSig14colorData: name = _("14color"); break;
++ case icSig15colorData: name = _("15color"); break;
++ default: name = "";
+ }
+
+ return name;
+@@ -603,17 +596,16 @@
+
+ const char**
+ cms_get_color_space_channel_names (cmsHPROFILE hProfile)
+-{ static char** name = 0;
++{ static char* name[5] = {0,0,0,0,0};
+ const char** ret = 0;
+- if(!name)
++ if(!name[0])
+ { int i;
+- name=(char**)calloc(sizeof(char**),4);
+ for(i = 0; i < 4; ++i)
+- name[i] = (char*)calloc(sizeof(char*),36);
++ name[i] = (char*)calloc(sizeof(char),128);
+ }
++ sprintf(name[0], "---");
+ sprintf(name[1], "---");
+ sprintf(name[2], "---");
+- sprintf(name[3], "---");
+
+ ret = (const char**) name;
+ sprintf( name[3],_("Alpha"));
+@@ -683,7 +675,7 @@
+
+ const char*
+ cms_get_device_class_name (cmsHPROFILE hProfile)
+-{ static char class[15];
++{ static char class[128];
+
+ switch (cmsGetDeviceClass (hProfile))
+ {
+@@ -1193,6 +1185,8 @@
+ */
+ const char * cms_get_profile_cspace ( CMSProfile * profile )
+ {
++ if(!profile->cspace)
++ return "";
+ return profile->cspace;
+ }
+
+@@ -1222,22 +1216,21 @@
+ #ifdef HAVE_OY
+ if ( profile == NULL )
+ {
++ char *pp_name = NULL;
+ /* add path to non pathnamed file names */
+ if(file_name && !strchr(file_name, OY_SLASH_C))
+ {
+- char *pp_name = oyGetPathFromProfileName( file_name, my_alloc_func );
++ pp_name = oyGetPathFromProfileName( file_name, my_alloc_func );
+
+ if(pp_name && strlen(pp_name))
+ {
+ fullFileName = (char*) calloc (MAX_PATH, sizeof(char));;
+ sprintf(fullFileName, "%s%s%s", pp_name, OY_SLASH, file_name);;
+ }
+- if(pp_name) free(pp_name);
+ } else
+ /* catch non correct paths */
+ if(file_name && strchr(file_name, OY_SLASH_C))
+ {
+- char *pp_name = NULL;
+ char *ptr = NULL;
+
+ ptr = strrchr(file_name, OY_SLASH_C);
+@@ -1251,12 +1244,13 @@
+ fullFileName = (char*) calloc (MAX_PATH, sizeof(char));;
+ sprintf(fullFileName, "%s%s%s", pp_name, OY_SLASH, ptr);;
+ }
+- if(pp_name) free(pp_name);
+ }
+ }
+
+ /* give lcms */
+- profile = cmsOpenProfileFromFile (fullFileName, "r");
++ if (pp_name);
++ profile = cmsOpenProfileFromFile (fullFileName, "r");
++ if (pp_name) free(pp_name);
+ }
+ #endif
+
+@@ -1282,8 +1276,7 @@
+ return_value = g_new(CMSProfile, 1);
+ return_value->cache_key = strdup(cms_get_profile_keyname(profile,mem));
+ return_value->handle = profile;
+- sprintf( return_value->cspace,
+- cms_get_color_space_name( return_value->handle ) );
++ return_value->cspace = cms_get_color_space_name( return_value->handle );
+
+ /* save an copy of the original icc profile to mem */
+ return_value->size = 0;
+@@ -1336,8 +1329,7 @@
+ return_value = g_new(CMSProfile, 1);
+ return_value->cache_key = strdup(cms_get_profile_keyname(profile,mem_pointer));
+ return_value->handle = profile;
+- sprintf( return_value->cspace,
+- cms_get_color_space_name( return_value->handle ) );
++ return_value->cspace = cms_get_color_space_name( return_value->handle );
+
+ cache_entry = g_new(ProfileCacheEntry, 1);
+ cache_entry->ref_count = 1;
+@@ -2689,7 +2681,7 @@
+
+ GSList *profile_file_names = 0;
+ GSList *iterator = 0;
+- gchar *current_filename;
++ gchar *current_long_fname;
+ CMSProfile *current_profile;
+ CMSProfileInfo *current_profile_info;
+ int pos = can_select_none ? 1 : 0, select_pos = -1;
+@@ -2720,16 +2712,20 @@
+
+ while (iterator != NULL)
+ {
+- current_filename = iterator->data;
+- current_profile = cms_get_profile_from_file(current_filename);
++ const char *file_name;
++ current_long_fname = iterator->data;
++ file_name = current_long_fname;
++ if(strrchr(file_name,'/'))
++ file_name = strrchr(file_name,'/') + 1;
++ current_profile = cms_get_profile_from_file(current_long_fname);
+ current_profile_info = cms_get_profile_info(current_profile);
+ if(prefered_name && strlen(prefered_name) &&
+- strcmp( current_filename, prefered_name ) == 0 )
++ strcmp( file_name, prefered_name ) == 0 )
+ select_pos = pos;
+- sprintf(label_text, "%s (%s)", current_profile_info->description, current_filename);
++ sprintf(label_text, "%s (%s)", current_profile_info->description, current_long_fname);
+ menuitem = gtk_menu_item_new_with_label (label_text);
+ gtk_menu_append (GTK_MENU (menu), menuitem);
+- gtk_object_set_data_full(GTK_OBJECT(menuitem), "value", (gpointer)current_filename, g_free);
++ gtk_object_set_data_full(GTK_OBJECT(menuitem), "value", (gpointer)current_long_fname, g_free);
+
+ cms_return_profile(current_profile);
+
Added: head/graphics/cinepaint/files/patch-app__depth__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-app__depth__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- app/depth/Makefile.am.orig
++++ app/depth/Makefile.am
+@@ -11,7 +11,8 @@
+
+ libdepth_la_LIBADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+- $(GTK_LIBS)
++ $(GTK_LIBS) \
++ -lm
+
+ libdepth_la_SOURCES = \
+ bezier_select.c \
Added: head/graphics/cinepaint/files/patch-app__gradient.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-app__gradient.c Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,11 @@
+--- app/gradient.c.orig
++++ app/gradient.c
+@@ -5452,7 +5452,7 @@
+ g_message (_("Corrupt segment %d in gradient file '%s'."),
+ i, filename);
+ fclose (file);
+- return NULL;
++ return;
+ }
+ #else
+ if (sscanf(line, "%lf%lf%lf%lf%lf%lf%lf%lf%lf%lf%lf%d%d",
Added: head/graphics/cinepaint/files/patch-app__install.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-app__install.c Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,11 @@
+--- app/install.c.orig
++++ app/install.c
+@@ -475,7 +475,7 @@
+
+ CP_TEXT_INSERT( font_strong, _("User Installation Log\n\n") );
+
+-#if 1
++#if 0
+ { const char* msg = UserInstall(gimp_directory());
+ if(msg)
+ {
Added: head/graphics/cinepaint/files/patch-app__layers_dialog.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-app__layers_dialog.c Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,11 @@
+--- app/layers_dialog.c.orig
++++ app/layers_dialog.c
+@@ -2773,7 +2773,7 @@
+ # ifdef DEBUG
+ printf("%s:%d %s() wrong data or widget\n", __FILE__,__LINE__,__func__);
+ # endif
+- return FALSE;
++ return;
+ }
+
+
Added: head/graphics/cinepaint/files/patch-app__main.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-app__main.c Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,21 @@
+--- app/main.c.orig
++++ app/main.c
+@@ -448,7 +448,8 @@
+ #ifdef WIN32
+
+ #else
+-# ifndef DEBUG_
++ if (use_debug_handler)
++ {
+ /* Handle some signals */
+ signal (SIGHUP, on_signal);
+ signal (SIGINT, on_signal);
+@@ -466,7 +467,7 @@
+ /* Handle shmem reload */
+ signal( SIGUSR2, on_sig_refresh);
+ # endif
+-# endif /* DEBUG */
++ }
+ #endif
+ /* Keep the command line arguments--for use in gimp_init */
+ gimp_argc = argc - 1;
Added: head/graphics/cinepaint/files/patch-app__menus.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-app__menus.c Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,25 @@
+--- app/menus.c.orig
++++ app/menus.c
+@@ -1597,7 +1597,7 @@
+ char*
+ menu_entry_translate (const char* entry)
+ {
+- char *text = (char*) calloc (1024, sizeof(char)),
++ char *text = (char*) calloc (sizeof(char), 1024),
+ *word = 0;
+ const char *tmp = 0;
+
+@@ -1647,11 +1647,11 @@
+ // resize memory
+ if(strlen(text))
+ {
+- word = (char*) calloc( strlen(text) + 1, sizeof(char) );
++ word = (char*) calloc( sizeof(char), strlen(text) + 4 );
+ memcpy( word, text, strlen( text ) + 1 );
+ free (text);
+ return word;
+ }
+ else
+- return (char*) calloc(1,sizeof(char));
++ return (char*) calloc(sizeof(char),1);
+ }
Added: head/graphics/cinepaint/files/patch-cinepaint-gtk.pc.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-cinepaint-gtk.pc.in Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- cinepaint-gtk.pc.in.orig
++++ cinepaint-gtk.pc.in
+@@ -11,6 +11,7 @@
+ Name: cinepaint-gtk
+ Description: Cinepaint Plug-In Library Using GTK+
+ Version: @MAJOR_VERSION at .@MINOR_VERSION@
+-Libs: -L${libdir} -lcinepaint @GTK_LIBS@
+-Cflags: -I${includedir} @GTK_CFLAGS@
++Requires: gtk+-2.0
++Libs: -L${libdir} -lcinepaint
++Cflags: -I${includedir}
+
Added: head/graphics/cinepaint/files/patch-cinepainttool.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-cinepainttool.in Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,23 @@
+--- cinepainttool.in.orig
++++ cinepainttool.in
+@@ -166,7 +166,7 @@
+ ;;
+ --cflags-local)
+ my_gtk_cflags=$gtk_cflags
+- echo -I at abs_top_srcdir@ -I at abs_top_srcdir@/lib $my_gtk_cflags
++ echo $my_gtk_cflags
+ ;;
+ --libs | --libs-nocinepaintui)
+ my_gtk_libs=
+@@ -198,8 +198,9 @@
+ my_gtk_libs="$my_gtk_libs $i"
+ fi
+ done
+- export `cat @abs_top_srcdir@/lib/libcinepaint.la | grep dlname | sed s/\'//g`
+- echo @abs_top_srcdir@/lib/.libs/$dlname $my_gtk_libs
++ export `cat @libdir@/libcinepaint.la | grep dlname | sed -e s/\'//g -e s/dlname/dlname1/`
++ export `cat @libdir@/libcinepainthalf.la | grep dlname | sed -e s/\'//g -e s/dlname/dlname2/`
++ echo @libdir@/$dlname1 @libdir@/$dlname2 $my_gtk_libs
+ ;;
+ --libs-noui)
+ glib_ldflags=`echo $gtk_libs | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'`
Added: head/graphics/cinepaint/files/patch-configure.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-configure.in Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,43 @@
+--- configure.in.orig 2013-05-06 05:19:29.000000000 +0900
++++ configure.in 2013-05-09 01:25:06.000000000 +0900
+@@ -2,7 +2,7 @@
+
+ prefix=/usr/bin
+
+-AC_INIT(gimprc.in)
++AC_INIT(cinepaintrc.in)
+ AM_CONFIG_HEADER(lib/config.h)
+
+ dnl Initialize automake stuff
+@@ -109,7 +109,7 @@
+ dnl check for pkg-config
+ export PKG_CONFIG_PATH
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-if test "x$PKG_CONFIG" == "xno"; then
++if test "x$PKG_CONFIG" = "xno"; then
+ AC_MSG_WARN([
+ *** Check for pkg-config failed. Many packages requires it.
+ *** You can download it from http://pkgconfig.sourceforge.net/ .])
+@@ -517,9 +517,9 @@
+ if test "x$FLTK_CONFIG" != "xno"; then
+ FLTK_CONFIG="$FLTK_CONFIG"
+ FLTK_LDFLAGS="`$FLTK_CONFIG --use-images --ldflags | sed \"$STRIPOPT\"`"
+- FLTK_LIBS_PURE="`echo $FLTK_LDFLAGS | sed 's/-O.// ; s/-isysroot /-L/ ; s/-arch ppc// ; s/-arch i386//'`"
++ FLTK_LIBS_PURE="`echo $FLTK_LDFLAGS | sed 's/ -O. // ; s/-isysroot /-L/ ; s/-arch ppc// ; s/-arch i386//'`"
+ FLTK_LIBS="\$(top_builddir)/lib/fl_i18n/libcinepaint_fl_i18n.la $FLTK_LIBS_PURE"
+- FLTK_CFLAGS=`$FLTK_CONFIG --cxxflags | sed 's/-O.// ; s/-isysroot /-L/ ; s/-arch ppc// ; s/-arch i386//'`
++ FLTK_CFLAGS=`$FLTK_CONFIG --cxxflags | sed 's/ -O. // ; s/-isysroot /-L/ ; s/-arch ppc// ; s/-arch i386//'`
+ else
+ AC_MSG_WARN([
+ *** Check for fltk-config failed. Depending plug-ins may not compile.
+@@ -818,8 +818,8 @@
+ AC_OUTPUT(
+ Makefile
+ user_install
+-gimprc
+-gimprc_user
++cinepaintrc
++cinepaintrc_user
+ cinepainttool
+ cinepaint-gtk.pc
+ cinepaint.spec
Added: head/graphics/cinepaint/files/patch-lib__fl_i18n__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-lib__fl_i18n__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- lib/fl_i18n/Makefile.am.orig
++++ lib/fl_i18n/Makefile.am
+@@ -26,8 +26,7 @@
+ -I$(top_srcdir) -I$(includedir)
+
+ libcinepaint_fl_i18n_la_LIBADD = \
+- $(FLTK_LIBS_PURE) \
+- -lc
++ $(FLTK_LIBS_PURE)
+
+ .PHONY: files
+
Modified: head/graphics/cinepaint/files/patch-plug-ins-icc_examin-icc_examin_icc_helfer_fltk.cpp
==============================================================================
--- head/graphics/cinepaint/files/patch-plug-ins-icc_examin-icc_examin_icc_helfer_fltk.cpp Tue May 21 04:42:48 2013 (r318640)
+++ head/graphics/cinepaint/files/patch-plug-ins-icc_examin-icc_examin_icc_helfer_fltk.cpp Tue May 21 05:43:22 2013 (r318641)
@@ -1,11 +0,0 @@
---- plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp.orig 2008-09-03 02:07:08.000000000 +0200
-+++ plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp 2008-09-03 02:08:02.000000000 +0200
-@@ -226,7 +226,7 @@
-
- int awake(void)
- {
-- Fl::awake(0);
-+ Fl::awake((void *)0);
- return 0;
- }
- int leerWait(void) { return 0; }
Modified: head/graphics/cinepaint/files/patch-plug-ins-png-png.c
==============================================================================
--- head/graphics/cinepaint/files/patch-plug-ins-png-png.c Tue May 21 04:42:48 2013 (r318640)
+++ head/graphics/cinepaint/files/patch-plug-ins-png-png.c Tue May 21 05:43:22 2013 (r318641)
@@ -1,28 +0,0 @@
---- plug-ins/png/png.c.orig 2006-11-24 21:52:55.000000000 +0100
-+++ plug-ins/png/png.c 2012-04-27 19:08:52.000000000 +0200
-@@ -59,6 +59,7 @@
- #include "libgimp/stdplugins-intl.h"
-
- #include <png.h> /* PNG library definitions */
-+#include <pngpriv.h>
-
- /*
- * Constants...
-@@ -405,7 +406,7 @@
- info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
-
-- if (setjmp (pp->jmpbuf))
-+ if (setjmp (png_jmpbuf(pp)))
- {
- g_message ("%s\nPNG error. File corrupted?", filename);
- return image;
-@@ -824,7 +825,7 @@
- info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
-
-- if (setjmp (pp->jmpbuf))
-+ if (setjmp (png_jmpbuf(pp)))
- {
- g_message ("%s\nPNG error. Couldn't save image", filename);
- return 0;
Added: head/graphics/cinepaint/files/patch-plug-ins__blur__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__blur__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- plug-ins/blur/Makefile.am.orig
++++ plug-ins/blur/Makefile.am
+@@ -18,8 +18,7 @@
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+ $(top_builddir)/libhalf/cinepaint_half.lo \
+- $(OPENEXR_LIBS) \
+- -lc
++ $(OPENEXR_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- plug-ins/bracketing_to_hdr/Makefile.am.orig
++++ plug-ins/bracketing_to_hdr/Makefile.am
+@@ -51,8 +51,7 @@
+ ./FL_adds/libfl_adds.la \
+ ./gui/libgui.la \
+ $(FLTK_LIBS) \
+- $(GTK_LIBS) \
+- -lc
++ $(GTK_LIBS)
+
+ DEPS = \
+ ./br_core/libbr_core.la \
Added: head/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__jhead__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__bracketing_to_hdr__jhead__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,11 @@
+--- plug-ins/bracketing_to_hdr/jhead/Makefile.am.orig
++++ plug-ins/bracketing_to_hdr/jhead/Makefile.am
+@@ -31,7 +31,7 @@
+ -I$(includedir)
+
+ LDADD = \
+- -lc -lm
++ -lm
+
+ .PHONY: files
+
Added: head/graphics/cinepaint/files/patch-plug-ins__cineon__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__cineon__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,11 @@
+--- plug-ins/cineon/Makefile.am.orig
++++ plug-ins/cineon/Makefile.am
+@@ -27,7 +27,7 @@
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- -lc
++ -lm
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__collect__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__collect__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,11 @@
+--- plug-ins/collect/Makefile.am.orig
++++ plug-ins/collect/Makefile.am
+@@ -23,7 +23,7 @@
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+ $(FLTK_LIBS) \
+- -lc
++ -lm
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la \
+ $(top_builddir)/lib/fl_i18n/libcinepaint_fl_i18n.la
Added: head/graphics/cinepaint/files/patch-plug-ins__compose__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__compose__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- plug-ins/compose/Makefile.am.orig
++++ plug-ins/compose/Makefile.am
+@@ -14,8 +14,7 @@
+
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+- $(X_LIBS) \
+- -lc
++ $(X_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__dbbrowser__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__dbbrowser__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- plug-ins/dbbrowser/Makefile.am.orig
++++ plug-ins/dbbrowser/Makefile.am
+@@ -19,8 +19,7 @@
+
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+- $(X_LIBS) \
+- -lc
++ $(X_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__decompose__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__decompose__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,13 @@
+--- plug-ins/decompose/Makefile.am.orig
++++ plug-ins/decompose/Makefile.am
+@@ -14,9 +14,7 @@
+
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+- $(X_LIBS) \
+- \
+- -lc
++ $(X_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__dicom__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__dicom__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- plug-ins/dicom/Makefile.am.orig
++++ plug-ins/dicom/Makefile.am
+@@ -14,8 +14,7 @@
+
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+- $(X_LIBS) \
+- -lc
++ $(X_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__edge__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__edge__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,13 @@
+--- plug-ins/edge/Makefile.am.orig
++++ plug-ins/edge/Makefile.am
+@@ -15,9 +15,8 @@
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+ $(OPENEXR_LIBS) \
+- -lc
++ -lm
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__fits__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__fits__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- plug-ins/fits/Makefile.am.orig
++++ plug-ins/fits/Makefile.am
+@@ -16,8 +16,7 @@
+
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+- $(X_LIBS) \
+- -lc
++ $(X_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__gauss_rle__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__gauss_rle__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- plug-ins/gauss_rle/Makefile.am.orig
++++ plug-ins/gauss_rle/Makefile.am
+@@ -15,8 +15,7 @@
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- \
+- -lc
++ -lm
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__gbr__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__gbr__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- plug-ins/gbr/Makefile.am.orig
++++ plug-ins/gbr/Makefile.am
+@@ -16,8 +16,7 @@
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+ $(top_builddir)/libhalf/cinepaint_half.lo \
+- $(OPENEXR_LIBS) \
+- -lc
++ $(OPENEXR_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__hdr__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__hdr__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- plug-ins/hdr/Makefile.am.orig
++++ plug-ins/hdr/Makefile.am
+@@ -20,8 +20,7 @@
+
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+- $(X_LIBS) \
+- -lc
++ $(X_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__iff__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__iff__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,13 @@
+--- plug-ins/iff/Makefile.am.orig
++++ plug-ins/iff/Makefile.am
+@@ -14,9 +14,7 @@
+
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+- $(X_LIBS) \
+- \
+- -lc
++ $(X_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__iol__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__iol__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- plug-ins/iol/Makefile.am.orig
++++ plug-ins/iol/Makefile.am
+@@ -35,9 +35,7 @@
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+ $(OPENEXR_LIBS) \
+- -lc \
+ -lm \
+ -lfl
+
Added: head/graphics/cinepaint/files/patch-plug-ins__jpeg__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__jpeg__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- plug-ins/jpeg/Makefile.am.orig
++++ plug-ins/jpeg/Makefile.am
+@@ -22,8 +22,7 @@
+ @LCMS_LIB@ \
+ @LIBJPEG_LIB@ \
+ $(top_builddir)/libhalf/cinepaint_half.lo \
+- $(OPENEXR_LIBS) \
+- -lc
++ $(OPENEXR_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__mblur__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__mblur__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,13 @@
+--- plug-ins/mblur/Makefile.am.orig
++++ plug-ins/mblur/Makefile.am
+@@ -15,9 +15,8 @@
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+ $(OPENEXR_LIBS) \
+- -lc
++ -lm
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__median__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__median__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- plug-ins/median/Makefile.am.orig
++++ plug-ins/median/Makefile.am
+@@ -16,8 +16,7 @@
+
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+- $(X_LIBS) \
+- -lc
++ $(X_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__minimum__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__minimum__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- plug-ins/minimum/Makefile.am.orig
++++ plug-ins/minimum/Makefile.am
+@@ -16,8 +16,7 @@
+
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+- $(X_LIBS) \
+- -lc
++ $(X_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__noisify__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__noisify__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- plug-ins/noisify/Makefile.am.orig
++++ plug-ins/noisify/Makefile.am
+@@ -16,8 +16,7 @@
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+ $(top_builddir)/libhalf/cinepaint_half.lo \
+- $(OPENEXR_LIBS) \
+- -lc
++ $(OPENEXR_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
Added: head/graphics/cinepaint/files/patch-plug-ins__openexr__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/cinepaint/files/patch-plug-ins__openexr__Makefile.am Tue May 21 05:43:22 2013 (r318641)
@@ -0,0 +1,12 @@
+--- plug-ins/openexr/Makefile.am.orig
++++ plug-ins/openexr/Makefile.am
+@@ -27,8 +27,7 @@
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list