svn commit: r357206 - head/graphics/libimg

[Mikhail Teterin]

Author: mi
Date: Mon Jun  9 21:04:10 2014
New Revision: 357206
URL: http://svnweb.freebsd.org/changeset/ports/357206
QAT: https://qat.redports.org/buildarchive/r357206/

Log:
  Fix plist... Do not link with X-libraries directly -- no calls are made
  from this software into X11, it is all handled by Tk.

Modified:
  head/graphics/libimg/Makefile
  head/graphics/libimg/pkg-plist

Modified: head/graphics/libimg/Makefile
==============================================================================
--- head/graphics/libimg/Makefile	Mon Jun  9 20:43:42 2014	(r357205)
+++ head/graphics/libimg/Makefile	Mon Jun  9 21:04:10 2014	(r357206)
@@ -40,8 +40,13 @@ post-patch:
 .endfor
 
 post-configure:
+	# Do not link with X11 -- none of tkimg code uses X directly
+	${REINPLACE_CMD} -E -e 's,-L[^[:space:]]+[[:space:]]+-lX[^[:space:]]*,,g' \
+		${WRKSRC}/*/Makefile
 .for l in jpeg png tiff
-	${REINPLACE_CMD} -E -e 's,^SHLIB_LD_LIBS[[:space:]]*=[[:space:]]*(.*),SHLIB_LD_LIBS=\1 -l$l,' \
+	# Link with -l$l
+	${REINPLACE_CMD} -E \
+		-e 's,^SHLIB_LD_LIBS[[:space:]]*=[[:space:]]*(.*),SHLIB_LD_LIBS=\1 -l$l,' \
 		-e 's,-lpng$$,-lpng15,' ${WRKSRC}/$l/Makefile
 .endfor
 

Modified: head/graphics/libimg/pkg-plist
==============================================================================
--- head/graphics/libimg/pkg-plist	Mon Jun  9 20:43:42 2014	(r357205)
+++ head/graphics/libimg/pkg-plist	Mon Jun  9 21:04:10 2014	(r357206)
@@ -28,3 +28,26 @@ man/mann/img-window.n.gz
 man/mann/img-xbm.n.gz
 man/mann/img-xpm.n.gz
 man/mann/img.n.gz
+lib/Img/libtkimg142.so.1
+lib/Img/libtkimgbmp142.so.1
+lib/Img/libtkimgdted142.so.1
+lib/Img/libtkimggif142.so.1
+lib/Img/libtkimgico142.so.1
+lib/Img/libtkimgjpeg142.so.1
+lib/Img/libtkimgpcx142.so.1
+lib/Img/libtkimgpixmap142.so.1
+lib/Img/libtkimgpng142.so.1
+lib/Img/libtkimgppm142.so.1
+lib/Img/libtkimgps142.so.1
+lib/Img/libtkimgraw142.so.1
+lib/Img/libtkimgsgi142.so.1
+lib/Img/libtkimgstub142.a
+lib/Img/libtkimgsun142.so.1
+lib/Img/libtkimgtga142.so.1
+lib/Img/libtkimgxbm142.so.1
+lib/Img/libtkimgtiff142.so.1
+lib/Img/libtkimgwindow142.so.1
+lib/Img/libtkimgxpm142.so.1
+lib/Img/pkgIndex.tcl
+lib/Img/tkimgConfig.sh
+ at dirrm lib/Img