diff -ruN --exclude=CVS ../lcdproc.orig/Makefile ./Makefile --- ../lcdproc.orig/Makefile 2012-06-20 22:07:36.000000000 +0200 +++ ./Makefile 2012-06-20 23:00:04.000000000 +0200 @@ -33,9 +33,12 @@ MAN5= lcdproc-config.5 MAN8= LCDd.8 -OPTIONS= USB "Enable USB support" off \ - LIBFTDI "Enable libftdi support (requires USB)" off \ - LIBHID "Enable libhid support (requires USB)" off +OPTIONS_DEFINE= USB FTDI HID +USB_DESC= Enable USB support +FTDI_DESC= Enable libftdi support (requires USB) +HID_DESC= Enable libhid support (requires USB) +OPTIONS_DEFAULT=USB +NO_OPTIONS_SORT=yes # Empty args to aclocal required! ACLOCAL_ARGS= @@ -73,7 +76,7 @@ .include -.if defined(WITH_USB) +.if ${PORT_OPTIONS:MUSB} . if ${OSVERSION} < 800069 LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb CONFIGURE_ARGS+= --with-libusb @@ -85,7 +88,7 @@ picolcd \ shuttleVFD -. if defined(WITH_LIBFTDI) +. if ${PORT_OPTIONS:MFTDI} LIB_DEPENDS+= ftdi.19:${PORTSDIR}/devel/libftdi CONFIGURE_ARGS+= --enable-libftdi PLIST_SUB+= FTDI="" @@ -97,7 +100,7 @@ PLIST_SUB+= FTDI="@comment " . endif -. if defined(WITH_LIBHID) +. if ${PORT_OPTIONS:MHID} LIB_DEPENDS+= hid:${PORTSDIR}/devel/libhid CONFIGURE_ARGS+= --enable-libhid PLIST_SUB+= HID=""