svn commit: r367660 - in head/irc/bopm: . files

[Tijl Coosemans]

Author: tijl
Date: Mon Sep  8 18:10:14 2014
New Revision: 367660
URL: http://svnweb.freebsd.org/changeset/ports/367660
QAT: https://qat.redports.org/buildarchive/r367660/

Log:
  - Convert to USES=libtool and add INSTALL_TARGET=install-strip
  - Store pid file under /var/run instead of /var/log
  - Add patch to fix DESTDIR problems
  - Use @sample
  - Replace pkg-deinstall and @exec with @dirrmtry

Added:
  head/irc/bopm/files/patch-Makefile.in   (contents, props changed)
Deleted:
  head/irc/bopm/files/pkg-deinstall.in
  head/irc/bopm/files/pkg-message.in
Modified:
  head/irc/bopm/Makefile
  head/irc/bopm/files/bopm.in
  head/irc/bopm/pkg-plist

Modified: head/irc/bopm/Makefile
==============================================================================
--- head/irc/bopm/Makefile	Mon Sep  8 17:19:12 2014	(r367659)
+++ head/irc/bopm/Makefile	Mon Sep  8 18:10:14 2014	(r367660)
@@ -3,7 +3,7 @@
 
 PORTNAME=	bopm
 PORTVERSION=	3.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 MASTER_SITES=	http://static.blitzed.org/www.blitzed.org/bopm/files/ \
 		ftp://rusunix.org/pub/FreeBSD/distfiles/
@@ -13,27 +13,21 @@ COMMENT=	Open proxy and DNSBL monitor de
 
 LOGDIR=		/var/log/${PORTNAME}
 
-USE_AUTOTOOLS=	libtool
-LIBTOOLFILES=	configure src/libopm/configure
-CONFIGURE_ARGS=		--sysconfdir=${PREFIX}/etc --localstatedir=${LOGDIR}
-
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--localstatedir=${LOGDIR}
+INSTALL_TARGET=	install-strip
+USES=		libtool
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	bopm
 
-SUB_FILES=	pkg-message pkg-deinstall
 PLIST_SUB=	LOGDIR=${LOGDIR}
-SUB_LIST=	LOGDIR=${LOGDIR}
 
 USERS=	bopm
 GROUPS=	bopm
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's,data_DATA = bopm.conf.sample,data_DATA =,g' \
-		-e 's,$$(sysconfdir)/bopm.conf,$$(DESTDIR)&.sample,g' \
-		-e '/localstatedir/d' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} \
-		-e 's,/some/path/bopm.pid,${LOGDIR}/bopm.pid,g' \
+		-e 's,/some/path/bopm.pid,/var/run/bopm.pid,g' \
 		-e 's,/some/path/scan.log,${LOGDIR}/scan.log,g' \
 		${WRKSRC}/bopm.conf.sample
 

Modified: head/irc/bopm/files/bopm.in
==============================================================================
--- head/irc/bopm/files/bopm.in	Mon Sep  8 17:19:12 2014	(r367659)
+++ head/irc/bopm/files/bopm.in	Mon Sep  8 18:10:14 2014	(r367660)
@@ -24,7 +24,7 @@ load_rc_config $name
 : ${bopm_config="%%PREFIX%%/etc/bopm.conf"}
 
 bopm_user="bopm"
-pidfile="%%LOGDIR%%/bopm.pid"
+pidfile="/var/run/bopm.pid"
 required_files="${bopm_config}"
 
 # NOTE: bopm behaves differently with or without the -d flag.

Added: head/irc/bopm/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/bopm/files/patch-Makefile.in	Mon Sep  8 18:10:14 2014	(r367660)
@@ -0,0 +1,31 @@
+--- Makefile.in.orig	2007-05-15 20:54:14 UTC
++++ Makefile.in
+@@ -194,7 +194,7 @@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = src
+-data_DATA = bopm.conf.sample bopm.conf.blitzed
++data_DATA = bopm.conf.blitzed
+ EXTRA_DIST = ChangeLog contrib INSTALL README bopm.conf.sample bopm.conf.blitzed network-bopm
+ all: all-recursive
+ 
+@@ -636,14 +636,14 @@
+ 
+ 
+ install-data-local:
+-	@if test -f $(sysconfdir)/bopm.conf ; then \
++	@if test -f $(DESTDIR)$(sysconfdir)/bopm.conf ; then \
+ 		echo "$@ will not overwrite existing $(sysconfdir)/bopm.conf"; \
+ 	else \
+-		$(mkinstalldirs) $(sysconfdir); \
+-		echo "$(INSTALL_DATA) bopm.conf.sample $(sysconfdir)/bopm.conf"; \
+-		$(INSTALL_DATA) bopm.conf.sample $(sysconfdir)/bopm.conf; \
++		$(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
++		echo "$(INSTALL_DATA) bopm.conf.sample $(DESTDIR)$(sysconfdir)/bopm.conf.sample"; \
++		$(INSTALL_DATA) bopm.conf.sample $(DESTDIR)$(sysconfdir)/bopm.conf.sample; \
+ 	fi
+-	$(mkinstalldirs) $(localstatedir)
++	$(mkinstalldirs) $(DESTDIR)$(localstatedir)
+ 
+ uninstall-local:
+ 	@if test -f $(sysconfdir)/bopm.conf ; then \

Modified: head/irc/bopm/pkg-plist
==============================================================================
--- head/irc/bopm/pkg-plist	Mon Sep  8 17:19:12 2014	(r367659)
+++ head/irc/bopm/pkg-plist	Mon Sep  8 18:10:14 2014	(r367660)
@@ -1,20 +1,12 @@
- at unexec /bin/echo "===>" Stopping bopm...
- at unexec /usr/bin/killall bopm 2>/dev/null || true
 bin/bopm
- at owner bopm
- at group bopm
- at mode 640
-etc/bopm.conf.sample
- at owner
- at group
- at mode
+ at sample(bopm,bopm,640) etc/bopm.conf.sample
 include/opm.h
 include/opm_error.h
 include/opm_types.h
 include/opm_common.h
 share/bopm.conf.blitzed
-lib/libopm.so.0
-lib/libopm.so
-lib/libopm.la
 lib/libopm.a
- at exec install -d -m 750 -o bopm -g bopm %%LOGDIR%% 2>/dev/null || true
+lib/libopm.so
+lib/libopm.so.0
+lib/libopm.so.0.0.0
+ at dirrmtry(bopm,bopm,750) %%LOGDIR%%