From nobody@FreeBSD.org  Sun Oct  6 18:20:29 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 80DA81C5
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  6 Oct 2013 18:20:29 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 6F5792881
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  6 Oct 2013 18:20:29 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r96IKSZK073688
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 6 Oct 2013 18:20:28 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r96IKSSK073625;
	Sun, 6 Oct 2013 18:20:28 GMT
	(envelope-from nobody)
Message-Id: <201310061820.r96IKSSK073625@oldred.freebsd.org>
Date: Sun, 6 Oct 2013 18:20:28 GMT
From: Andras Horvath <han@log69.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: graphics/aaphoto cannot be built because of the default clang compiler
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         182772
>Category:       ports
>Synopsis:       graphics/aaphoto cannot be built because of the default clang compiler
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tijl
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 06 18:30:00 UTC 2013
>Closed-Date:    Sat Oct 19 20:24:30 CEST 2013
>Last-Modified:  Sat Oct 19 18:30:00 UTC 2013
>Originator:     Andras Horvath
>Release:        10.0-CURRENT
>Organization:
>Environment:
FreeBSD 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r255342: Sat Sep 7 07:34:47 UTC 2013 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Note: this is a modified PR request within a couple of days, because I changed my patch for the port. Since the other PR hasn't been accepted yet. Please consider this as correct one.

The difference between the two is in the checking of what is the default compiler.

Link to the other PR:
http://www.freebsd.org/cgi/query-pr.cgi?pr=182649

The aaphoto software has the ability to scale on more processor cores by using the libgomp library. This is achieved by using the OpenMP pragma feature of the GCC (the Gnu Compiler Collection).

Since the default C compiler has been replaced with Clang in the base system which doesn't know of OpenMP, the compiler cannot build this port.

>How-To-Repeat:
cd /usr/ports/graphics/aaphoto
make

>Fix:
Removing the "-fopenmp -D__OPENMP__" C flags fixes the problem because the software will be built without this feature.

Also, the active source code maintenance has been moved from the original site to its Github repo. The Makefile is updated according to this as well.

This update brings a new version too which is a minor update with only tiny fixes and documentation update.


Patch attached with submission follows:

diff -ru aaphoto.orig/Makefile aaphoto/Makefile
--- aaphoto.orig/Makefile	2013-09-20 18:35:44.000000000 +0000
+++ aaphoto/Makefile	2013-10-05 17:54:28.000000000 +0000
@@ -1,14 +1,16 @@
-# Created by: Andras Horvath <han@log69.com>
+# Created by: Andras Horvath <mail@log69.com>
 # $FreeBSD: graphics/aaphoto/Makefile 327733 2013-09-20 18:35:44Z bapt $
 
 PORTNAME=	aaphoto
-PORTVERSION=	0.41
-PORTREVISION=	1
+PORTVERSION=	0.43.1
+# PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://log69.com/downloads/
-DISTNAME=	${PORTNAME}_sources_v${PORTVERSION}
+USE_GITHUB=		yes
+MASTER_SITES=	https://github.com/log69/aaphoto/archive/
+DISTNAME=	v${PORTVERSION}
+DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	han@log69.com
+MAINTAINER=	mail@log69.com
 COMMENT=	Auto Adjust Photo, automatic color correction of photos
 
 LIB_DEPENDS=	jasper:${PORTSDIR}/graphics/jasper \
@@ -31,7 +33,8 @@
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-.if (${ARCH} == "amd64" || ${ARCH} == "i386") && ${OSVERSION} >= 700000
+CCISCLANG!=     ${CC} --version
+.if (${ARCH} == "amd64" || ${ARCH} == "i386") && ${OSVERSION} >= 700000 && empty(CCISCLANG:M*clang*)
 CFLAGS+=	-fopenmp -D__OPENMP__
 .endif
 
diff -ru aaphoto.orig/distinfo aaphoto/distinfo
--- aaphoto.orig/distinfo	2012-07-14 13:54:48.000000000 +0000
+++ aaphoto/distinfo	2013-10-04 23:41:30.000000000 +0000
@@ -1,2 +1,2 @@
-SHA256 (aaphoto_sources_v0.41.tar.gz) = f101ff954bcca194550f35acdcaac8e4b36df072a1c5406e73f2d3bab30d38cb
-SIZE (aaphoto_sources_v0.41.tar.gz) = 138407
+SHA256 (aaphoto/v0.43.1.tar.gz) = 35a21d075d297872e35f52c9e92ab8e7ee403f5ecf4927634f22b56bb401b5ca
+SIZE (aaphoto/v0.43.1.tar.gz) = 135261
diff -ru aaphoto.orig/files/patch-Makefile.in aaphoto/files/patch-Makefile.in
--- aaphoto.orig/files/patch-Makefile.in	2012-07-14 13:54:48.000000000 +0000
+++ aaphoto/files/patch-Makefile.in	2013-10-04 21:10:53.000000000 +0000
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2010-09-14 12:09:45.000000000 +0200
-+++ Makefile.in	2010-09-14 12:10:23.000000000 +0200
+--- Makefile.in.orig	2013-10-01 06:48:31.000000000 +0000
++++ Makefile.in	2013-10-04 21:09:17.000000000 +0000
 @@ -162,8 +162,8 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
Only in aaphoto.orig/files: patch-aaphoto.c


>Release-Note:
>Audit-Trail:

From: Andras Horvath <mail@log69.com>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc: Andras Horvath <han@log69.com>
Subject: Re: ports/182772: graphics/aaphoto cannot be built because of the
 default clang compiler
Date: Fri, 18 Oct 2013 14:20:26 +0200

 Dear developers,
 
 Could any of you kindly revise my patch to my port and apply it?
 
 Thanks.
 
 Andras
 
 
 On Sun, 6 Oct 2013 18:30:00 GMT
 FreeBSD-gnats-submit@FreeBSD.org wrote:
 
 > Thank you very much for your problem report.
 > It has the internal identification `ports/182772'.
 > The individual assigned to look at your
 > report is: freebsd-ports-bugs. 
 > 
 > You can access the state of your problem report at any time
 > via this link:
 > 
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=182772
 > 
 > >Category:       ports
 > >Responsible:    freebsd-ports-bugs
 > >Synopsis:       graphics/aaphoto cannot be built because of the default clang compiler
 > >Arrival-Date:   Sun Oct 06 18:30:00 UTC 2013
State-Changed-From-To: open->closed 
State-Changed-By: tijl 
State-Changed-When: Sat Oct 19 20:21:57 CEST 2013 
State-Changed-Why:  
Modified patch committed in r330922. 


Responsible-Changed-From-To: freebsd-ports-bugs->tijl 
Responsible-Changed-By: tijl 
Responsible-Changed-When: Sat Oct 19 20:21:57 CEST 2013 
Responsible-Changed-Why:  
Modified patch committed in r330922. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182772 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182772: commit references a PR
Date: Sat, 19 Oct 2013 18:21:49 +0000 (UTC)

 Author: tijl
 Date: Sat Oct 19 18:21:40 2013
 New Revision: 330922
 URL: http://svnweb.freebsd.org/changeset/ports/330922
 
 Log:
   - Update 0.43.1.
   - Disable openmp with clang.
   - Support staging.
   
   PR:		ports/182772
   Submitted by:	Andras Horvath <mail@log69.com> (maintainer)
 
 Deleted:
   head/graphics/aaphoto/files/patch-aaphoto.c
 Modified:
   head/graphics/aaphoto/Makefile   (contents, props changed)
   head/graphics/aaphoto/distinfo   (contents, props changed)
   head/graphics/aaphoto/files/patch-Makefile.in   (contents, props changed)
 Directory Properties:
   head/graphics/aaphoto/pkg-descr   (props changed)
 
 Modified: head/graphics/aaphoto/Makefile
 ==============================================================================
 --- head/graphics/aaphoto/Makefile	Sat Oct 19 18:13:57 2013	(r330921)
 +++ head/graphics/aaphoto/Makefile	Sat Oct 19 18:21:40 2013	(r330922)
 @@ -2,50 +2,39 @@
  # $FreeBSD$
  
  PORTNAME=	aaphoto
 -PORTVERSION=	0.41
 -PORTREVISION=	1
 +PORTVERSION=	0.43.1
  CATEGORIES=	graphics
 -MASTER_SITES=	http://log69.com/downloads/
 -DISTNAME=	${PORTNAME}_sources_v${PORTVERSION}
  
  MAINTAINER=	mail@log69.com
  COMMENT=	Auto Adjust Photo, automatic color correction of photos
  
 -LIB_DEPENDS=	jasper:${PORTSDIR}/graphics/jasper \
 -		jpeg:${PORTSDIR}/graphics/jpeg \
 -		png15:${PORTSDIR}/graphics/png
 -
  LICENSE=	GPLv3
  
 -USE_AUTOTOOLS=	autoheader
 +LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper \
 +		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 +		libpng15.so:${PORTSDIR}/graphics/png
 +
 +USE_GITHUB=	yes
 +GH_ACCOUNT=	log69
 +GH_COMMIT=	e566f9b
 +GH_TAGNAME=	v${PORTVERSION}
 +
  GNU_CONFIGURE=	yes
 +USES=		compiler
 +
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  
 -WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 -
  PLIST_FILES=	bin/aaphoto
 -PORTDOCS=	AUTHORS ChangeLog COPYING COPYRIGHT INSTALL LICENSE \
 -		NEWS README TODO
  
 -NO_STAGE=	yes
  .include <bsd.port.pre.mk>
  
 -.if (${ARCH} == "amd64" || ${ARCH} == "i386") && ${OSVERSION} >= 700000
 +.if (${ARCH} == "amd64" || ${ARCH} == "i386") && ${OSVERSION} >= 700000 && \
 +	${COMPILER_TYPE} == gcc
  CFLAGS+=	-fopenmp -D__OPENMP__
  .endif
  
  do-install:
 -.for FILE in aaphoto
 -	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/bin
 -.endfor
 -
 -post-install:
 -.if !defined(NOPORTDOCS)
 -	${MKDIR} ${DOCSDIR}
 -.for i in ${PORTDOCS}
 -	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 -.endfor
 -.endif
 +	${INSTALL_PROGRAM} ${WRKSRC}/aaphoto ${STAGEDIR}${PREFIX}/bin
  
  .include <bsd.port.post.mk>
 
 Modified: head/graphics/aaphoto/distinfo
 ==============================================================================
 --- head/graphics/aaphoto/distinfo	Sat Oct 19 18:13:57 2013	(r330921)
 +++ head/graphics/aaphoto/distinfo	Sat Oct 19 18:21:40 2013	(r330922)
 @@ -1,2 +1,2 @@
 -SHA256 (aaphoto_sources_v0.41.tar.gz) = f101ff954bcca194550f35acdcaac8e4b36df072a1c5406e73f2d3bab30d38cb
 -SIZE (aaphoto_sources_v0.41.tar.gz) = 138407
 +SHA256 (aaphoto-0.43.1.tar.gz) = 75c9ae7232411cf1ff83ebbe5acb9c817b5490cef08ce14cc2bd03097e7936e0
 +SIZE (aaphoto-0.43.1.tar.gz) = 135277
 
 Modified: head/graphics/aaphoto/files/patch-Makefile.in
 ==============================================================================
 --- head/graphics/aaphoto/files/patch-Makefile.in	Sat Oct 19 18:13:57 2013	(r330921)
 +++ head/graphics/aaphoto/files/patch-Makefile.in	Sat Oct 19 18:21:40 2013	(r330922)
 @@ -6,7 +6,7 @@
   top_srcdir = @top_srcdir@
  -AM_CFLAGS = -Wall -O2 -D__OPENMP__ -fopenmp
  -AM_LDFLAGS = -ljasper -ljpeg -lpng -lm -lgomp
 -+AM_CFLAGS = -Wall -O2
 ++AM_CFLAGS = -Wall
  +AM_LDFLAGS = -ljasper -ljpeg -lpng -lm
   aaphoto_SOURCES = aaphoto.c
   INCLUDES = 
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
