5 files changed, 15 insertions, 35 deletions

diff --git a/graphics/liblqr-1/Makefile b/graphics/liblqr-1/Makefile
index 08672429c7ed..1f2f4e2787d7 100644
--- a/graphics/liblqr-1/Makefile
+++ b/graphics/liblqr-1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	liblqr-1
-DISTVERSION=	0.2.1
+DISTVERSION=	0.4.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://liblqr.wdfiles.com/local--files/en:download-page/ \
 		http://mirror.amdmi3.ru/
@@ -18,9 +18,7 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 pkgconfig
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/^([0-9.]+)-([0-9]+)$/\1/}
-
+MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
 .if !defined(NOPORTDOCS)
@@ -40,7 +38,7 @@ PKGMESSAGE=	${WRKDIR}/pkg_message
 
 post-patch:
 .if ${OSVERSION} < 700042
-	@${REINPLACE_CMD} -e 's|-fvisibility=hidden||' ${WRKSRC}/lqr/Makefile.in
+	@${REINPLACE_CMD} -e 's|FVISIBILITY_FLAG=".*"|FVISIBILITY_FLAG=""|' ${WRKSRC}/configure
 .endif
 	@${REINPLACE_CMD} -e '/^lqr_pkgconfigdir/ s|$$(libdir)|$${exec_prefix}/libdata|' \
 		${WRKSRC}/Makefile.in
diff --git a/graphics/liblqr-1/distinfo b/graphics/liblqr-1/distinfo
index f8d172d0eab3..c71c66fa48bc 100644
--- a/graphics/liblqr-1/distinfo
+++ b/graphics/liblqr-1/distinfo
@@ -1,3 +1,3 @@
-MD5 (liblqr-1-0.2.1.tar.bz2) = c2569ef21c2f37759d05e171d54efecc
-SHA256 (liblqr-1-0.2.1.tar.bz2) = da741081a8fb4b2609f2e586f7ebc29d1dbc27d6e7c1eae21a78152460b6ad57
-SIZE (liblqr-1-0.2.1.tar.bz2) = 302417
+MD5 (liblqr-1-0.4.1.tar.bz2) = 0e24ed3c9fcdcb111062640764d7b87a
+SHA256 (liblqr-1-0.4.1.tar.bz2) = 9fda316804a4fa0a07184483a4b488611963340610615ea9cc25f6f31407e909
+SIZE (liblqr-1-0.4.1.tar.bz2) = 347474
diff --git a/graphics/liblqr-1/files/patch-examples-Makefile b/graphics/liblqr-1/files/patch-examples-Makefile
index e617b827c068..f26062c58ef4 100644
--- a/graphics/liblqr-1/files/patch-examples-Makefile
+++ b/graphics/liblqr-1/files/patch-examples-Makefile
@@ -1,24 +1,15 @@
---- examples/Makefile.orig	2007-12-21 18:02:50.000000000 +0300
-+++ examples/Makefile	2008-01-30 05:43:08.000000000 +0300
-@@ -23,6 +23,8 @@
- 
- 
- # collect flags for the compiler for lqr library
-+CXX ?= g++
-+
- LQR_CFLAGS = `pkg-config --cflags lqr-1`
- 
- LQR_LIBS = `pkg-config --libs lqr-1`
-@@ -59,17 +61,17 @@
+--- examples/Makefile.orig	2009-05-09 20:41:30.000000000 +0400
++++ examples/Makefile	2009-05-12 20:52:42.000000000 +0400
+@@ -63,17 +63,17 @@
  
  # linking
  $(tt1out) : $(tt1obj)
 -	g++ $(LINKING_FLAGS) -o $(tt1out) $(tt1obj)
-+	$(CXX) $(tt1obj) $(LINKING_FLAGS) -o $(tt1out)
++	$(CXX) $(LINKING_FLAGS) -o $(tt1out) $(tt1obj)
  
  $(tt2out) : $(tt2obj)
 -	g++ $(LINKING_FLAGS) -o $(tt2out) $(tt2obj)
-+	$(CXX) $(tt2obj) $(LINKING_FLAGS) -o $(tt2out)
++	$(CXX) $(LINKING_FLAGS) -o $(tt2out) $(tt2obj)
  
  # object building
  $(tt1).o : $(tt1).cpp $(tt1).h
diff --git a/graphics/liblqr-1/files/patch-lqr-lqr_carver_priv.h b/graphics/liblqr-1/files/patch-lqr-lqr_carver_priv.h
deleted file mode 100644
index d2f44533cccc..000000000000
--- a/graphics/liblqr-1/files/patch-lqr-lqr_carver_priv.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- lqr/lqr_carver_priv.h.orig	2008-11-01 04:42:18.000000000 +0300
-+++ lqr/lqr_carver_priv.h	2009-03-25 22:02:08.000000000 +0300
-@@ -204,7 +204,7 @@
- LqrRetVal lqr_carver_build_vsmap (LqrCarver * r, gint depth);    /* visibility */
- 
- /* internal functions for maps computation */
--inline gfloat lqr_carver_read (LqrCarver * r, gint x, gint y); /* read the average value at given point */
-+gfloat lqr_carver_read (LqrCarver * r, gint x, gint y); /* read the average value at given point */
- void lqr_carver_compute_e (LqrCarver * r, gint x, gint y);      /* compute energy of point at c (fast) */
- void lqr_carver_update_emap (LqrCarver * r);    /* update energy map after seam removal */
- void lqr_carver_update_mmap (LqrCarver * r);    /* minpath */
diff --git a/graphics/liblqr-1/pkg-plist b/graphics/liblqr-1/pkg-plist
index c4ce2ec0a0bb..d0011700f723 100644
--- a/graphics/liblqr-1/pkg-plist
+++ b/graphics/liblqr-1/pkg-plist
@@ -2,16 +2,18 @@ include/lqr-1/lqr.h
 include/lqr-1/lqr/lqr_base.h
 include/lqr-1/lqr/lqr_carver_bias_pub.h
 include/lqr-1/lqr/lqr_carver_list_pub.h
-include/lqr-1/lqr/lqr_carver_rigmask_pub.h
 include/lqr-1/lqr/lqr_carver_pub.h
+include/lqr-1/lqr/lqr_carver_rigmask_pub.h
 include/lqr-1/lqr/lqr_cursor_pub.h
+include/lqr-1/lqr/lqr_energy_pub.h
 include/lqr-1/lqr/lqr_gradient_pub.h
 include/lqr-1/lqr/lqr_progress_pub.h
+include/lqr-1/lqr/lqr_rwindow_pub.h
 include/lqr-1/lqr/lqr_vmap_list_pub.h
 include/lqr-1/lqr/lqr_vmap_pub.h
 lib/liblqr-1.la
 lib/liblqr-1.so
-lib/liblqr-1.so.1
+lib/liblqr-1.so.3
 libdata/pkgconfig/lqr-1.pc
 @dirrm include/lqr-1/lqr
 @dirrm include/lqr-1