From 24fac36b8743ee97622e72b35f1e3792d5a8d06c Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Thu, 6 Nov 2014 19:06:46 -0600 Subject: [PATCH] Revert "patch: stagify and unbreak sysutils/apcupsd" Fixed upstream This reverts commit b7e0d593ee15e26d96c3201eb17d8bfb9a18af0a. --- ...utils_apcupsd-stagify_and_remove_pdf.patch | 101 ------------------ 1 file changed, 101 deletions(-) delete mode 100644 cdn/patch/sysutils_apcupsd-stagify_and_remove_pdf.patch diff --git a/cdn/patch/sysutils_apcupsd-stagify_and_remove_pdf.patch b/cdn/patch/sysutils_apcupsd-stagify_and_remove_pdf.patch deleted file mode 100644 index aaf2e15..0000000 --- a/cdn/patch/sysutils_apcupsd-stagify_and_remove_pdf.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -ur sysutils/apcupsd/distinfo sysutils/apcupsd/distinfo ---- sysutils/apcupsd/distinfo 2014-01-22 09:30:13.000000000 -0600 -+++ sysutils/apcupsd/distinfo 2014-07-04 02:11:39.777720169 -0500 -@@ -1,3 +1,2 @@ - SHA256 (apcupsd-3.14.10.tar.gz) = 0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032 - SIZE (apcupsd-3.14.10.tar.gz) = 1336852 --SHA256 (apcupsd.pdf) = IGNORE -diff -ur sysutils/apcupsd/Makefile sysutils/apcupsd/Makefile ---- sysutils/apcupsd/Makefile 2014-06-22 17:21:38.000000000 -0500 -+++ sysutils/apcupsd/Makefile 2014-07-04 02:22:31.750385486 -0500 -@@ -9,15 +9,12 @@ - http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/:src_bk \ - http://apcupsd.sourceforge.net/manual/:doc_sf \ - http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/:doc_bk --DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src_sf,src_bk \ -- ${PORTNAME}.pdf:doc_sf,doc_bk -+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src_sf,src_bk - EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - - MAINTAINER= itetcu@FreeBSD.org - COMMENT= Set of programs for controlling APC UPS - --BROKEN= no distinfo provided for some of the distfiles -- - USE_RC_SUBR= apcupsd - SUB_FILES= pkg-message - -@@ -33,11 +30,8 @@ - CPPFLAGS+= -I${LOCALBASE}/include - LIBS+= -L${LOCALBASE}/lib - --MAN5= apcupsd.conf.5 --MAN8= apcaccess.8 apccontrol.8 apctest.8 apcupsd.8 -- - OPTIONS_DEFINE= APCSMART_DRV APCDUMB_DRV CLIENT_ONLY CGI PCNET_DRV USB SNMP_DRV \ -- SNMP_DRV_OLD TCP_WRAPPERS TEST_DRV GAPCMON DOCS -+ SNMP_DRV_OLD TCP_WRAPPERS TEST_DRV GAPCMON - OPTIONS_DEFAULT= APCSMART_DRV APCDUMB_DRV PCNET_DRV USB TCP_WRAPPERS - APCSMART_DRV_DESC= Compile APC SmartUPS serial driver - APCDUMB_DRV_DESC= Compile dumb UPS driver -@@ -51,9 +45,6 @@ - TEST_DRV_DESC= Compile TEST driver - GAPCMON_DESC= Build GTK GUI front-end - --PORTDOCS= ${PORTNAME}.pdf -- --NO_STAGE= yes - .include - - .if ${PORT_OPTIONS:MAPCSMART_DRV} -@@ -138,32 +129,11 @@ - .endif - - post-install: --# If the files presaved are identical with the new one, include them in --# the package list, so the port can be removed without problems -- for na in apccontrol commfailure mainsback mastertimeout \ -- changeme commok masterconnect onbattery; do \ -- if [ -f ${ETCDIR}/$$na.orig ]; then \ -- if cmp -s ${ETCDIR}/$$na ${ETCDIR}/$$na.orig; then \ -- ${ECHO_CMD} "%%ETCDIR%%/$$na.orig" >> ${TMPPLIST}; \ -- fi \ -- fi; \ -- done - @${ECHO_CMD} "@unexec if [ -d %D/${ETCDIR_REL} ]; then ${ECHO_CMD} \"If you are permanently removing this port, you should do a ``rm -rf ${ETCDIR}`` to remove config files left.\" | ${FMT} ; fi" >> ${TMPPLIST} --# Install sample startup script --# If there is already a config file it is installed as ...new - for na in apcupsd.conf apcupsd.css hosts.conf multimon.conf; do \ -- if [ -f ${ETCDIR}/$$na ]; then \ -- if [ -f ${ETCDIR}/$$na.new ]; then \ -- ${MV} ${ETCDIR}/$$na.new ${ETCDIR}/$$na.sample; \ -- else \ -- ${CP} ${ETCDIR}/$$na ${ETCDIR}/$$na.sample; \ -- fi; \ -+ if [ -f ${STAGEDIR}${ETCDIR}/$$na ]; then \ -+ ${MV} ${STAGEDIR}${ETCDIR}/$$na ${STAGEDIR}${ETCDIR}/$$na.sample; \ - fi; \ - done --.if ${PORT_OPTIONS:MDOCS} -- @${MKDIR} ${DOCSDIR} -- ${INSTALL_DATA} ${DISTDIR}/${PORTNAME}.pdf ${DOCSDIR} --.endif -- @${CAT} ${PKGMESSAGE} - - .include -diff -ur sysutils/apcupsd/pkg-plist sysutils/apcupsd/pkg-plist ---- sysutils/apcupsd/pkg-plist 2014-01-22 09:16:56.000000000 -0600 -+++ sysutils/apcupsd/pkg-plist 2014-07-04 01:41:31.000000000 -0500 -@@ -2,6 +2,11 @@ - sbin/apcaccess - sbin/apctest - sbin/smtp -+man/man5/apcupsd.conf.5.gz -+man/man8/apcaccess.8.gz -+man/man8/apccontrol.8.gz -+man/man8/apctest.8.gz -+man/man8/apcupsd.8.gz - @unexec if cmp -s %D/%%ETCDIR%%/apcupsd.conf.sample %D/%%ETCDIR%%/apcupsd.conf; then rm -f %D/%%ETCDIR%%/apcupsd.conf; fi - %%ETCDIR%%/apcupsd.conf.sample - %%ETCDIR%%/apccontrol -Only in /home/cyberleo/scm/svn/CyberLeo/sysutils/apcupsd/: sysutils_apcupsd-stagify_and_remove_pdf.patch -- 2.45.0