head	1.24;
access;
symbols
	RELENG_8_4:1.24.0.2
	RELENG_9_1_0_RELEASE:1.23.2.1.4.2
	RELENG_9_1:1.23.2.1.0.4
	RELENG_9_1_BP:1.23.2.1
	RELENG_8_3_0_RELEASE:1.21.30.1.8.1
	RELENG_8_3:1.21.30.1.0.8
	RELENG_8_3_BP:1.21.30.1
	RELENG_9_0_0_RELEASE:1.23.2.1.2.1
	RELENG_9_0:1.23.2.1.0.2
	RELENG_9_0_BP:1.23.2.1
	RELENG_9:1.23.0.2
	RELENG_9_BP:1.23
	RELENG_7_4_0_RELEASE:1.21.34.1
	RELENG_8_2_0_RELEASE:1.21.30.1.6.1
	RELENG_7_4:1.21.0.34
	RELENG_7_4_BP:1.21
	RELENG_8_2:1.21.30.1.0.6
	RELENG_8_2_BP:1.21.30.1
	RELENG_8_1_0_RELEASE:1.21.30.1.4.1
	RELENG_8_1:1.21.30.1.0.4
	RELENG_8_1_BP:1.21.30.1
	RELENG_7_3_0_RELEASE:1.21.32.1
	RELENG_7_3:1.21.0.32
	RELENG_7_3_BP:1.21
	RELENG_8_0_0_RELEASE:1.21.30.1.2.1
	RELENG_8_0:1.21.30.1.0.2
	RELENG_8_0_BP:1.21.30.1
	RELENG_8:1.21.0.30
	RELENG_8_BP:1.21
	RELENG_7_2_0_RELEASE:1.21.28.1
	RELENG_7_2:1.21.0.28
	RELENG_7_2_BP:1.21
	RELENG_7_1_0_RELEASE:1.21.26.1
	RELENG_6_4_0_RELEASE:1.21.24.1
	RELENG_7_1:1.21.0.26
	RELENG_7_1_BP:1.21
	RELENG_6_4:1.21.0.24
	RELENG_6_4_BP:1.21
	RELENG_7_0_0_RELEASE:1.21
	RELENG_6_3_0_RELEASE:1.21
	RELENG_7_0:1.21.0.22
	RELENG_7_0_BP:1.21
	RELENG_6_3:1.21.0.20
	RELENG_6_3_BP:1.21
	RELENG_7:1.21.0.18
	RELENG_7_BP:1.21
	RELENG_6_2_0_RELEASE:1.21
	RELENG_6_2:1.21.0.16
	RELENG_6_2_BP:1.21
	RELENG_5_5_0_RELEASE:1.21
	RELENG_5_5:1.21.0.14
	RELENG_5_5_BP:1.21
	RELENG_6_1_0_RELEASE:1.21
	RELENG_6_1:1.21.0.12
	RELENG_6_1_BP:1.21
	RELENG_6_0_0_RELEASE:1.21
	RELENG_6_0:1.21.0.10
	RELENG_6_0_BP:1.21
	RELENG_6:1.21.0.8
	RELENG_6_BP:1.21
	RELENG_5_4_0_RELEASE:1.21
	RELENG_5_4:1.21.0.6
	RELENG_5_4_BP:1.21
	RELENG_4_11_0_RELEASE:1.11.2.6
	RELENG_4_11:1.11.2.6.0.2
	RELENG_4_11_BP:1.11.2.6
	RELENG_5_3_0_RELEASE:1.21
	RELENG_5_3:1.21.0.4
	RELENG_5_3_BP:1.21
	RELENG_5:1.21.0.2
	RELENG_5_BP:1.21
	RELENG_4_10_0_RELEASE:1.11.2.4
	RELENG_4_10:1.11.2.4.0.6
	RELENG_4_10_BP:1.11.2.4
	RELENG_5_2_1_RELEASE:1.17
	RELENG_5_2_0_RELEASE:1.17
	RELENG_5_2:1.17.0.4
	RELENG_5_2_BP:1.17
	RELENG_4_9_0_RELEASE:1.11.2.4
	RELENG_4_9:1.11.2.4.0.4
	RELENG_4_9_BP:1.11.2.4
	RELENG_5_1_0_RELEASE:1.17
	RELENG_5_1:1.17.0.2
	RELENG_5_1_BP:1.17
	RELENG_4_8_0_RELEASE:1.11.2.4
	RELENG_4_8:1.11.2.4.0.2
	RELENG_4_8_BP:1.11.2.4
	RELENG_5_0_0_RELEASE:1.16
	RELENG_5_0:1.16.0.2
	RELENG_5_0_BP:1.16
	RELENG_4_7_0_RELEASE:1.11.2.3
	RELENG_4_7:1.11.2.3.0.2
	RELENG_4_7_BP:1.11.2.3
	RELENG_4_6_2_RELEASE:1.11.2.2
	RELENG_4_6_1_RELEASE:1.11.2.2
	RELENG_4_6_0_RELEASE:1.11.2.2
	RELENG_4_6:1.11.2.2.0.4
	RELENG_4_6_BP:1.11.2.2
	RELENG_4_5_0_RELEASE:1.11.2.2
	RELENG_4_5:1.11.2.2.0.2
	RELENG_4_5_BP:1.11.2.2
	RELENG_4_4_0_RELEASE:1.11.2.1
	RELENG_4_4:1.11.2.1.0.4
	RELENG_4_4_BP:1.11.2.1
	RELENG_4_3_0_RELEASE:1.11.2.1
	RELENG_4_3:1.11.2.1.0.2
	RELENG_4_3_BP:1.11.2.1
	RELENG_4_2_0_RELEASE:1.11.2.1
	RELENG_4_1_1_RELEASE:1.11.2.1
	PRE_SMPNG:1.12
	RELENG_4_1_0_RELEASE:1.11.2.1
	RELENG_3_5_0_RELEASE:1.10.2.1
	RELENG_4_0_0_RELEASE:1.11
	RELENG_4:1.11.0.2
	RELENG_4_BP:1.11
	RELENG_3_4_0_RELEASE:1.10.2.1
	RELENG_3_3_0_RELEASE:1.10.2.1
	RELENG_3_2_PAO:1.10.0.4
	RELENG_3_2_PAO_BP:1.10
	RELENG_3_2_0_RELEASE:1.10
	RELENG_3_1_0_RELEASE:1.10
	RELENG_3:1.10.0.2
	RELENG_3_BP:1.10
	RELENG_2_2_8_RELEASE:1.9.2.1
	RELENG_3_0_0_RELEASE:1.10
	RELENG_2_2_7_RELEASE:1.9
	RELENG_2_2_6_RELEASE:1.9
	RELENG_2_2_5_RELEASE:1.9
	RELENG_2_2_2_RELEASE:1.9
	RELENG_2_2_1_RELEASE:1.9
	RELENG_2_2_0_RELEASE:1.9
	RELENG_2_1_7_RELEASE:1.5.4.2
	RELENG_2_1_6_1_RELEASE:1.5.4.2
	RELENG_2_1_6_RELEASE:1.5.4.2
	RELENG_2_2:1.9.0.2
	RELENG_2_2_BP:1.9
	RELENG_2_1_5_RELEASE:1.5.4.1
	RELENG_2_1_0_RELEASE:1.5.4.1
	RELENG_2_1_0:1.5.0.4
	RELENG_2_1_0_BP:1.5
	RELENG_2_0_5_RELEASE:1.5
	RELENG_2_0_5:1.5.0.2
	RELENG_2_0_5_BP:1.5
	RELENG_2_0_5_ALPHA:1.5
	RELEASE_2_0:1.3
	BETA_2_0:1.3
	ALPHA_2_0:1.3.0.2
	MOVED_NEWCVS:1.3
	BP_BETA_1_1:1.3
	pkg_install:1.1.1.1;
locks; strict;
comment	@# @;


1.24
date	2012.11.17.01.54.53;	author svnexp;	state Exp;
branches
	1.24.2.1;
next	1.23;

1.23
date	2011.05.17.19.11.47;	author flz;	state Exp;
branches
	1.23.2.1;
next	1.22;

1.22
date	2010.04.23.11.07.43;	author flz;	state Exp;
branches;
next	1.21;

1.21
date	2004.08.12.20.06.00;	author ru;	state Exp;
branches
	1.21.8.1
	1.21.18.1
	1.21.24.1
	1.21.26.1
	1.21.28.1
	1.21.30.1
	1.21.32.1
	1.21.34.1;
next	1.20;

1.20
date	2004.07.28.07.19.15;	author kan;	state Exp;
branches;
next	1.19;

1.19
date	2004.06.29.19.06.41;	author eik;	state Exp;
branches;
next	1.18;

1.18
date	2004.01.17.13.41.16;	author ru;	state Exp;
branches;
next	1.17;

1.17
date	2003.05.19.15.52.00;	author des;	state Exp;
branches;
next	1.16;

1.16
date	2002.06.12.12.45.23;	author des;	state Exp;
branches;
next	1.15;

1.15
date	2002.06.06.13.45.46;	author ru;	state Exp;
branches;
next	1.14;

1.14
date	2001.10.10.06.58.41;	author sobomax;	state Exp;
branches;
next	1.13;

1.13
date	2001.07.20.06.20.10;	author obrien;	state Exp;
branches;
next	1.12;

1.12
date	2000.06.27.11.00.00;	author des;	state Exp;
branches;
next	1.11;

1.11
date	99.08.28.01.17.54;	author peter;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	98.03.07.08.54.51;	author bde;	state Exp;
branches
	1.10.2.1;
next	1.9;

1.9
date	96.07.30.10.48.08;	author jkh;	state Exp;
branches
	1.9.2.1;
next	1.8;

1.8
date	96.06.24.04.25.48;	author jkh;	state Exp;
branches;
next	1.7;

1.7
date	96.06.20.18.33.32;	author jkh;	state Exp;
branches;
next	1.6;

1.6
date	95.07.30.09.11.17;	author jkh;	state Exp;
branches;
next	1.5;

1.5
date	95.04.26.15.06.24;	author jkh;	state Exp;
branches
	1.5.4.1;
next	1.4;

1.4
date	95.04.22.00.02.59;	author jkh;	state Exp;
branches;
next	1.3;

1.3
date	93.09.20.23.47.39;	author nate;	state Exp;
branches;
next	1.2;

1.2
date	93.09.03.23.00.30;	author jkh;	state Exp;
branches;
next	1.1;

1.1
date	93.08.26.01.19.53;	author jkh;	state Exp;
branches
	1.1.1.1;
next	;

1.24.2.1
date	2012.11.17.01.54.53;	author svnexp;	state dead;
branches;
next	1.24.2.2;

1.24.2.2
date	2013.03.28.13.06.21;	author svnexp;	state Exp;
branches;
next	;

1.23.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.23.2.1.2.1
	1.23.2.1.4.1;
next	1.23.2.2;

1.23.2.2
date	2012.11.17.11.37.46;	author svnexp;	state Exp;
branches;
next	;

1.23.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.23.2.1.2.2;

1.23.2.1.2.2
date	2012.11.17.08.37.42;	author svnexp;	state Exp;
branches;
next	;

1.23.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.23.2.1.4.2;

1.23.2.1.4.2
date	2012.11.17.08.48.34;	author svnexp;	state Exp;
branches;
next	;

1.21.8.1
date	2012.11.17.07.46.31;	author svnexp;	state Exp;
branches;
next	;

1.21.18.1
date	2012.11.17.08.09.04;	author svnexp;	state Exp;
branches;
next	;

1.21.24.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.21.26.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.21.28.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.21.30.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.21.30.1.2.1
	1.21.30.1.4.1
	1.21.30.1.6.1
	1.21.30.1.8.1;
next	1.21.30.2;

1.21.30.2
date	2012.11.17.10.37.24;	author svnexp;	state Exp;
branches;
next	;

1.21.30.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.21.30.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.21.30.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.21.30.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.21.30.1.8.2;

1.21.30.1.8.2
date	2012.11.17.08.25.56;	author svnexp;	state Exp;
branches;
next	;

1.21.32.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.21.34.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.21.34.2;

1.21.34.2
date	2012.11.17.08.17.49;	author svnexp;	state Exp;
branches;
next	;

1.11.2.1
date	2000.07.16.01.58.41;	author des;	state Exp;
branches;
next	1.11.2.2;

1.11.2.2
date	2001.10.23.09.16.03;	author sobomax;	state Exp;
branches;
next	1.11.2.3;

1.11.2.3
date	2002.08.31.18.41.10;	author obrien;	state Exp;
branches;
next	1.11.2.4;

1.11.2.4
date	2003.01.09.12.05.53;	author des;	state Exp;
branches;
next	1.11.2.5;

1.11.2.5
date	2004.08.11.16.16.22;	author eik;	state Exp;
branches;
next	1.11.2.6;

1.11.2.6
date	2004.12.13.13.50.01;	author marius;	state Exp;
branches;
next	1.11.2.7;

1.11.2.7
date	2012.11.17.07.28.29;	author svnexp;	state Exp;
branches;
next	;

1.10.2.1
date	99.08.29.15.45.08;	author peter;	state Exp;
branches;
next	1.10.2.2;

1.10.2.2
date	2000.07.16.01.46.37;	author des;	state Exp;
branches;
next	1.10.2.3;

1.10.2.3
date	2000.07.16.01.55.23;	author des;	state Exp;
branches;
next	;

1.9.2.1
date	98.10.28.12.00.32;	author jkh;	state Exp;
branches;
next	1.9.2.2;

1.9.2.2
date	99.09.05.11.40.42;	author peter;	state Exp;
branches;
next	;

1.5.4.1
date	95.08.30.07.49.40;	author jkh;	state Exp;
branches;
next	1.5.4.2;

1.5.4.2
date	96.08.01.12.17.27;	author jkh;	state Exp;
branches;
next	;

1.1.1.1
date	93.08.26.01.19.54;	author jkh;	state Exp;
branches;
next	;


desc
@@


1.24
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/usr.sbin/pkg_install/add/Makefile 222035 2011-05-17 19:11:47Z flz $

PROG=	pkg_add
SRCS=	main.c perform.c futil.c extract.c

CFLAGS+= -I${.CURDIR}/../lib

WARNS?=	3
WFORMAT?=	1

DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
LDADD=	${LIBINSTALL} -lfetch -lmd

.include <bsd.prog.mk>
@


1.24.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:21 +0000
@
text
@d1 14
@


1.24.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 14
# $FreeBSD: releng/8.4/usr.sbin/pkg_install/add/Makefile 133596 2004-08-12 20:06:01Z ru $

PROG=	pkg_add
SRCS=	main.c perform.c futil.c extract.c

CFLAGS+= -I${.CURDIR}/../lib

WARNS?=	3
WFORMAT?=	1

DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
LDADD=	${LIBINSTALL} -lfetch -lmd

.include <bsd.prog.mk>
@


1.23
log
@SVN rev 222035 on 2011-05-17 19:11:47Z by flz

Backout libinstall.a -> libpkg commit.

Discussed with:	erwin, brooks, bapt
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.23.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.23.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/usr.sbin/pkg_install/add/Makefile 222035 2011-05-17 19:11:47Z flz $
@


1.23.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.23.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/usr.sbin/pkg_install/add/Makefile 222035 2011-05-17 19:11:47Z flz $
@


1.23.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.23.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/usr.sbin/pkg_install/add/Makefile 222035 2011-05-17 19:11:47Z flz $
@


1.22
log
@SVN rev 207113 on 2010-04-23 11:07:43Z by flz

- Take libinstall.a out of pkg_install and make it a proper shared library.
- Rework the wrapper support to check libpkg version as well as pkg_install
version.
- Add libfetch to _prebuild_libs.
- There are no new features introduced.

Notes: the API is not stable, so basically, do not use libpkg in your
projects for now. Also there's no manpage for libpkg yet, because the API
will change drastically. I repeat, do not use libpkg for now.
@
text
@a2 2
.include <bsd.own.mk>

d6 2
d11 3
@


1.21
log
@Don't put DEBUG to CFLAGS, we have the standard DEBUG_FLAGS for this.
@
text
@d3 2
a7 2
CFLAGS+= -I${.CURDIR}/../lib

a10 3
DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
LDADD=	${LIBINSTALL} -lfetch -lmd

@


1.21.18.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.sbin/pkg_install/add/Makefile 133596 2004-08-12 20:06:01Z ru $
@


1.21.8.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/usr.sbin/pkg_install/add/Makefile 133596 2004-08-12 20:06:01Z ru $
@


1.21.34.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.21.34.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/usr.sbin/pkg_install/add/Makefile 133596 2004-08-12 20:06:01Z ru $
@


1.21.32.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.21.30.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.21.30.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/usr.sbin/pkg_install/add/Makefile 133596 2004-08-12 20:06:01Z ru $
@


1.21.30.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.21.30.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/usr.sbin/pkg_install/add/Makefile 133596 2004-08-12 20:06:01Z ru $
@


1.21.30.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.21.30.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.21.30.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.21.28.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.21.26.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.21.24.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.20
log
@Downgrade WARNS level to more tolerable value. Attempt to fix
casts as lvalue usage whenever possible.
@
text
@d6 1
a6 1
CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib
@


1.19
log
@- pkg_add spawns itself as argv[0]  when installing dependent packages, to
  enable the use as a port on older systems

- use absolute paths in all calls to external programs, to account for strange
  PATH settings

- use INDEX or INDEX-5 depending on FreeBSD version, to enable the use on
  FreeBSD 4.x as a port.

- conditionalize all 4.x/5.x differences on __FreeBSD_version, so that the
  pkg_install tools can be kept in sync on 4.x and 5.x

- Bump PKG_INSTALL_VERSION

Reviewed by:	portmgr (bento run)
MFC after:	4 weeks
@
text
@d8 1
a8 1
WARNS?=	6
@


1.18
log
@- Properly build both crypto and non-crypto versions of the
  package management tools.

- Drop redundant dependency of pkg_create(1) and pkg_delete(1)
  on crypto libraries now that they do not link with libfetch.
@
text
@d8 2
a9 1
WARNS?=	2
@


1.17
log
@Retire the useless NOSECURE knob.

Approved by:	re (scottl)
@
text
@a12 5
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+=	${LIBSSL} ${LIBCRYPTO}
LDADD+=	-lssl -lcrypto
.endif

@


1.16
log
@Reorder libraries to fix static linking (libssl depends on libcrypto, so
it must come before libcrypto in LDADD)

Reviewed by:	bde
@
text
@d13 1
a13 1
.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
@


1.15
log
@libfetch now depends on libcrypto and libssl.
@
text
@d14 2
a15 2
DPADD+=	${LIBCRYPTO} ${LIBSSL}
LDADD+=	-lcrypto -lssl
@


1.14
log
@WARNS=2 cleanup.

Tested on:	i386, alpha
MFC after:	2 weeks
@
text
@d13 5
@


1.13
log
@Perform a major cleanup of the usr.sbin Makefiles.
These are not perfectly in agreement with each other style-wise, but they
are orders of orders of magnitude more consistent style-wise than before.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/pkg_install/add/Makefile,v 1.12 2000/06/27 11:00:00 des Exp $
d7 2
@


1.12
log
@Use libfetch instead of libftpio. This adds support for http and IPv6.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/pkg_install/add/Makefile,v 1.11 1999/08/28 01:17:54 peter Exp $
d3 2
a4 1
PROG= pkg_add
d6 1
a6 1
CFLAGS+=	${DEBUG} -I${.CURDIR}/../lib
a9 2

SRCS= main.c perform.c futil.c extract.c
@


1.11
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
d7 2
a8 2
DPADD=	${LIBINSTALL} ${LIBFTPIO} ${LIBMD}
LDADD=	${LIBINSTALL} -lftpio -lmd
@


1.11.2.1
log
@MFC: Use libfetch
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/pkg_install/add/Makefile,v 1.12 2000/06/27 11:00:00 des Exp $
d7 2
a8 2
DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
LDADD=	${LIBINSTALL} -lfetch -lmd
@


1.11.2.2
log
@MFC: WANSify.
@
text
@d1 1
a1 1
# $FreeBSD$
a5 2

WARNS?=	2
@


1.11.2.3
log
@Sync style with -current to reduce diffs.
@
text
@d3 1
a3 2
PROG=	pkg_add
SRCS=	main.c perform.c futil.c extract.c
d5 1
a5 1
CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib
d11 2
@


1.11.2.4
log
@Add proper crypto dependencies for the benefit of those building static
worlds.
@
text
@a12 5
.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
DPADD+=	${LIBSSL} ${LIBCRYPTO}
LDADD+=	-lssl -lcrypto
.endif

@


1.11.2.5
log
@sync the pkg_install tools with -CURRENT:

- MFC of the package tools revision 20040629 changes.

- replace the perl version of pkg_version(1) by its C equivalent,
  which means that `pkg_version -c' does no longer work

- keep the perl version of pkg_update(1) until a replacement is available

- include some man pages fixes
@
text
@d8 1
a8 2
WARNS?=	3
WFORMAT?=	1
@


1.11.2.6
log
@MFC:
Makefile.inc1 1.361
bin/ed/Makefile 1.22
lib/Makefile 1.157
lib/libcrypt/Makefile 1.31
lib/libfetch/Makefile 1.41
lib/libpam/modules/modules.inc 1.17
libexec/Makefile 1.61
share/examples/etc/make.conf 1.215
share/man/man5/make.conf.5 1.73
usr.bin/Makefile 1.239
usr.bin/fetch/Makefile 1.14
usr.sbin/pkg_install/Makefile 1.14
usr.sbin/pkg_install/add/Makefile 1.17
usr.sbin/pkg_install/info/Makefile 1.17
usr.sbin/pkg_install/version/Makefile 1.12
usr.sbin/ppp/Makefile 1.95, 1.96
usr.sbin/pppd/Makefile 1.25
usr.sbin/sendmail/Makefile 1.40
usr.sbin/tcpdump/tcpdump/Makefile 1.36

Retire the useless NOSECURE knob.

The motivation for this MFC is that MAKE_KERBEROS4 and MAKE_KERBEROS5
are meant to be buildable by various makefiles when NOSECURE is set but
this was broken because Kerberos depends on e.g. des(3) from OpenSSL
which wasn't built when NOSECURE was defined. Fixing the NOSECURE knob
however would have meant to make it do the same as the NOCRYPT knob.
If you had been using the NOSECURE build knob please now use the NOCRYPT
knob instead.

Discussed with:	ru (some months ago)
Reviewed by:	ru (some months ago)
Approved by:	markm (telnet and secure bits, some months ago), kensmith (re)
@
text
@d14 1
a14 1
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
@


1.11.2.7
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/usr.sbin/pkg_install/add/Makefile 138803 2004-12-13 13:50:02Z marius $
@


1.10
log
@Use `foo/bar.a' instead of `-Lfoo -lbar' for linking to static internal
libraries, so that `ld -f' in can create correct dependencies for
yet-to-be-built libraries.
@
text
@d1 1
a1 1
#	$Id$
@


1.10.2.1
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.10.2.2
log
@MFC: use libfetch
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/pkg_install/add/Makefile,v 1.10.2.1 1999/08/29 15:45:08 peter Exp $
d7 2
a8 2
DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
LDADD=	${LIBINSTALL} -lfetch -lmd
@


1.10.2.3
log
@Back out MFC to wrong branch
@
text
@d7 2
a8 2
DPADD=	${LIBINSTALL} ${LIBFTPIO} ${LIBMD}
LDADD=	${LIBINSTALL} -lftpio -lmd
@


1.9
log
@Add MD5 checksums to packing list for all files during pkg_create and use
later at pkg_delete time to verify that you're deleting what you added.
This, of course, does NOT cover the case where a file you still need
hasn't changed!  That's a tougher problem to solve, and this provides
only the minimal amount of safety belt.  MD5 checksums are stored in comment
fields, so packages produced with these tools are backwards compatible with
the older ones.
@
text
@d1 2
d7 2
a8 10
.if exists(${.OBJDIR}/../lib)
LDADD+=		-L${.OBJDIR}/../lib -linstall
DPADD+=		${.OBJDIR}/../lib/libinstall.a
.else
LDADD+=		-L${.CURDIR}/../lib -linstall
DPADD+=		${.CURDIR}/../lib/libinstall.a
.endif

LDADD+=		-lftpio -lmd
DPADD+=		${LIBFTPIO} ${LIBMD}
@


1.9.2.1
log
@MFC: assorted fixes.
@
text
@a0 2
#	$Id$

d5 10
a14 2
DPADD=	${LIBINSTALL} ${LIBFTPIO} ${LIBMD}
LDADD=	${LIBINSTALL} -lftpio -lmd
@


1.9.2.2
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.8
log
@Bring in my changes for removing the pestilent obj links (unless you
really want them) from /usr/src.  This is the final version of the
patches, incorporating the feedback I've received from -current.
@
text
@d13 2
a14 2
LDADD+=		-lftpio
DPADD+=		${LIBFTPIO}
@


1.7
log
@Make pkg_install understand and use libftpio instead of its own
copies of the ftp support routines.  Also some cosmetic and minor
bug fixes I've been meaning to incorporate for awhile.
@
text
@d5 3
a7 3
.if exists(${.CURDIR}/../lib/obj)
LDADD+=		-L${.CURDIR}/../lib/obj -linstall
DPADD+=		${.CURDIR}/../lib/obj/libinstall.a
@


1.6
log
@o Fix PR# bin/643 - always set "where_to" properly.

o Nuke dependence on libftp - it's about to die!
@
text
@d13 2
@


1.5
log
@Further work on making all this more robust in the face of failure.

Also allow URL specification for a package.  This works for things the
package may depend on, too.

Allow PKG_PATH to be used anywhere a package is being searched for.
@
text
@a4 3
LDADD+=		-lftp
DPADD+=		${LIBFTP}

@


1.5.4.1
log
@Merge changes from the HEAD.
@
text
@d5 3
@


1.5.4.2
log
@Do my good deed for the day and merge in some recent pkg_install fixes
for those folk still supping -stable in the fond hope that folks might
occasionally do nice things to it.
@
text
@d5 3
a7 3
.if exists(${.OBJDIR}/../lib)
LDADD+=		-L${.OBJDIR}/../lib -linstall
DPADD+=		${.OBJDIR}/../lib/libinstall.a
a12 2
LDADD+=		-lftpio -lmd
DPADD+=		${LIBFTPIO} ${LIBMD}
@


1.4
log
@1. Add proper dependencies to the library in my Makefiles.  This was pointed
   out by Bruce.
2. Add a "feature" to pkg_create (OK, OK, it's a miserable hack!) to get
   it to dump its internal packing list out so that the `fake-pkg' rule in
   bsd.port.mk can generate a more meaningful packing list.
@
text
@d5 3
@


1.3
log
@Now works with/without obj directories
@
text
@d4 8
a11 1
LDADD+=		-L${.CURDIR}/../lib -L${.CURDIR}/../lib/obj -linstall
@


1.2
log
@Lots of misc tweaks, support for arbitrary separators in pkg_info, more
intelligent name handling in pkg_create.  Most of these files are changed
because of rcsid's being different in my cvs tree and freefall's (foo).
@
text
@d4 2
a5 1
LDADD+=		-L${.CURDIR}/../lib -linstall
@


1.1
log
@Initial revision
@
text
@d3 1
a3 1
CFLAGS+=	-I${.CURDIR}/../lib
@


1.1.1.1
log
@The release version of my package install suite.  Please see man pages
for info.
@
text
@@
