Bug 78656 - Update port: graphics/enblend from 1.3 to 2.2
Summary: Update port: graphics/enblend from 1.3 to 2.2
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Michael Johnson
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-03-10 02:30 UTC by Carlos Eduardo G. Carvalho
Modified: 2005-04-18 18:20 UTC (History)
0 users

See Also:


Attachments
file.diff (871 bytes, patch)
2005-03-10 02:30 UTC, Carlos Eduardo G. Carvalho
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Carlos Eduardo G. Carvalho 2005-03-10 02:30:02 UTC
Upgrading from 1.3 to 2.2 version.
Conflicts with vigra for compiling.
Comment 1 Michael Johnson freebsd_committer freebsd_triage 2005-03-10 10:39:51 UTC
State Changed
From-To: open->feedback
Comment 2 Michael Johnson freebsd_committer freebsd_triage 2005-03-10 10:39:51 UTC
Responsible Changed
From-To: freebsd-ports-bugs->ahze

Does not compile on 4.x or 5.x  

rm -f libvigra_impex.a 
ar cru libvigra_impex.a libvigra_impex_a-bmp.o  libvigra_impex_a-byteorder.o  libvigra_impex_a-codecmanager.o  libvigra_impex_a-gif.o  libvigra_impex_a-imageinfo.o  libvigra_impex_a-jpeg.o libvigra_impex_a-png.o  libvigra_impex_a-pnm.o libvigra_impex_a-sun.o  libvigra_impex_a-tiff.o  libvigra_impex_a-viff.o  libvigra_impex_a-void_vector.o  
ranlib libvigra_impex.a 
Making all in win32helpers 
source='enblend.cc' object='enblend-enblend.o' libtool=no  depfile='.deps/enblend-enblend.Po' tmpdepfile='.deps/enblend-enblend.TPo'  depmode=gcc /bin/sh ../depcomp  c++ -DHAVE_CONFIG_H -I. -I. -I..   -I/usr/local/include -g -O3 -ffast-math -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENBLEND_CACHE_IMAGES -I../include -O -pipe -c -o enblend-enblend.o `test -f 'enblend.cc' || echo './'`enblend.cc 
enblend.cc:61: boost/random/mersenne_twister.hpp: No such file or directory 
In file included from enblend.cc:79: 
enblend.h:31: boost/static_assert.hpp: No such file or directory 
In file included from ../include/vigra/stdcachedfileimage.hxx:29, 
from nearest.h:33, 
from mask.h:30, 
from enblend.h:37, 
from enblend.cc:79: 
../include/vigra/cachedfileimage.hxx:44: boost/static_assert.hpp: No such file or directory 
../include/vigra/cachedfileimage.hxx:45: boost/pool/pool.hpp: No such file or directory 
enblend.cc:66: syntax error before `::' 
fixmath.h:244: sorry, not implemented: initializer contains unrecognized tree code 
fixmath.h:271: sorry, not implemented: initializer contains unrecognized tree code 
fixmath.h:303: sorry, not implemented: initializer contains unrecognized tree code 

Can you please look in to this.
Comment 3 Carlos Eduardo G. Carvalho 2005-04-18 16:06:34 UTC
Hi, follows again the patch, now not as an attachment and the email is a
simple txt... guess this way things get easier :)

[ ]s.


-- 
Carlos E. G. Carvalho           OpenIT Solucoes Tecnologicas
Consultor Unix/Internet         Tel. +55 21 2508-9103
http://www.OpenIT.com.br
http://www.MyFreeBSD.com.br


-------------------------------------------------------
diff -ruN enblend-1.3/Makefile enblend-2.2/Makefile
--- enblend-1.3/Makefile	Wed Dec  8 21:03:10 2004
+++ enblend-2.2/Makefile	Fri Mar 25 11:10:48 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	enblend
-PORTVERSION=	1.3
+PORTVERSION=	2.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,8 @@
 COMMENT=	Image Blending with Multiresolution Splines. For panorama
images, etc
 
 LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
-		jpeg:${PORTSDIR}/graphics/jpeg
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		boost_date_time:${PORTSDIR}/devel/boost
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -25,4 +26,28 @@
 PLIST_FILES=	bin/enblend
 MAN1=		enblend.1
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-extract:
+.if exists(${LOCALBASE}/include/vigra/accessor.hxx)
+	@${ECHO}
+	@${ECHO} "   
####################################################################"
+	@${ECHO}
+	@${ECHO} "	Enblend can not be compiled with \"vigra\" previously
installed."
+	@${ECHO} "	Remove vigra, install enblend then reinstall vigra."
+	@${ECHO}
+	@${ECHO} "	Suggestion (if vigra is installed as a package):"
+	@${ECHO} "	> cd ${PKG_DBDIR}/vigra*"
+	@${ECHO} "	> pkg_create -f +CONTENTS -c +COMMENT -d +DESC
/tmp/vigra.tgz"
+	@${ECHO} "	> cd .."
+	@${ECHO} "	> pkg_delete vigra-X.X.X"
+	@${ECHO}
+	@${ECHO} "	Install enblend, then:"
+	@${ECHO} "	> pkg_add /tmp/vigra.tgz"
+	@${ECHO}
+	@${ECHO} "   
####################################################################"
+	@${ECHO}
+	@${FALSE}
+.endif
+
+.include <bsd.port.post.mk>
diff -ruN enblend-1.3/distinfo enblend-2.2/distinfo
--- enblend-1.3/distinfo	Wed Nov 17 18:35:24 2004
+++ enblend-2.2/distinfo	Wed Mar  9 23:23:01 2005
@@ -1,2 +1,2 @@
-MD5 (enblend-1.3.tar.gz) = 141fc73b90cbed951bb9efafd4c371e2
-SIZE (enblend-1.3.tar.gz) = 102718
+MD5 (enblend-2.2.tar.gz) = 4f1bd1a0d1a9626821fbfe398575cbdf
+SIZE (enblend-2.2.tar.gz) = 432513
Comment 4 Michael Johnson 2005-04-18 18:15:28 UTC
Carlos Eduardo G. Carvalho wrote:
> Hi, follows again the patch, now not as an attachment and the email is a
> simple txt... guess this way things get easier :)
> 
> [ ]s.
> 
> 

I figured out a better way than the pre-everything:: lines

CONFIGURE_ENV=  CPPFLAGS="-I${WRKSRC}/src/vigra_impex 
-I${WRKSRC}/include -I${LO
CALBASE}/include"

The problem was it was finding newer non-compatible vigra headers in 
LOCALBASE/include/vigra.

Michael
Comment 5 Michael Johnson freebsd_committer freebsd_triage 2005-04-18 18:18:51 UTC
State Changed
From-To: feedback->closed

Committed, Thanks!