Re: CVS commit: pkgsrc/pkgtools/pkg_install

To: joerg%netbsd.org@localhost
Subject: Re: CVS commit: pkgsrc/pkgtools/pkg_install
From: "OBATA Akio" <obache%netbsd.org@localhost>
Date: Sat, 23 Jan 2010 18:19:48 +0900

Then you introduce another breakage.


--- pkg_create ---
cc -L/var/tmp/obj/pkgsrc/pkgtools/pkg_install/work/libfetch 
-L/var/tmp/obj/pkgsrc/pkgtools/pkg_install/work/libnbcompat -L/usr/lib 
-Wl,-R/usr/lib -Wl,-R/usr/pkg/lib -L../lib -o pkg_create main.o perform.o pl.o 
util.o build.o -linstall -larchive -lbz2 -lz -lnbcompat
../lib/libinstall.a(parse-config.o): In function `pkg_install_config':
parse-config.c:(.text+0x2af): undefined reference to `fetchConnectionCacheInit'
*** [pkg_create] Error code 1
1 error



Please review and commit following patch.

Index: create/Makefile.in
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/create/Makefile.in,v
retrieving revision 1.16
diff -u -r1.16 Makefile.in
--- create/Makefile.in  22 Jan 2010 13:30:41 -0000      1.16
+++ create/Makefile.in  23 Jan 2010 09:18:09 -0000
@@ -24,7 +24,7 @@
 PROG=          pkg_create

 .if empty(BOOTSTRAP)
-LIBS=          -linstall -larchive -lbz2 -lz @LIBS@
+LIBS=          -linstall -larchive -lfetch -lbz2 -lz @LIBS@
 CPPFLAGS=      @CPPFLAGS@ -I. -I$(srcdir) -I../lib
 OBJS=  main.o perform.o pl.o util.o build.o
 .else
Index: delete/Makefile.in
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/delete/Makefile.in,v
retrieving revision 1.14
diff -u -r1.14 Makefile.in
--- delete/Makefile.in  22 Jan 2010 13:30:41 -0000      1.14
+++ delete/Makefile.in  23 Jan 2010 09:18:09 -0000
@@ -13,7 +13,7 @@

 CC=            @CC@
 CCLD=          $(CC)
-LIBS=          -linstall @LIBS@
+LIBS=          -linstall -lfetch @LIBS@
 CPPFLAGS=      @CPPFLAGS@ -I. -I$(srcdir) -I../lib -DBINDIR=\"$(sbindir)\"
 DEFS=          @DEFS@
 CFLAGS=                @CFLAGS@


On Fri, 22 Jan 2010 22:30:42 +0900, Joerg Sonnenberger 
<joerg%netbsd.org@localhost> wrote:

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Jan 22 13:30:42 UTC 2010

Modified Files:
        pkgsrc/pkgtools/pkg_install: Makefile
        pkgsrc/pkgtools/pkg_install/files: configure configure.ac
        pkgsrc/pkgtools/pkg_install/files/add: Makefile.in add.h main.c
            perform.c
        pkgsrc/pkgtools/pkg_install/files/admin: Makefile.in check.c main.c
        pkgsrc/pkgtools/pkg_install/files/create: Makefile.in main.c
        pkgsrc/pkgtools/pkg_install/files/delete: Makefile.in pkg_delete.c
        pkgsrc/pkgtools/pkg_install/files/info: Makefile.in main.c perform.c
        pkgsrc/pkgtools/pkg_install/files/lib: Makefile.in conflicts.c
            iterate.c lib.h license.c parse-config.c pkg_install.conf.5.in
            pkgdb.c version.h
Added Files:
        pkgsrc/pkgtools/pkg_install/files/add: pkg_add.1
        pkgsrc/pkgtools/pkg_install/files/admin: pkg_admin.1
        pkgsrc/pkgtools/pkg_install/files/create: pkg_create.1
        pkgsrc/pkgtools/pkg_install/files/delete: pkg_delete.1
        pkgsrc/pkgtools/pkg_install/files/info: pkg_info.1
        pkgsrc/pkgtools/pkg_install/files/view: pkg_view.1
Removed Files:
        pkgsrc/pkgtools/pkg_install/files/add: pkg_add.1.in
        pkgsrc/pkgtools/pkg_install/files/admin: README pkg_admin.1.in
        pkgsrc/pkgtools/pkg_install/files/bpm: bpm.cat1
        pkgsrc/pkgtools/pkg_install/files/create: pkg_create.1.in
        pkgsrc/pkgtools/pkg_install/files/info: pkg_info.1.in
        pkgsrc/pkgtools/pkg_install/files/lib: pkg_install.conf.cat5.in
            pkg_summary.cat5 pkgsrc.cat7
        pkgsrc/pkgtools/pkg_install/files/view: pkg_view.1.in

Log Message:
pkg_install-20100122:
- Refactor man pages:
  - Move description of environmental variables into pkg_install.conf(5)
  - Remove a bunch of dead references
  - Avoid using hard-coded path names that can easily be overridden by
    the user.
- Refactor pkgdb related logic, so that -K behaves consistently.
- Add some helper functions to isolate more places from the pkgdb
  layout.
- Sync license list.
- Handle PKG_REFCOUNT_DBDIR consistently as option too.
- Utilize connection cache from libfetch.
- Add helper target for cat pages updates.


To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 pkgsrc/pkgtools/pkg_install/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/pkgtools/pkg_install/files/configure
cvs rdiff -u -r1.32 -r1.33 pkgsrc/pkgtools/pkg_install/files/configure.ac
cvs rdiff -u -r1.20 -r1.21 pkgsrc/pkgtools/pkg_install/files/add/Makefile.in
cvs rdiff -u -r1.16 -r1.17 pkgsrc/pkgtools/pkg_install/files/add/add.h
cvs rdiff -u -r1.22 -r1.23 pkgsrc/pkgtools/pkg_install/files/add/main.c
cvs rdiff -u -r1.91 -r1.92 pkgsrc/pkgtools/pkg_install/files/add/perform.c
cvs rdiff -u -r0 -r1.41 pkgsrc/pkgtools/pkg_install/files/add/pkg_add.1
cvs rdiff -u -r1.1 -r0 pkgsrc/pkgtools/pkg_install/files/add/pkg_add.1.in
cvs rdiff -u -r1.17 -r1.18 \
    pkgsrc/pkgtools/pkg_install/files/admin/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/pkgtools/pkg_install/files/admin/README
cvs rdiff -u -r1.9 -r1.10 pkgsrc/pkgtools/pkg_install/files/admin/check.c
cvs rdiff -u -r1.58 -r1.59 pkgsrc/pkgtools/pkg_install/files/admin/main.c
cvs rdiff -u -r0 -r1.31 pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.1
cvs rdiff -u -r1.1 -r0 pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.1.in
cvs rdiff -u -r1.5 -r0 pkgsrc/pkgtools/pkg_install/files/bpm/bpm.cat1
cvs rdiff -u -r1.15 -r1.16 \
    pkgsrc/pkgtools/pkg_install/files/create/Makefile.in
cvs rdiff -u -r1.18 -r1.19 pkgsrc/pkgtools/pkg_install/files/create/main.c
cvs rdiff -u -r0 -r1.24 pkgsrc/pkgtools/pkg_install/files/create/pkg_create.1
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/pkgtools/pkg_install/files/create/pkg_create.1.in
cvs rdiff -u -r1.13 -r1.14 \
    pkgsrc/pkgtools/pkg_install/files/delete/Makefile.in
cvs rdiff -u -r0 -r1.26 pkgsrc/pkgtools/pkg_install/files/delete/pkg_delete.1
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/pkgtools/pkg_install/files/delete/pkg_delete.c
cvs rdiff -u -r1.19 -r1.20 pkgsrc/pkgtools/pkg_install/files/info/Makefile.in
cvs rdiff -u -r1.29 -r1.30 pkgsrc/pkgtools/pkg_install/files/info/main.c
cvs rdiff -u -r1.59 -r1.60 pkgsrc/pkgtools/pkg_install/files/info/perform.c
cvs rdiff -u -r0 -r1.27 pkgsrc/pkgtools/pkg_install/files/info/pkg_info.1
cvs rdiff -u -r1.1 -r0 pkgsrc/pkgtools/pkg_install/files/info/pkg_info.1.in
cvs rdiff -u -r1.27 -r1.28 pkgsrc/pkgtools/pkg_install/files/lib/Makefile.in
cvs rdiff -u -r1.9 -r1.10 pkgsrc/pkgtools/pkg_install/files/lib/conflicts.c
cvs rdiff -u -r1.7 -r1.8 pkgsrc/pkgtools/pkg_install/files/lib/iterate.c
cvs rdiff -u -r1.58 -r1.59 pkgsrc/pkgtools/pkg_install/files/lib/lib.h
cvs rdiff -u -r1.10 -r1.11 pkgsrc/pkgtools/pkg_install/files/lib/license.c
cvs rdiff -u -r1.13 -r1.14 \
    pkgsrc/pkgtools/pkg_install/files/lib/parse-config.c
cvs rdiff -u -r1.12 -r1.13 \
    pkgsrc/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in
cvs rdiff -u -r1.12 -r0 \
    pkgsrc/pkgtools/pkg_install/files/lib/pkg_install.conf.cat5.in
cvs rdiff -u -r1.6 -r0 pkgsrc/pkgtools/pkg_install/files/lib/pkg_summary.cat5
cvs rdiff -u -r1.36 -r1.37 pkgsrc/pkgtools/pkg_install/files/lib/pkgdb.c
cvs rdiff -u -r1.1 -r0 pkgsrc/pkgtools/pkg_install/files/lib/pkgsrc.cat7
cvs rdiff -u -r1.145 -r1.146 pkgsrc/pkgtools/pkg_install/files/lib/version.h
cvs rdiff -u -r0 -r1.13 pkgsrc/pkgtools/pkg_install/files/view/pkg_view.1
cvs rdiff -u -r1.1 -r0 pkgsrc/pkgtools/pkg_install/files/view/pkg_view.1.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



--
"Of course I love NetBSD":-)
OBATA Akio / obache%NetBSD.org@localhost

References:
- CVS commit: pkgsrc/pkgtools/pkg_install
  - From: Joerg Sonnenberger

Prev by Date: CVS commit: pkgsrc/textproc/gnome-subtitles
Next by Date: CVS commit: pkgsrc/lang/scala
Previous by Thread: CVS commit: pkgsrc/pkgtools/pkg_install
Next by Thread: CVS commit: pkgsrc/pkgtools/pkg_install/files
Indexes:

Home | Main Index | Thread Index | Old Index