mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-25 00:51:21 +00:00
Code Issues Releases Activity

- fix it to work with newusb on HEAD [1] [2]

Browse Source 
- makefile cleanup and portlint petting.

PR:		ports/132548 [1]
Submitted by:	Ben Kelly [1], stass@ [2]
This commit is contained in:
Ion-Mihai Tetcu 2009-03-12 14:10:54 +00:00
parent 3fb0477b10
commit ec377f19f3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=229936
2 changed files with 68 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sysutils/apcupsd/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= apcupsd
PORTVERSION= 3.14.5
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:src_sf/g} \
http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/:src_bk \
@ -16,11 +17,12 @@ MASTER_SITE_SUBDIR= ${PORTNAME}/:src_sf
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src_sf,src_bk \
${PORTNAME}.pdf:doc_sf,doc_bk
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
IGNOREFILES= ${PORTNAME}.pdf
MAINTAINER= itetcu@FreeBSD.org
COMMENT= Set of programs for controlling APC UPS
IGNOREFILES= ${PORTNAME}.pdf
USE_RC_SUBR= apcupsd
SUB_FILES= pkg-message
@ -32,9 +34,9 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/sbin \
--sysconfdir=${ETCDIR} \
--with-serial-dev=/dev/usv
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
LDFLAGS="-L${LOCALBASE}/lib"
#CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
# CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
# LDFLAGS="-L${LOCALBASE}/lib"
MAN8= apcupsd.8
@ -129,6 +131,10 @@ CONFIGURE_ARGS+= --enable-test
.include <bsd.port.pre.mk>
.if defined(WITH_USB) && ${OSVERSION} >= 800069
CONFIGURE_ARGS+= --with-generic-usb
.endif
pre-configure:
.if defined(WITH_CLIENT_ONLY) && ( defined(WITH_APCSMART_DRV) || \
defined(WITH_APCDUMB_DRV) || defined(WITH_PCNET_DRV) || \

58
sysutils/apcupsd/files/patch-configure Normal file
View File

@ -0,0 +1,58 @@
--- configure.orig 2009-03-12 00:42:12.000000000 +0300
+++ configure 2009-03-12 00:43:17.000000000 +0300
@@ -10623,53 +10623,8 @@
echo "${ECHO_T}Using BSD USB driver." >&6
;;
*)
- # Extract the first word of "libusb-config", so it can be a program name with args.
-set dummy libusb-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_usbcfg+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $usbcfg in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_usbcfg="$usbcfg" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_usbcfg="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- ;;
-esac
-fi
-usbcfg=$ac_cv_path_usbcfg
-
-if test -n "$usbcfg"; then
- echo "$as_me:$LINENO: result: $usbcfg" >&5
-echo "${ECHO_T}$usbcfg" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- if test x$usbcfg = x ; then
- { { echo "$as_me:$LINENO: error: Cannot find libusb-config" >&5
-echo "$as_me: error: Cannot find libusb-config" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- LIBUSB=`$usbcfg --libs`
- LIBUSBH=`$usbcfg --prefix`/include/usb.h
+ LIBUSB=-lusb
+ LIBUSBH="/usr/include/usb.h"
LIBUSBHIDINC="-I\$(topdir)/src/libusbhid"