Bug 174469 - ports/x11/xlockmore: add imagemagick dependency as an option
Summary: ports/x11/xlockmore: add imagemagick dependency as an option
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: Jason Helfman
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-12-16 07:10 UTC by Katsura Matsumoto
Modified: 2012-12-20 23:23 UTC (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Katsura Matsumoto 2012-12-16 07:10:00 UTC 
ports/x11/xlockmore automatically detects libMagickCore.so if it exists
in a configure time, but does not record the dependency.

Fix: 

The following diff to the Makefile.

@@ -27,7 +27,7 @@
 PLIST_FILES=   bin/xlock lib/X11/app-defaults/XLock

 OPTIONS_DEFINE=        MESAGL MB SYSLOG DISABLE_ALLOW_ROOT NICE_ONLY BLANK_ONLY
 \
-               KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION
+               KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION MAGICK

 MESAGL_DESC=   Mesa 3D (for GL modes)
 MB_DESC=       Xmb function series
@@ -122,6 +122,12 @@
 CONFIGURE_ARGS+=       --enable-customization
 .endif

+.if ${PORT_OPTIONS:MMAGICK}
+LIB_DEPENDS+=  MagickCore:${PORTSDIR}/graphics/ImageMagick
+.else
+CONFIGURE_ARGS+=       --without-magick
+.endif
+
 CONFIGURE_ENV+=                XLOCKLIBS="${KRB5LIB} ${KRB4LIB} ${MESALIB}"

 .if ${PORT_OPTIONS:MDISABLE_ALLOW_ROOT}
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-12-16 07:10:08 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->jgh

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Jason Helfman freebsd_committer freebsd_triage 2012-12-20 23:23:47 UTC 
State Changed
From-To: open->closed

Committed. Thanks!