diff options
author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2006-02-23 02:15:38 +0000 |
---|---|---|
committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2006-02-23 02:15:38 +0000 |
commit | b7cc3765dfae29a204ea324bf2e79c0e3db561af (patch) | |
tree | b8253b356e688c9ba189ed8ebf687cba9c1aea13 | |
parent | 0de60d2b245bb8380a3faa9679fbf9dc57286493 (diff) | |
download | ports-b7cc3765dfae29a204ea324bf2e79c0e3db561af.tar.gz ports-b7cc3765dfae29a204ea324bf2e79c0e3db561af.zip |
- Add a patch to fix a crash when trying to remove a MOVED port with -y option
- Bump PORTREVISION
PR: 93178
Submitted by: Eric <eric7wang@gmail.com>
Notes
Notes:
svn path=/head/; revision=156734
-rw-r--r-- | ports-mgmt/portmanager/Makefile | 3 | ||||
-rw-r--r-- | ports-mgmt/portmanager/files/patch-libMGPM-src-MGPMrGetPortName.c | 12 | ||||
-rw-r--r-- | sysutils/portmanager/Makefile | 3 | ||||
-rw-r--r-- | sysutils/portmanager/files/patch-libMGPM-src-MGPMrGetPortName.c | 12 |
4 files changed, 26 insertions, 4 deletions
diff --git a/ports-mgmt/portmanager/Makefile b/ports-mgmt/portmanager/Makefile index 4acfb01d286a..c46e55219d20 100644 --- a/ports-mgmt/portmanager/Makefile +++ b/ports-mgmt/portmanager/Makefile @@ -7,7 +7,7 @@ PORTNAME= portmanager PORTVERSION= 0.4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= portmanager @@ -21,7 +21,6 @@ MAN3= libMG.3 MGdbAdd.3 MGdbCreate.3 MGdbDelete.3 \ GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -USE_REINPLACE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALL_TARGET= install info diff --git a/ports-mgmt/portmanager/files/patch-libMGPM-src-MGPMrGetPortName.c b/ports-mgmt/portmanager/files/patch-libMGPM-src-MGPMrGetPortName.c new file mode 100644 index 000000000000..5a38bf7f33ed --- /dev/null +++ b/ports-mgmt/portmanager/files/patch-libMGPM-src-MGPMrGetPortName.c @@ -0,0 +1,12 @@ +--- libMGPM/src/MGPMrGetPortName.c.orig Thu Feb 23 03:04:28 2006 ++++ libMGPM/src/MGPMrGetPortName.c Thu Feb 23 03:06:22 2006 +@@ -180,7 +180,8 @@ + } + else + { +- fclose( property->STDIN ); ++ if( property->autoMoved == 0 ) ++ fclose( property->STDIN ); + MGPMlogAdd( property, "installed ", portName, + " removed from system: no longer in ports tree: see /usr/ports/MOVED", " ", " " ); + } diff --git a/sysutils/portmanager/Makefile b/sysutils/portmanager/Makefile index 4acfb01d286a..c46e55219d20 100644 --- a/sysutils/portmanager/Makefile +++ b/sysutils/portmanager/Makefile @@ -7,7 +7,7 @@ PORTNAME= portmanager PORTVERSION= 0.4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= portmanager @@ -21,7 +21,6 @@ MAN3= libMG.3 MGdbAdd.3 MGdbCreate.3 MGdbDelete.3 \ GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -USE_REINPLACE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALL_TARGET= install info diff --git a/sysutils/portmanager/files/patch-libMGPM-src-MGPMrGetPortName.c b/sysutils/portmanager/files/patch-libMGPM-src-MGPMrGetPortName.c new file mode 100644 index 000000000000..5a38bf7f33ed --- /dev/null +++ b/sysutils/portmanager/files/patch-libMGPM-src-MGPMrGetPortName.c @@ -0,0 +1,12 @@ +--- libMGPM/src/MGPMrGetPortName.c.orig Thu Feb 23 03:04:28 2006 ++++ libMGPM/src/MGPMrGetPortName.c Thu Feb 23 03:06:22 2006 +@@ -180,7 +180,8 @@ + } + else + { +- fclose( property->STDIN ); ++ if( property->autoMoved == 0 ) ++ fclose( property->STDIN ); + MGPMlogAdd( property, "installed ", portName, + " removed from system: no longer in ports tree: see /usr/ports/MOVED", " ", " " ); + } |