diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2014-06-09 21:04:10 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2014-06-09 21:04:10 +0000 |
| commit | 1ba1acd31197b01945e3f5ca89b72eff69bf5907 (patch) | |
| tree | 387682bae7d8149e2ee9f6b4da1aac2f89518568 /graphics/libimg | |
| parent | 756019b2e056590c36b5abbb78d0afed0185af23 (diff) | |
| download | ports-1ba1acd31197b01945e3f5ca89b72eff69bf5907.tar.gz ports-1ba1acd31197b01945e3f5ca89b72eff69bf5907.zip | |
Fix plist... Do not link with X-libraries directly -- no calls are made
from this software into X11, it is all handled by Tk.
Notes
Notes:
svn path=/head/; revision=357206
Diffstat (limited to 'graphics/libimg')
| -rw-r--r-- | graphics/libimg/Makefile | 7 | ||||
| -rw-r--r-- | graphics/libimg/pkg-plist | 23 |
2 files changed, 29 insertions, 1 deletions
diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile index 588ea6f97537..53c5dd272902 100644 --- a/graphics/libimg/Makefile +++ b/graphics/libimg/Makefile @@ -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 diff --git a/graphics/libimg/pkg-plist b/graphics/libimg/pkg-plist index 6aa4536dbe23..b73c2f54a12f 100644 --- a/graphics/libimg/pkg-plist +++ b/graphics/libimg/pkg-plist @@ -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 +@dirrm lib/Img |