Date: Tue, 8 Feb 2005 11:55:05 -0800 (PST) From: "Michael C.Shultz" <reso3w83@verizon.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/77276: [MAINTAINER] sysutils/portmanager update to 0.2.6_2 Message-ID: <20050208195505.603DF2CE7D6@ringworm.mechee.com> Resent-Message-ID: <200502082000.j18K0P3x027004@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 77276
>Category: ports
>Synopsis: [MAINTAINER] sysutils/portmanager update to 0.2.6_2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 08 20:00:25 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Michael C. Shultz
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD ringworm.mechee.com 5.3-STABLE FreeBSD 5.3-STABLE #0: Thu Jan 20 07:27:28 PST 2005 root@ringworm.mechee.com:/ROUTER/obj/ROUTER/src-5.3/sys/RINGWORM i386
>Description:
update portmanager to ver 0.2.6_2
Note to committer: Need to add files/patch-0.2.6_2
1) Modified Makefile due to issues raised by committer
of 0.2.6
2) There may be a bug in edge cases where a port name
originates from multiple usr/ports directories. Patch
allows printing of useful information if this happens
and hopefully traps the bug with assert statements.
>How-To-Repeat:
N/A
>Fix:
--- portmanager-0.2.6_2.diff begins here ---
diff -ruN portmanager/Makefile portmanager-0.2.6_2/Makefile
--- portmanager/Makefile Tue Feb 8 11:42:03 2005
+++ portmanager-0.2.6_2/Makefile Tue Feb 8 10:16:53 2005
@@ -7,7 +7,7 @@
PORTNAME= portmanager
PORTVERSION= 0.2.6
-PORTREVISION= 1
+PORTREVISION= 2
#-----------------------------------------
#for local use, remove before submitting PR
CATEGORIES= sysutils
@@ -41,17 +41,39 @@
#CONFIGURE_ARGS= --with-debug=yes
#.endif
-#CONFIGURE_ARGS= --with-prefix=${PREFIX} \
-# --with-bindir=/bin \
-# --with-etcdir=${PREFIX}/etc/portmanager \
-# --with-pkgdbdir=${PKG_DBDIR} \
-# --with-portsdir=${PORTSDIR} \
-# --with-sharedir=${DATADIR} \
-# --with-tempdir=/tmp
+#
+# note to committer: if portlint -c complains about paths
+# here is the package setup:
+#
+# if --with-bin=something then withvar=${PREFIX} + something
+# else defaults to withvar=${PREFIX} + /bin
+#
+# so --with-bindir=/bin will become ${PREFIX}/bin at configure
+# time.
+#
+# The paths after configure are stored in ${WORK}/externVars.h
+# if you like to see for yourself
+#
+# portlint -a has no warnings, if portlint -c reports something
+# please tell me so I may make the appropriate change
+#
+CONFIGURE_ARGS= --with-prefix=${PREFIX} \
+ --with-bindir=/bin \
+ --with-etcdir=/etc/portmanager \
+ --with-pkgdbdir=/var/db/pkg \
+ --with-portsdir=${PORTSDIR} \
+ --with-sharedir=/share/portmanager \
+ --with-tempdir=/tmp
INSTALLS_SHLIB= yes
+USE_REINPLACE= yes
# Need INSTALL_TARGET to install ${PREFIX}/etc/portmanager/pm-020.conf.SAMPLE
-INSTALL_TARGET= install info
+INSTALL_TARGET= install info
+
+post-configure:
+ @${REINPLACE_CMD} -e \
+ 's|VERSION "${PORTVERSION}"|VERSION "${PORTVERSION}_${PORTREVISION}"|g' \
+ ${WRKSRC}/externVars.h
post-install:
@${ECHO} "***********************************************************************"
diff -ruN portmanager/files/patch-0.2.6_2 portmanager-0.2.6_2/files/patch-0.2.6_2
--- portmanager/files/patch-0.2.6_2 Wed Dec 31 16:00:00 1969
+++ portmanager-0.2.6_2/files/patch-0.2.6_2 Tue Feb 8 08:40:30 2005
@@ -0,0 +1,65 @@
+diff -ruN ./libPMGR/src/PMGRrUpgrade.c ../../branch/0.2.6_2/libPMGR/src/PMGRrUpgrade.c
+--- ./libPMGR/src/PMGRrUpgrade.c Mon Feb 7 11:46:39 2005
++++ ../../branch/0.2.6_2/libPMGR/src/PMGRrUpgrade.c Tue Feb 8 08:30:07 2005
+@@ -247,23 +247,56 @@
+ MGdbGetRecno( property->strikesDb ) - 1 );
+ MGdbAdd( property->strikesDb, oldPortDir, "2", NULL );
+
+- /**********************************************************************/
+- /* look for mismatch between looping port's +CONTENTS file dependency */
+- /* directories and and the dependency's actual point of origin */
+- /**********************************************************************/
+- MGdbGoTop( property->dependencyPortsDb );
++ /*
++ * look for mismatch between looping port's +CONTENTS file dependency
++ * directories and and the dependency's actual point of origin
++ *
++ * if dependency.db (looping port name) (dependency name) dependencyDir
++ * != installed.db ( dependency.name) dependency.dir
++ *
++ */
+
++ /*
++ * get looping port's +CONTENTS file dependency name
++ */
++ MGdbGoTop( property->dependencyPortsDb );
+ dependencyPortName = MGdbSeek( property->dependencyPortsDb,
+ property->fieldChildPortName,
+ oldPortName, property->fieldDependencyPortName );
++ if( !dependencyPortName )
++ {
++ fprintf( stderr,
++ "%s not found in dependencyPortsDb property->fieldChildPortName\n",
++ oldPortName );
++ assert(0);
++ }
++printf( "%s %s DEBUG: get looping port's +CONTENTS file dependency name = %s\n", id, VERSION, dependencyPortName );
+
++ /*
++ * get looping port's +CONTENTS file dependency dir
++ */
+ dependencyPortDir = MGdbGet( property->dependencyPortsDb,
+ MGdbGetRecno( property->dependencyPortsDb ) -1,
+ property->fieldDependencyPortDir );
+
++printf( "%s %s DEBUG: get looping port's +CONTENTS file dependency dir = %s\n", id, VERSION, dependencyPortDir );
++
++ /*
++ * get dependency's actual point of origin
++ */
+ MGdbGoTop( property->installedPortsDb );
+ origDir = MGdbSeek( property->installedPortsDb, property->fieldInstalledPortName,
+ dependencyPortName, property->fieldInstalledPortDir );
++ if( !origDir )
++ {
++ fprintf( stderr,
++ "%s not found in installedPortsDb property->fieldInstalledPortName\n",
++ dependencyPortName );
++ assert(0);
++ }
++
++printf( "%s %s DEBUG: get looping port's +CONTENTS file dependency actual point of ORIGIN dir = %s\n",
++ id, VERSION, origDir );
+
+ fprintf( stdout, "analysing problem:\n" );
+ while( dependencyPortName )
diff -ruN portmanager/pkg-descr portmanager-0.2.6_2/pkg-descr
--- portmanager/pkg-descr Mon Jan 31 03:46:42 2005
+++ portmanager-0.2.6_2/pkg-descr Tue Feb 8 08:45:26 2005
@@ -1,6 +1,8 @@
FreeBSD port collection management. Insures your ports are only built with
the most up to date sources. Great for users of KDE or GNOME who are always
-concerned over the way their underlying ports are built.
+concerned over the way their underlying ports are built. **New option**
+leaf port report: Shows ports with no other ports depending on them, these are
+ports that may be safely deinstalled.
WWW: http://portmanager.sourceforge.net/
--- portmanager-0.2.6_2.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050208195505.603DF2CE7D6>