Bug 107803 - [patch] sysutils/psgconf: unbreak (fix installing)
Summary: [patch] sysutils/psgconf: unbreak (fix installing)
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Boris Samorodov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2007-01-10 21:20 UTC by Boris Samorodov
Modified: 2007-02-08 21:10 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Boris Samorodov freebsd_committer freebsd_triage 2007-01-10 21:20:12 UTC
	The port does not deinstall cleanly:

	1. Currently the portinstall srcipt runs twice. Remove the second
           run (from Makefile).

	2. Configuration file is created on-the-fly by adding some info
	   to a standard config file. But a sample config file is copied from
	   that standard one.

Fix: . remove second run of sysinstall;
	. copy sample file from the created config file;
	. bump PORTREVISION.
 


WBR
-- 
bsam--lZx8mHxpL5M27TLv0ajdKZDEkcgC1zcWJ1B8biG3sP2UJclT
Content-Type: text/plain; name="psgconf.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="psgconf.diff"

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/psgconf/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile	10 Jan 2007 19:12:13 -0000	1.8
+++ Makefile	10 Jan 2007 20:51:29 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	psgconf
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp-dev.cites.uiuc.edu/pub/psgconf/
 
@@ -21,8 +21,6 @@
 	${SITE_PERL}/${PERL_ARCH}/version.pm:${PORTSDIR}/devel/p5-version \
 	${SITE_PERL}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff
 
-BROKEN=		Leaves behind files on deinstall
-
 PERL_CONFIGURE=	YES
 
 MAN1=		psgconf.1
@@ -200,8 +198,7 @@
 
 post-install:
 	-@${MKDIR} ${PREFIX}/etc
-	@${CP} ${WRKSRC}/etc/psg.conf ${PREFIX}/etc/psg.conf.sample
-	@${CP} ${WRKSRC}/etc/psgconf_modules ${PREFIX}/etc/psgconf_modules.sample
-	PKG_PREFIX=${PREFIX} PKG_MGR=FreeBSD::Ports ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CP} ${PREFIX}/etc/psg.conf ${PREFIX}/etc/psg.conf.sample
+	@${CP} ${PREFIX}/etc/psgconf_modules ${PREFIX}/etc/psgconf_modules.sample
 
 .include <bsd.port.post.mk>
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2007-01-10 21:20:25 UTC
Responsible Changed
From-To: freebsd-ports-bugs->pirzyk

Over to maintainer
Comment 2 Boris B.Samorodov 2007-01-12 12:07:38 UTC
One plist error remained:
-----
====================<phase 7: make package>====================
===>  Building package for psgconf-3.2.3
Creating package /tmp/packages/All/psgconf-3.2.3.tbz
Registering depends: p5-Text-Diff-0.35 p5-AppConfig-1.64 p5-Config-Objective-0.9.1_2 p5-File-HomeDir-0.63 p5-NetAddr-IP-4.00.4 p5-Parse-Yapp-1.05 p5-ParseLex-2.15 p5-Proc-ProcessTable-0.41 p5-Algorithm-Diff-1.1902 p5-Unix-Mknod-0.03 p5-version-0.68 perl-5.8.8.
Creating bzip'd tar ball in '/tmp/packages/All/psgconf-3.2.3.tbz'
Deleting psgconf-3.2.3
================================================================

=== Checking filesystem state
list of extra files and directories in / (not present before this port was installed but present after it was deinstalled)
23342197        4 -rw-r--r--    1 root             wheel                 492 Jan 12 11:52 usr/local/etc/psg.conf
23342200       20 -rw-r--r--    1 root             wheel                9996 Jan 12 11:52 usr/local/etc/psgconf_modules.pre.psgconf-3.2.3.2007-01-12
Deleting p5-version-0.68
Deleting p5-Unix-Mknod-0.03
Deleting p5-Text-Diff-0.35
Deleting p5-Proc-ProcessTable-0.41
Deleting p5-NetAddr-IP-4.00.4
Deleting p5-Config-Objective-0.9.1_2
Deleting p5-AppConfig-1.64
Deleting p5-Algorithm-Diff-1.1902
Deleting p5-File-HomeDir-0.63
Deleting p5-Parse-Yapp-1.05
Deleting p5-ParseLex-2.15
Deleting perl-5.8.8
Removing stale symlinks from /usr/bin...
    Removing /usr/bin/perl
    Removing /usr/bin/perl5
Done.
Cleaning up /etc/make.conf... Done.
Cleaning up /etc/manpath.config... Done.

=== Checking filesystem state after all packages deleted
================================================================
list of extra files and directories in / (not present on clean system but present after everything was deinstalled)
23342197        4 -rw-r--r--    1 root             wheel                 492 Jan 12 11:52 usr/local/etc/psg.conf
23342200       20 -rw-r--r--    1 root             wheel                9996 Jan 12 11:52 usr/local/etc/psgconf_modules.pre.psgconf-3.2.3.2007-01-12
================================================================
build of /usr/ports/sysutils/psgconf ended at Fri Jan 12 11:52:35 UTC 2007
-----

And https://tinderbox.i386.ipt.ru/tb/logs/6-bsam-exp/psgconf-3.2.3.log
for the full log.


WBR
-- 
bsam
Comment 3 Boris B.Samorodov 2007-02-07 22:37:28 UTC
On Wed, 7 Feb 2007 15:21:54 -0600 Jim Pirzyk wrote:

> Here is a revised patch that seems to solve all the outstanding
> problems.

Tested at tinderbox for FreeBSD 6-STABLE and 7-CURRENT -- worked like
a charm. Thanks!


WBR
-- 
Boris Samorodov (bsam)
Research Engineer, http://www.ipt.ru Telephone & Internet SP
FreeBSD committer, http://www.FreeBSD.org The Power To Serve
Comment 4 Jim Pirzyk freebsd_committer freebsd_triage 2007-02-08 19:43:06 UTC
Responsible Changed
From-To: pirzyk->freebsd-ports

Now that we have a working patch, send the PR back to get committed.
Comment 5 Boris Samorodov freebsd_committer freebsd_triage 2007-02-08 20:00:56 UTC
Responsible Changed
From-To: freebsd-ports->bsam

Take.
Comment 6 dfilter service freebsd_committer freebsd_triage 2007-02-08 21:02:51 UTC
bsam        2007-02-08 21:02:44 UTC

  FreeBSD ports repository

  Modified files:
    sysutils/psgconf     Makefile distinfo pkg-plist 
    sysutils/psgconf/files patch-Makefile.PL patch-PSGConf.pm 
  Added files:
    sysutils/psgconf/files patch-postinstall 
  Log:
  The patch was totally rewritten by the maintainer:
  . update to the new version 3.2.3;
  . fix package building/installing/deinstalling;
  . remove BROKEN.
  
  PR:             107803
  Submitted by:   bsam (me)
  Approved by:    pirjyk (maintainer)
  
  Revision  Changes    Path
  1.9       +3 -3      ports/sysutils/psgconf/Makefile
  1.5       +3 -3      ports/sysutils/psgconf/distinfo
  1.3       +14 -4     ports/sysutils/psgconf/files/patch-Makefile.PL
  1.3       +23 -5     ports/sysutils/psgconf/files/patch-PSGConf.pm
  1.1       +18 -0     ports/sysutils/psgconf/files/patch-postinstall (new)
  1.5       +1 -2      ports/sysutils/psgconf/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 7 Boris Samorodov freebsd_committer freebsd_triage 2007-02-08 21:03:22 UTC
State Changed
From-To: open->closed

Committed, thanks. ;-)