ports/182595: [patch update] ports-mgmt/pkg_install

[Kurt Jaeger]

>Number:         182595
>Category:       ports
>Synopsis:       [patch update] ports-mgmt/pkg_install
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 03 10:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Kurt Jaeger
>Release:        FreeBSD 10.0-ALPHA4 amd64
>Organization:
-
>Environment:
System: FreeBSD f10.opsec.eu 10.0-ALPHA4 FreeBSD 10.0-ALPHA4 #0 r255933: Sun Sep 29 02:50:54 UTC 2013 root at snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64

>Description:
	1) fails to build, strange make error, fixed by USE_GCC=any (?)
	2) fails to compile with gcc, two .c patches

>How-To-Repeat:
	see http://opsec.eu/backup/20131003-pkg_install

>Fix:

diff -r -u -N ports-mgmt/pkg_install/Makefile /usr/home/pi/myp/ports-mgmt/pkg_install/Makefile
--- ports-mgmt/pkg_install/Makefile	2013-10-01 21:15:19.000000000 +0200
+++ /usr/home/pi/myp/ports-mgmt/pkg_install/Makefile	2013-10-03 11:42:33.000000000 +0200
@@ -12,6 +12,8 @@
 
 LICENSE=		BSD
 
+USE_GCC=		any
+
 MANCOMPRESSED=		yes
 MAN1=			pkg_add.1 pkg_create.1 pkg_delete.1 \
 			pkg_info.1 pkg_updating.1 pkg_version.1
diff -r -u -N ports-mgmt/pkg_install/files/patch-add-main.c /usr/home/pi/myp/ports-mgmt/pkg_install/files/patch-add-main.c
--- ports-mgmt/pkg_install/files/patch-add-main.c	1970-01-01 01:00:00.000000000 +0100
+++ /usr/home/pi/myp/ports-mgmt/pkg_install/files/patch-add-main.c	2013-10-03 11:51:04.000000000 +0200
@@ -0,0 +1,20 @@
+--- add/main.c-orig	2013-10-03 11:50:12.000000000 +0200
++++ add/main.c	2013-10-03 11:48:51.000000000 +0200
+@@ -130,7 +130,7 @@
+ main(int argc, char **argv)
+ {
+     int ch, error;
+-    char **start;
++    // char **start;
+     char *cp, *packagesite = NULL, *remotepkg = NULL, *ptr;
+     static char temppackageroot[MAXPATHLEN];
+     static char pkgaddpath[MAXPATHLEN];
+@@ -140,7 +140,7 @@
+     else
+ 	PkgAddCmd = argv[0];
+ 
+-    start = argv;
++    // start = argv;
+     while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1) {
+ 	switch(ch) {
+ 	case 'v':
diff -r -u -N ports-mgmt/pkg_install/files/patch-add-perform.c /usr/home/pi/myp/ports-mgmt/pkg_install/files/patch-add-perform.c
--- ports-mgmt/pkg_install/files/patch-add-perform.c	1970-01-01 01:00:00.000000000 +0100
+++ /usr/home/pi/myp/ports-mgmt/pkg_install/files/patch-add-perform.c	2013-10-03 11:51:11.000000000 +0200
@@ -0,0 +1,20 @@
+--- add/perform.c-orig	2013-10-03 11:50:31.000000000 +0200
++++ add/perform.c	2013-10-03 11:49:40.000000000 +0200
+@@ -72,7 +72,7 @@
+     struct stat sb;
+     int inPlace, conflictsfound, errcode;
+     /* support for separate pre/post install scripts */
+-    int new_m = 0;
++    // int new_m = 0;
+     char pre_script[FILENAME_MAX] = INSTALL_FNAME;
+     char post_script[FILENAME_MAX];
+     char pre_arg[FILENAME_MAX], post_arg[FILENAME_MAX];
+@@ -440,7 +440,7 @@
+      */
+ 
+     if (fexists(POST_INSTALL_FNAME)) {
+-	new_m = 1;
++	// new_m = 1;
+ 	sprintf(post_script, "%s", POST_INSTALL_FNAME);
+ 	pre_arg[0] = '\0';
+ 	post_arg[0] = '\0';

>Release-Note:
>Audit-Trail:
>Unformatted: