Index: head/graphics/digikam/Makefile =================================================================== --- head/graphics/digikam/Makefile (revision 126034) +++ head/graphics/digikam/Makefile (revision 126035) @@ -1,41 +1,37 @@ # New ports collection makefile for: digikam # Date created: 3 February 2003 # Whom: Arjan van Leeuwen # # $FreeBSD$ # PORTNAME= digikam PORTVERSION= 0.7 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= avleeuwen@piwebs.com COMMENT= Photo album manager for KDE with gphoto2 backend LIB_DEPENDS= kexif.0:${PORTSDIR}/graphics/libkexif \ kipi.0:${PORTSDIR}/graphics/libkipi \ gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \ Imlib2.2:${PORTSDIR}/graphics/imlib2 \ gdbm.3:${PORTSDIR}/databases/gdbm USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_KDELIBS_VER=3 USE_REINPLACE= yes CONFIGURE_ARGS+=--program-prefix='' INSTALLS_SHLIB= yes .include -.if ${OSVERSION} < 500000 -BROKEN= "Does not compile on FreeBSD 4.x" -.endif - post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/${CONFIGURE_SCRIPT} .include Property changes on: head/graphics/digikam/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.10 \ No newline at end of property +1.11 \ No newline at end of property Index: head/graphics/digikam/files/patch-externc =================================================================== --- head/graphics/digikam/files/patch-externc (nonexistent) +++ head/graphics/digikam/files/patch-externc (revision 126035) @@ -0,0 +1,64 @@ +--- digikam/digikam/digikamfirstrun.cpp.orig Wed Jan 5 10:40:08 2005 ++++ digikam/digikam/digikamfirstrun.cpp Wed Jan 5 10:40:39 2005 +@@ -20,15 +20,6 @@ + * + * ============================================================ */ + +-// C Ansi includes. +- +-extern "C" +-{ +-#include +-#include +-#include +-} +- + // C++ Includes. + + #include +@@ -65,6 +56,15 @@ + #include "firstrunUI.h" + + #include ++// C Ansi includes. ++ ++extern "C" ++{ ++#include ++#include ++#include ++} ++ + using namespace std; + + DigikamFirstRun::DigikamFirstRun( KConfig* config, +--- digikam/utilities/imageeditor/imlibinterface.cpp.orig Wed Jan 5 10:45:12 2005 ++++ digikam/utilities/imageeditor/imlibinterface.cpp Wed Jan 5 10:45:29 2005 +@@ -22,13 +22,6 @@ + + #define PI 3.14159265 + +-// Lib Tiff includes. +- +-extern "C" +-{ +-#include +-} +- + // C++ includes. + + #include +@@ -59,6 +52,13 @@ + #include "albumsettings.h" + #include "imlibinterface.h" + ++// Lib Tiff includes. ++ ++extern "C" ++{ ++#include ++} ++ + namespace Digikam + { + Property changes on: head/graphics/digikam/files/patch-externc ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/graphics/digikam-kde4/Makefile =================================================================== --- head/graphics/digikam-kde4/Makefile (revision 126034) +++ head/graphics/digikam-kde4/Makefile (revision 126035) @@ -1,41 +1,37 @@ # New ports collection makefile for: digikam # Date created: 3 February 2003 # Whom: Arjan van Leeuwen # # $FreeBSD$ # PORTNAME= digikam PORTVERSION= 0.7 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= avleeuwen@piwebs.com COMMENT= Photo album manager for KDE with gphoto2 backend LIB_DEPENDS= kexif.0:${PORTSDIR}/graphics/libkexif \ kipi.0:${PORTSDIR}/graphics/libkipi \ gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \ Imlib2.2:${PORTSDIR}/graphics/imlib2 \ gdbm.3:${PORTSDIR}/databases/gdbm USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_KDELIBS_VER=3 USE_REINPLACE= yes CONFIGURE_ARGS+=--program-prefix='' INSTALLS_SHLIB= yes .include -.if ${OSVERSION} < 500000 -BROKEN= "Does not compile on FreeBSD 4.x" -.endif - post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/${CONFIGURE_SCRIPT} .include Property changes on: head/graphics/digikam-kde4/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.10 \ No newline at end of property +1.11 \ No newline at end of property Index: head/graphics/digikam-kde4/files/patch-externc =================================================================== --- head/graphics/digikam-kde4/files/patch-externc (nonexistent) +++ head/graphics/digikam-kde4/files/patch-externc (revision 126035) @@ -0,0 +1,64 @@ +--- digikam/digikam/digikamfirstrun.cpp.orig Wed Jan 5 10:40:08 2005 ++++ digikam/digikam/digikamfirstrun.cpp Wed Jan 5 10:40:39 2005 +@@ -20,15 +20,6 @@ + * + * ============================================================ */ + +-// C Ansi includes. +- +-extern "C" +-{ +-#include +-#include +-#include +-} +- + // C++ Includes. + + #include +@@ -65,6 +56,15 @@ + #include "firstrunUI.h" + + #include ++// C Ansi includes. ++ ++extern "C" ++{ ++#include ++#include ++#include ++} ++ + using namespace std; + + DigikamFirstRun::DigikamFirstRun( KConfig* config, +--- digikam/utilities/imageeditor/imlibinterface.cpp.orig Wed Jan 5 10:45:12 2005 ++++ digikam/utilities/imageeditor/imlibinterface.cpp Wed Jan 5 10:45:29 2005 +@@ -22,13 +22,6 @@ + + #define PI 3.14159265 + +-// Lib Tiff includes. +- +-extern "C" +-{ +-#include +-} +- + // C++ includes. + + #include +@@ -59,6 +52,13 @@ + #include "albumsettings.h" + #include "imlibinterface.h" + ++// Lib Tiff includes. ++ ++extern "C" ++{ ++#include ++} ++ + namespace Digikam + { + Property changes on: head/graphics/digikam-kde4/files/patch-externc ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property