From owner-svn-ports-head@FreeBSD.ORG Mon Sep 8 18:10:15 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 585C543D; Mon, 8 Sep 2014 18:10:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 39AC9133C; Mon, 8 Sep 2014 18:10:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88IAFF4006327; Mon, 8 Sep 2014 18:10:15 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88IAEqc006320; Mon, 8 Sep 2014 18:10:14 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201409081810.s88IAEqc006320@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Mon, 8 Sep 2014 18:10:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367660 - in head/irc/bopm: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 18:10:15 -0000 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 @@ -@unexec /bin/echo "===>" Stopping bopm... -@unexec /usr/bin/killall bopm 2>/dev/null || true bin/bopm -@owner bopm -@group bopm -@mode 640 -etc/bopm.conf.sample -@owner -@group -@mode +@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 -@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 +@dirrmtry(bopm,bopm,750) %%LOGDIR%%