5 files changed, 31 insertions, 42 deletions

diff --git a/ports-mgmt/pkg_install/Makefile b/ports-mgmt/pkg_install/Makefile
index ec3a1970a35d..6fbc302e9c8d 100644
--- a/ports-mgmt/pkg_install/Makefile
+++ b/ports-mgmt/pkg_install/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=		pkg_install
-PORTVERSION=		20060113
+PORTVERSION=		20080407
 CATEGORIES=		ports-mgmt
 MASTER_SITES=		${MASTER_SITE_LOCAL} \
-			http://people.FreeBSD.org/~marcus/
-MASTER_SITE_SUBDIR=	marcus
+			http://people.FreeBSD.org/~flz/distfiles/pkg_install/
+MASTER_SITE_SUBDIR=	flz/pkg_install
 
 MAINTAINER=		portmgr@freebsd.org
 COMMENT=		FreeBSD -CURRENT version of the pkg tools for older system releases
@@ -18,27 +18,15 @@ COMMENT=		FreeBSD -CURRENT version of the pkg tools for older system releases
 MANCOMPRESSED=		yes
 
 MAN1=			pkg_add.1 pkg_create.1 pkg_delete.1 \
-			pkg_info.1 pkg_version.1
-
-MAKE_ARGS=		-DNOOBJ -DNOCRYPT -DNO_OPENSSL
+			pkg_info.1 pkg_updating.1 pkg_version.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 460102
-check-already-installed:
-.if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
-	@if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \
-		${ECHO_CMD} "===>  ${PKGNAME} is already installed - perhaps an older version?"; \
-		${ECHO_CMD} "      If so, you may wish to \`\`make deinstall'' and install"; \
-		${ECHO_CMD} "      this port again by \`\`make reinstall'' to upgrade it properly."; \
-		${ECHO_CMD} "      If you really wish to overwrite the old port of ${PKGNAME}"; \
-		${ECHO_CMD} "      without deleting it first, set the variable \"FORCE_PKG_REGISTER\""; \
-		${ECHO_CMD} "      in your environment or the \"make install\" command line."; \
-		exit 1; \
-	fi
+# Arbitrary OSVERSION but support for 5.x will go away soon anyway...
+.if ${OSVERSION} < 600000
+MAKE_ARGS=		-DNOOBJ -DNOCRYPT -DNO_OPENSSL
 .else
-	@${DO_NADA}
-.endif
+MAKE_ARGS=		-DNO_OBJ -DNO_CRYPT -DNO_OPENSSL
 .endif
 
 pre-configure:
@@ -46,12 +34,6 @@ pre-configure:
 		-e 's,%%MANPREFIX%%,${MANPREFIX},g' \
 		${FILESDIR}/Makefile.inc > ${WRKDIR}/Makefile.inc
 
-post-patch:
-.if ${OSVERSION} < 440001 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500024 )
-	@${FIND} ${WRKSRC} -name '*.c' \
-		| ${XARGS} ${PERL} -pi.orig -e 's/__FBSDID\(("[^"]*")\)/static const char rcsid[] = $$1/'
-.endif
-
 deinstall:
 	@if ${PKG_INFO} -e ${PKGNAME}; then \
 		${PKG_DELETE} -f ${PKGNAME}; \
diff --git a/ports-mgmt/pkg_install/distinfo b/ports-mgmt/pkg_install/distinfo
index 15cd8d9f157c..2f5d40abed9d 100644
--- a/ports-mgmt/pkg_install/distinfo
+++ b/ports-mgmt/pkg_install/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkg_install-20060113.tar.gz) = c9668c92370637bea76afcb2c40a441e
-SHA256 (pkg_install-20060113.tar.gz) = f1e17d29be6206de5012b64b0eec3095ed5d9a2af1b52c9597867e118d8aa356
-SIZE (pkg_install-20060113.tar.gz) = 89977
+MD5 (pkg_install-20080407.tar.gz) = 42721e39896c101a5c7eda6119a3b4d0
+SHA256 (pkg_install-20080407.tar.gz) = f3c63413fcbbf1fb952c82003fbe123ebf38bbe2ce92b3a2d44e1abcffc46867
+SIZE (pkg_install-20080407.tar.gz) = 79461
diff --git a/ports-mgmt/pkg_install/files/patch-Makefile.inc b/ports-mgmt/pkg_install/files/patch-Makefile.inc
index 2f032e6e7d86..338bdae5fc36 100644
--- a/ports-mgmt/pkg_install/files/patch-Makefile.inc
+++ b/ports-mgmt/pkg_install/files/patch-Makefile.inc
@@ -1,15 +1,18 @@
---- Makefile.inc.orig	Tue Dec 21 05:16:03 2004
-+++ Makefile.inc	Sat Feb 26 17:02:17 2005
-@@ -7,9 +7,11 @@
- .endif
+--- Makefile.inc.orig	2008-04-09 16:15:05.000000000 +0100
++++ Makefile.inc	2008-04-09 16:15:21.000000000 +0100
+@@ -4,11 +4,13 @@
+ 
+ LIBINSTALL=	${.OBJDIR}/../lib/libinstall.a
  
- .if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && \
+-.if ${MK_OPENSSL} != "no" && \
 -    defined(LDADD) && ${LDADD:M-lfetch} != ""
++.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && \
 +	defined(LDADD)
 +.if  ${LDADD:M-lfetch} != ""
  DPADD+=		${LIBSSL} ${LIBCRYPTO}
  LDADD+=		-lssl -lcrypto
-+.endif
  .endif
++.endif
  
  # Inherit BINDIR from one level up.
+ .include "../Makefile.inc"
diff --git a/ports-mgmt/pkg_install/files/patch-lib_Makefile b/ports-mgmt/pkg_install/files/patch-lib_Makefile
index daa6c5966548..a7c8f533a0fe 100644
--- a/ports-mgmt/pkg_install/files/patch-lib_Makefile
+++ b/ports-mgmt/pkg_install/files/patch-lib_Makefile
@@ -1,19 +1,22 @@
---- lib/Makefile.orig	Sun Oct 24 11:33:07 2004
-+++ lib/Makefile	Sat Feb 26 17:03:27 2005
-@@ -1,11 +1,15 @@
- # $FreeBSD: /tmp/pcvs/ports/ports-mgmt/pkg_install/files/patch-lib_Makefile,v 1.4 2005-02-26 22:06:42 marcus Exp $
+--- lib/Makefile.orig	2008-04-07 11:16:05.000000000 +0100
++++ lib/Makefile	2008-04-09 16:39:06.000000000 +0100
+@@ -1,11 +1,18 @@
+ # $FreeBSD: /tmp/pcvs/ports/ports-mgmt/pkg_install/files/patch-lib_Makefile,v 1.5 2008-04-09 15:44:45 flz Exp $
  
  LIB=	install
 -INTERNALLIB=
  SRCS=	file.c msg.c plist.c str.c exec.c global.c pen.c match.c \
  	deps.c version.c pkgwrap.c url.c
+ 
++NO_PROFILE=	yes
++NO_PIC=		yes
 +NOPROFILE=	yes
 +NOPIC=		yes
- 
++
  WARNS?=	3
  WFORMAT?=	1
-+
+ 
 +install:
 +	@echo -n
- 
++
  .include <bsd.lib.mk>
diff --git a/ports-mgmt/pkg_install/pkg-plist b/ports-mgmt/pkg_install/pkg-plist
index f4c62b027a74..490fefd4e99d 100644
--- a/ports-mgmt/pkg_install/pkg-plist
+++ b/ports-mgmt/pkg_install/pkg-plist
@@ -2,4 +2,5 @@ sbin/pkg_add
 sbin/pkg_create
 sbin/pkg_delete
 sbin/pkg_info
+sbin/pkg_updating
 sbin/pkg_version