Attachment #171424 for bug #210129




# $FreeBSD$

PORTNAME=	apcupsd
PORTVERSION=	3.14.14
CATEGORIES=	sysutils
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION}


LIBS+=		-L${LOCALBASE}/lib

OPTIONS_DEFINE=	APCSMART_DRV APCDUMB_DRV CLIENT_ONLY CGI PCNET_DRV USB SNMP_DRV \
		SNMP_DRV_OLD TEST_DRV GAPCMON DOCS MODBUS
OPTIONS_DEFAULT=	APCSMART_DRV APCDUMB_DRV PCNET_DRV USB MODBUS
APCSMART_DRV_DESC=	Compile APC SmartUPS serial driver
APCDUMB_DRV_DESC=	Compile dumb UPS driver
CLIENT_ONLY_DESC=	Only NIS client (no network server or drivers)

USB_DESC=		Compile with USB Support driver
SNMP_DRV_DESC=		Compile with SNMP driver
SNMP_DRV_OLD_DESC=	Compile with old SNMP driver
TCP_WRAPPERS_DESC=	Compile with TCP_WRAPPERS support
TEST_DRV_DESC=		Compile TEST driver
GAPCMON_DESC=		Build GTK GUI front-end
MODBUS_DESC=		Compile with MODBUS driver

MODBUS_CONFIGURE_ENABLE=	modbus
SNMP_DRV_OLD_CONFIGURE_ENABLE=	net-snmp
SNMP_DRV_OLD_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
TCP_WRAPPERS_CONFIGURE_WITH=	libwrap=yes
TEST_DRV_CONFIGURE_ENABLE=	test

#CONFIGURE_ARGS+=	--with-libwrap=yes
#CONFIGURE_ENV+=		LIBS="-lcurses -lmenu"
#PLIST_SUB+=		POWERFL=""

.include <bsd.port.options.mk>

pre-configure:

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (apcupsd-3.14.13.tar.gz) = 57ecbde01d0448bf8c4dbfe0ad016724ae66ab98adf2de955bf2be553c5d03f9	1	TIMESTAMP = 1465502881
2	SIZE (apcupsd-3.14.13.tar.gz) = 1935043	2	SHA256 (apcupsd-3.14.14.tar.gz) = db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867
		3	SIZE (apcupsd-3.14.14.tar.gz) = 1843409




--- configure.orig	2016-04-18 20:26:31 UTC
+++ configure
@@ -12397,55 +12397,6 @@ $as_echo "$as_me: error: gethostbyname_r
    ;;
 esac
 
-if test -n "$GCC"; then
-   # Starting with GCC 3.0, you must link C++ programs against either
-   # libstdc++ (shared by default), or libsupc++ (always static).  If
-   # you care about binary portability between Linux distributions,

-      esac
-      ;;
-   esac
-fi
-
 { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -fno-exceptions" >&5
 $as_echo_n "checking whether C compiler accepts -fno-exceptions... " >&6; }
 if test "${ax_cv_check_cflags___fno_exceptions+set}" = set; then

Return to bug 210129

Lines 2-8 Link Here

(-)Makefile (-9 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= apcupsd	4	PORTNAME= apcupsd
5	PORTVERSION= 3.14.13	5	PORTVERSION= 3.14.14
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION}
8		8
Lines 29-36 Link Here
29	LIBS+= -L${LOCALBASE}/lib	29	LIBS+= -L${LOCALBASE}/lib
30		30
31	OPTIONS_DEFINE= APCSMART_DRV APCDUMB_DRV CLIENT_ONLY CGI PCNET_DRV USB SNMP_DRV \	31	OPTIONS_DEFINE= APCSMART_DRV APCDUMB_DRV CLIENT_ONLY CGI PCNET_DRV USB SNMP_DRV \
32	SNMP_DRV_OLD TCP_WRAPPERS TEST_DRV GAPCMON DOCS MODBUS	32	SNMP_DRV_OLD TEST_DRV GAPCMON DOCS MODBUS
33	OPTIONS_DEFAULT= APCSMART_DRV APCDUMB_DRV PCNET_DRV USB TCP_WRAPPERS MODBUS	33	OPTIONS_DEFAULT= APCSMART_DRV APCDUMB_DRV PCNET_DRV USB MODBUS
34	APCSMART_DRV_DESC= Compile APC SmartUPS serial driver	34	APCSMART_DRV_DESC= Compile APC SmartUPS serial driver
35	APCDUMB_DRV_DESC= Compile dumb UPS driver	35	APCDUMB_DRV_DESC= Compile dumb UPS driver
36	CLIENT_ONLY_DESC= Only NIS client (no network server or drivers)	36	CLIENT_ONLY_DESC= Only NIS client (no network server or drivers)
Lines 39-45 Link Here
39	USB_DESC= Compile with USB Support driver	39	USB_DESC= Compile with USB Support driver
40	SNMP_DRV_DESC= Compile with SNMP driver	40	SNMP_DRV_DESC= Compile with SNMP driver
41	SNMP_DRV_OLD_DESC= Compile with old SNMP driver	41	SNMP_DRV_OLD_DESC= Compile with old SNMP driver
42	TCP_WRAPPERS_DESC= Compile with TCP_WRAPPERS support
43	TEST_DRV_DESC= Compile TEST driver	42	TEST_DRV_DESC= Compile TEST driver
44	GAPCMON_DESC= Build GTK GUI front-end	43	GAPCMON_DESC= Build GTK GUI front-end
45	MODBUS_DESC= Compile with MODBUS driver	44	MODBUS_DESC= Compile with MODBUS driver
Lines 63-75 Link Here
63	MODBUS_CONFIGURE_ENABLE= modbus	62	MODBUS_CONFIGURE_ENABLE= modbus
64	SNMP_DRV_OLD_CONFIGURE_ENABLE= net-snmp	63	SNMP_DRV_OLD_CONFIGURE_ENABLE= net-snmp
65	SNMP_DRV_OLD_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp	64	SNMP_DRV_OLD_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
66	TCP_WRAPPERS_CONFIGURE_WITH= libwrap=yes
67	TEST_DRV_CONFIGURE_ENABLE= test	65	TEST_DRV_CONFIGURE_ENABLE= test
68		66
69	#CONFIGURE_ARGS+= --with-libwrap=yes
70	#CONFIGURE_ENV+= LIBS="-lcurses -lmenu"
71	#PLIST_SUB+= POWERFL=""
72
73	.include <bsd.port.options.mk>	67	.include <bsd.port.options.mk>
74		68
75	pre-configure:	69	pre-configure:

Lines 1-9 Link Here

(-)files/patch-configure (-6 / +8 lines)
1	--- configure.orig 2015-01-04 20:35:43 UTC	1	--- configure.orig 2016-04-18 20:26:31 UTC
2	+++ configure	2	+++ configure
3	@@ -12678,53 +12678,6 @@ $as_echo "$as_me: error: gethostbyname_r	3	@@ -12397,55 +12397,6 @@ $as_echo "$as_me: error: gethostbyname_r
		4	;;
4	esac	5	esac
5		6
6	if test -n "$GCC"; then	7	-if test -n "$GCC"; then
7	- # Starting with GCC 3.0, you must link C++ programs against either	8	- # Starting with GCC 3.0, you must link C++ programs against either
8	- # libstdc++ (shared by default), or libsupc++ (always static). If	9	- # libstdc++ (shared by default), or libsupc++ (always static). If
9	- # you care about binary portability between Linux distributions,	10	- # you care about binary portability between Linux distributions,
Lines 50-56 Link Here
50	- esac	51	- esac
51	- ;;	52	- ;;
52	- esac	53	- esac
		54	-fi
53	-	55	-
54	# See if GCC supports -fno-exceptions...	56	{ $as_echo "$as_me:$LINENO: checking whether C compiler accepts -fno-exceptions" >&5
55	{ $as_echo "$as_me:$LINENO: checking if GCC supports -fno-exceptions" >&5	57	$as_echo_n "checking whether C compiler accepts -fno-exceptions... " >&6; }
56	$as_echo_n "checking if GCC supports -fno-exceptions... " >&6; }	58	if test "${ax_cv_check_cflags___fno_exceptions+set}" = set; then