Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Dec 2004 19:36:43 -0800 (PST)
From:      "Michael C.Shultz" <reso3w83@verizon.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/75596: [MAINTAINER] sysutils/portmanager update to 0.2.2
Message-ID:  <20041229033643.56A2C2CE743@ringworm.mechee.com>
Resent-Message-ID: <200412290340.iBT3eKK7055107@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         75596
>Category:       ports
>Synopsis:       [MAINTAINER] sysutils/portmanager update to 0.2.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:   Wed Dec 29 03:40:20 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Michael C. Shultz
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD ringworm.zzz.com 5.3-STABLE FreeBSD 5.3-STABLE #0: Sun Dec 12 21:33:02 PST 2004 reso3w83@verizon.net:/ROUTER/obj/ROUTER/src-5.3/sys/RINGWORM i386


>Description:

	update portmanager to ver 0.2.2

	Changes:

	1) Made MGmDbArrayFree and MGmDbArray source in /libMG/src/libMG.h
	more readable. Fixed a few bad mallocs in MGmDbArrayFree as well.

	2) As per suggestions from John E Hein <jhein@timing.com> in
	libPMGR/src/libPMGR.h removed hard coded paths and changed so  ports
	infrastructure files are accessed by using $PORTSDIR & $PKG_DBDIR
	environment vars and fixed hard coded path references in
	/portmanager/portmanager.c

	3) In pmupgrade.c added an abort if error during clean in an attempt
	to halt looping when a port conflict occurs, this is untested so
	temporary for now.

	4) libPMGR/src/PMGRrMakeDescribe.c fixed hard coded paths

	5) pmupgrade.c fixed hard coded paths
	
	6) pmupgrade.c Major cleanup of code, seperated upgrade routine into
	upgrade, checkForOldDepencies, and PMGRrDoUpgrade routines.
	
	7) fixed portmanager seg faulting when it self updates.  (thanks to
	"Noah" <admin2@enabled.com> for reporting

	8) Added "HINTS AND TIPS" section to portmanager(1) man page.

>How-To-Repeat:
	N/A
>Fix:


--- portmanager-0.2.2.diff begins here ---
diff -ruN portmanager/Makefile /usr/ports/local/sysutils/portmanager/Makefile
--- portmanager/Makefile	Sun Dec 26 13:38:18 2004
+++ /usr/ports/local/sysutils/portmanager/Makefile	Tue Dec 28 19:00:13 2004
@@ -2,12 +2,18 @@
 # Date created: 	April 23, 2004
 # Whom: 		Michael C. Shultz <ringworm@inbox.lv>
 #
-# $FreeBSD: ports/sysutils/portmanager/Makefile,v 1.9 2004/12/26 20:30:38 sem Exp $
+# $FreeBSD: ports/sysutils/portmanager/Makefile,v 1.8 2004/11/01 21:51:16 sem Exp $
 #
 
-PORTNAME=		portmanager
-PORTVERSION=		0.2.1
+PORTNAME=	portmanager
+PORTVERSION=	0.2.2
+PORTREVISION=	0
+#-----------------------------------------
+#for local use, remove before submitting PR
 CATEGORIES=		sysutils
+#CATEGORIES=		local/sysutils
+#VALID_CATEGORIES+=	${CATEGORIES}	# for FreeBSD to accept our local category
+#-----------------------------------------
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	portmanager
 
@@ -22,12 +28,23 @@
 
 MAN1=			portmanager.1
 
+USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=		yes
 USE_REINPLACE=		yes
 # Need INSTALL_TARGET to install /usr/local/etc/portmanager/pm-020.conf.SAMPLE
 INSTALL_TARGET=         install info
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ;	\
+	s|0.2.2|${PORTVERSION}_${PORTREVISION}|g ;	\
+	s|%%PORTSDIR%%|${PORTSDIR}|g ;	\
+	s|%%PKG_DBDIR%%|${PKG_DBDIR}|g' ${WRKSRC}/libPMGR/src/libPMGR.h
+
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ;	\
+	s|%%PORTSDIR%%|${PORTSDIR}|g ;	\
+	s|%%PKG_DBDIR%%|${PKG_DBDIR}|g' ${WRKSRC}/libPMGR/src/PMGRrMakeDescribe.c
 
 # Only way to get WITH_DEBUG build dependencies handled prior to reconfiguring
 # is to use post-configure <sigh>
diff -ruN portmanager/distinfo /usr/ports/local/sysutils/portmanager/distinfo
--- portmanager/distinfo	Sun Dec 26 13:38:18 2004
+++ /usr/ports/local/sysutils/portmanager/distinfo	Tue Dec 28 17:47:05 2004
@@ -1,2 +1,2 @@
-MD5 (portmanager-0.2.1.tar.gz) = ffd913fb57b592e9876fd006cc921eee
-SIZE (portmanager-0.2.1.tar.gz) = 383452
+MD5 (portmanager-0.2.2.tar.gz) = e57d637438ca7465f4677368e1a423e3
+SIZE (portmanager-0.2.2.tar.gz) = 381257
diff -ruN portmanager/pkg-plist /usr/ports/local/sysutils/portmanager/pkg-plist
--- portmanager/pkg-plist	Sun Dec 26 13:38:18 2004
+++ /usr/ports/local/sysutils/portmanager/pkg-plist	Tue Dec 28 18:00:29 2004
@@ -10,7 +10,6 @@
 bin/portmanager
 etc/portmanager/pm-020.conf.SAMPLE
 include/libMG.h
-include/libPMGR.h
 lib/libMG
 lib/libMG.0
 lib/libPMGR
--- portmanager-0.2.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?20041229033643.56A2C2CE743>