svn commit: r449108 - head/mail/spamd

[Adam Weinberger]

Author: adamw
Date: Fri Sep  1 22:03:04 2017
New Revision: 449108
URL: https://svnweb.freebsd.org/changeset/ports/449108

Log:
  Disable the pkg-deinstall script.
  
  spamd's pkg-install adds spamd stuff to /etc/services, and pkg-deinstall
  removed it. The problem is that pkg doesn't run DEINSTALL before INSTALL
  when upgrading/reinstalling. As a result, when spamd is restarted,
  /etc/services winds up lacking the spamd entries, causing spamd to fail
  to start.
  
  The ideal solution is pkg running those targets in the predicted order,
  or pkg gaining a @services keyword. In the meantime, this commit just
  disables the pkg-deinstall. If you are uninstalling spamd you can remove
  those /etc/services entries by hand.
  
  PR:		212335
  Approved by:	maintainer timeout (~ 1 yr)
  MFH:		2017Q3

Modified:
  head/mail/spamd/Makefile
  head/mail/spamd/pkg-deinstall

Modified: head/mail/spamd/Makefile
==============================================================================
--- head/mail/spamd/Makefile	Fri Sep  1 21:51:10 2017	(r449107)
+++ head/mail/spamd/Makefile	Fri Sep  1 22:03:04 2017	(r449108)
@@ -3,7 +3,7 @@
 
 PORTNAME=	spamd
 PORTVERSION=	4.9.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/freebsdspamd/spamd
 

Modified: head/mail/spamd/pkg-deinstall
==============================================================================
--- head/mail/spamd/pkg-deinstall	Fri Sep  1 21:51:10 2017	(r449107)
+++ head/mail/spamd/pkg-deinstall	Fri Sep  1 22:03:04 2017	(r449108)
@@ -5,7 +5,9 @@
 #
 # $FreeBSD$
 
-if [ "$2" = "DEINSTALL" ]; then
+#if [ "$2" = "DEINSTALL" ]; then
+# Disabled until pkg runs DEINSTALL before INSTALL in upgrades
+if false; then
 	FILE="/etc/services"
 	echo "===>   Removing spamd entries from ${FILE}"
 	sed -i '' \