diff options
author | jlam <jlam@pkgsrc.org> | 2004-08-21 06:33:39 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2004-08-21 06:33:39 +0000 |
commit | 683567c435122b9e5709a834dc6626d060c328bb (patch) | |
tree | 89cc14e509dd852c4303ab8d2c7a4b504251dd20 /pkgtools | |
parent | f36ee299b381547a39ddabe0f99bb9dd82f122cb (diff) | |
download | pkgsrc-683567c435122b9e5709a834dc6626d060c328bb.tar.gz |
Fix the version number of the package in the configure script, and modify
the Makefiles so that they can be built by really basic make programs.
Diffstat (limited to 'pkgtools')
-rw-r--r-- | pkgtools/mtree/files/Makefile.in | 11 | ||||
-rwxr-xr-x | pkgtools/mtree/files/configure | 18 | ||||
-rw-r--r-- | pkgtools/mtree/files/configure.ac | 2 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/add/Makefile.in | 9 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/admin/Makefile.in | 9 | ||||
-rwxr-xr-x | pkgtools/pkg_install/files/configure | 18 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/configure.ac | 2 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/create/Makefile.in | 9 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/delete/Makefile.in | 9 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/info/Makefile.in | 9 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/lib/Makefile.in | 11 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/view/Makefile.in | 4 |
12 files changed, 44 insertions, 67 deletions
diff --git a/pkgtools/mtree/files/Makefile.in b/pkgtools/mtree/files/Makefile.in index 5398eea2ab0..dd7f1680c4b 100644 --- a/pkgtools/mtree/files/Makefile.in +++ b/pkgtools/mtree/files/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.6 2003/09/05 18:38:58 jlam Exp $ +# $NetBSD: Makefile.in,v 1.7 2004/08/21 06:33:39 jlam Exp $ srcdir= @srcdir@ @@ -22,17 +22,14 @@ INSTALL= @INSTALL@ PROG= mtree -SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c \ - getid.c stat_flags.c pack_dev.c -OBJS= $(SRCS:.c=.o) +OBJS= compare.o crc.o create.o excludes.o misc.o mtree.o spec.o verify.o \ + getid.o stat_flags.o pack_dev.o -.PHONY: all clean install +all: $(PROG) .c.o: $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $< -all: $(PROG) - $(PROG): $(OBJS) $(CCLD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) diff --git a/pkgtools/mtree/files/configure b/pkgtools/mtree/files/configure index f4a46f14fa0..7bf7add7bde 100755 --- a/pkgtools/mtree/files/configure +++ b/pkgtools/mtree/files/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for mtree 20030905. +# Generated by GNU Autoconf 2.59 for mtree 20040722. # # Report bugs to <grant@NetBSD.org>. # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='mtree' PACKAGE_TARNAME='mtree' -PACKAGE_VERSION='20030905' -PACKAGE_STRING='mtree 20030905' +PACKAGE_VERSION='20040722' +PACKAGE_STRING='mtree 20040722' PACKAGE_BUGREPORT='grant@NetBSD.org' ac_unique_file="mtree.c" @@ -780,7 +780,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mtree 20030905 to adapt to many kinds of systems. +\`configure' configures mtree 20040722 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -837,7 +837,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mtree 20030905:";; + short | recursive ) echo "Configuration of mtree 20040722:";; esac cat <<\_ACEOF @@ -949,7 +949,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -mtree configure 20030905 +mtree configure 20040722 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -963,7 +963,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mtree $as_me 20030905, which was +It was created by mtree $as_me 20040722, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -5325,7 +5325,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by mtree $as_me 20030905, which was +This file was extended by mtree $as_me 20040722, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5388,7 +5388,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -mtree config.status 20030905 +mtree config.status 20040722 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/pkgtools/mtree/files/configure.ac b/pkgtools/mtree/files/configure.ac index c5849c2e596..d80e8cf538b 100644 --- a/pkgtools/mtree/files/configure.ac +++ b/pkgtools/mtree/files/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT([mtree], [20030905], [grant@NetBSD.org]) +AC_INIT([mtree], [20040722], [grant@NetBSD.org]) AC_CONFIG_SRCDIR([mtree.c]) AC_CONFIG_HEADER([config.h]) diff --git a/pkgtools/pkg_install/files/add/Makefile.in b/pkgtools/pkg_install/files/add/Makefile.in index b19d0947639..69006f17ff4 100644 --- a/pkgtools/pkg_install/files/add/Makefile.in +++ b/pkgtools/pkg_install/files/add/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.11 2004/02/11 11:31:26 grant Exp $ +# $NetBSD: Makefile.in,v 1.12 2004/08/21 06:33:40 jlam Exp $ srcdir= @srcdir@ @@ -22,16 +22,13 @@ INSTALL= @INSTALL@ PROG= pkg_add -SRCS= main.c perform.c futil.c extract.c verify.c -OBJS= $(SRCS:.c=.o) +OBJS= main.o perform.o futil.o extract.o verify.o -.PHONY: all clean install +all: $(PROG) .c.o: $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $< -all: $(PROG) - $(PROG): $(OBJS) $(CCLD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) diff --git a/pkgtools/pkg_install/files/admin/Makefile.in b/pkgtools/pkg_install/files/admin/Makefile.in index 50a3157b641..5117335ef93 100644 --- a/pkgtools/pkg_install/files/admin/Makefile.in +++ b/pkgtools/pkg_install/files/admin/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.9 2003/09/23 06:36:20 grant Exp $ +# $NetBSD: Makefile.in,v 1.10 2004/08/21 06:33:40 jlam Exp $ srcdir= @srcdir@ @@ -22,16 +22,13 @@ INSTALL= @INSTALL@ PROG= pkg_admin -SRCS= main.c -OBJS= $(SRCS:.c=.o) +OBJS= main.o -.PHONY: all clean install +all: $(PROG) .c.o: $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $< -all: $(PROG) - $(PROG): $(OBJS) $(CCLD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) diff --git a/pkgtools/pkg_install/files/configure b/pkgtools/pkg_install/files/configure index d7241339d93..31977b1c2ac 100755 --- a/pkgtools/pkg_install/files/configure +++ b/pkgtools/pkg_install/files/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for pkg_install 20040601. +# Generated by GNU Autoconf 2.59 for pkg_install 20040813. # # Report bugs to <grant@NetBSD.org>. # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='pkg_install' PACKAGE_TARNAME='pkg_install' -PACKAGE_VERSION='20040601' -PACKAGE_STRING='pkg_install 20040601' +PACKAGE_VERSION='20040813' +PACKAGE_STRING='pkg_install 20040813' PACKAGE_BUGREPORT='grant@NetBSD.org' ac_unique_file="lib/plist.c" @@ -780,7 +780,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pkg_install 20040601 to adapt to many kinds of systems. +\`configure' configures pkg_install 20040813 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -841,7 +841,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pkg_install 20040601:";; + short | recursive ) echo "Configuration of pkg_install 20040813:";; esac cat <<\_ACEOF @@ -962,7 +962,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -pkg_install configure 20040601 +pkg_install configure 20040813 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -976,7 +976,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pkg_install $as_me 20040601, which was +It was created by pkg_install $as_me 20040813, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -4889,7 +4889,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by pkg_install $as_me 20040601, which was +This file was extended by pkg_install $as_me 20040813, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4949,7 +4949,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -pkg_install config.status 20040601 +pkg_install config.status 20040813 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/pkgtools/pkg_install/files/configure.ac b/pkgtools/pkg_install/files/configure.ac index 1e719fce110..b9314c5a104 100644 --- a/pkgtools/pkg_install/files/configure.ac +++ b/pkgtools/pkg_install/files/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT([pkg_install], [20040601], [grant@NetBSD.org]) +AC_INIT([pkg_install], [20040813], [grant@NetBSD.org]) AC_CONFIG_SRCDIR([lib/plist.c]) AC_CONFIG_HEADER(lib/config.h) diff --git a/pkgtools/pkg_install/files/create/Makefile.in b/pkgtools/pkg_install/files/create/Makefile.in index 4e79b084d2f..912dd2be029 100644 --- a/pkgtools/pkg_install/files/create/Makefile.in +++ b/pkgtools/pkg_install/files/create/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.10 2003/09/23 07:44:51 grant Exp $ +# $NetBSD: Makefile.in,v 1.11 2004/08/21 06:33:40 jlam Exp $ srcdir= @srcdir@ @@ -24,16 +24,13 @@ INSTALL= @INSTALL@ PROG= pkg_create -SRCS= main.c perform.c pl.c -OBJS= $(SRCS:.c=.o) +OBJS= main.o perform.o pl.o -.PHONY: all clean install +all: $(PROG) .c.o: $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $< -all: $(PROG) - $(PROG): $(OBJS) $(CCLD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) diff --git a/pkgtools/pkg_install/files/delete/Makefile.in b/pkgtools/pkg_install/files/delete/Makefile.in index 531c8eab458..b23dbc9ea3c 100644 --- a/pkgtools/pkg_install/files/delete/Makefile.in +++ b/pkgtools/pkg_install/files/delete/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.9 2003/09/23 06:36:20 grant Exp $ +# $NetBSD: Makefile.in,v 1.10 2004/08/21 06:33:40 jlam Exp $ srcdir= @srcdir@ @@ -22,16 +22,13 @@ INSTALL= @INSTALL@ PROG= pkg_delete -SRCS= main.c perform.c -OBJS= $(SRCS:.c=.o) +OBJS= main.o perform.o -.PHONY: all clean install +all: $(PROG) .c.o: $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $< -all: $(PROG) - $(PROG): $(OBJS) $(CCLD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) diff --git a/pkgtools/pkg_install/files/info/Makefile.in b/pkgtools/pkg_install/files/info/Makefile.in index 897b8914401..8207ab4e3ef 100644 --- a/pkgtools/pkg_install/files/info/Makefile.in +++ b/pkgtools/pkg_install/files/info/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.9 2003/09/23 06:36:21 grant Exp $ +# $NetBSD: Makefile.in,v 1.10 2004/08/21 06:33:40 jlam Exp $ srcdir= @srcdir@ @@ -22,16 +22,13 @@ INSTALL= @INSTALL@ PROG= pkg_info -SRCS= main.c perform.c show.c -OBJS= $(SRCS:.c=.o) +OBJS= main.o perform.o show.o -.PHONY: all clean install +all: $(PROG) .c.o: $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $< -all: $(PROG) - $(PROG): $(OBJS) $(CCLD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) diff --git a/pkgtools/pkg_install/files/lib/Makefile.in b/pkgtools/pkg_install/files/lib/Makefile.in index 8b9f84d93ee..ee75aac4b0f 100644 --- a/pkgtools/pkg_install/files/lib/Makefile.in +++ b/pkgtools/pkg_install/files/lib/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.7 2004/03/11 13:33:57 grant Exp $ +# $NetBSD: Makefile.in,v 1.8 2004/08/21 06:33:40 jlam Exp $ srcdir= @srcdir@ @@ -16,17 +16,14 @@ CFLAGS= @CFLAGS@ LIB= libinstall.a -SRCS= exec.c fexec.c file.c ftpio.c global.c lpkg.c path.c pen.c \ - pkgdb.c plist.c str.c version.c -OBJS= $(SRCS:.c=.o) +OBJS= exec.o fexec.o file.o ftpio.o global.o lpkg.o path.o pen.o \ + pkgdb.o plist.o str.o version.o -.PHONY: all clean install +all: $(LIB) .c.o: $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $< -all: $(LIB) - $(LIB): $(OBJS) $(AR) crv $@ $(OBJS) $(RANLIB) $@ diff --git a/pkgtools/pkg_install/files/view/Makefile.in b/pkgtools/pkg_install/files/view/Makefile.in index 4d5a5cbfdca..b62d1935688 100644 --- a/pkgtools/pkg_install/files/view/Makefile.in +++ b/pkgtools/pkg_install/files/view/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.3 2004/03/11 13:33:57 grant Exp $ +# $NetBSD: Makefile.in,v 1.4 2004/08/21 06:33:40 jlam Exp $ prefix= @prefix@ exec_prefix= @exec_prefix@ @@ -12,8 +12,6 @@ INSTALL= @INSTALL@ SCRIPTS= linkfarm pkg_view -.PHONY: all clean install - all: @true # do nothing |