head	1.36;
access;
symbols
	RELENG_8_4:1.35.0.2
	RELENG_9_1_0_RELEASE:1.34.4.1.4.2
	RELENG_9_1:1.34.4.1.0.4
	RELENG_9_1_BP:1.34.4.1
	RELENG_8_3_0_RELEASE:1.34.2.1.8.1
	RELENG_8_3:1.34.2.1.0.8
	RELENG_8_3_BP:1.34.2.1
	RELENG_9_0_0_RELEASE:1.34.4.1.2.1
	RELENG_9_0:1.34.4.1.0.2
	RELENG_9_0_BP:1.34.4.1
	RELENG_9:1.34.0.4
	RELENG_9_BP:1.34
	RELENG_7_4_0_RELEASE:1.33.12.1
	RELENG_8_2_0_RELEASE:1.34.2.1.6.1
	RELENG_7_4:1.33.0.12
	RELENG_7_4_BP:1.33
	RELENG_8_2:1.34.2.1.0.6
	RELENG_8_2_BP:1.34.2.1
	RELENG_8_1_0_RELEASE:1.34.2.1.4.1
	RELENG_8_1:1.34.2.1.0.4
	RELENG_8_1_BP:1.34.2.1
	RELENG_7_3_0_RELEASE:1.33.10.1
	RELENG_7_3:1.33.0.10
	RELENG_7_3_BP:1.33
	RELENG_8_0_0_RELEASE:1.34.2.1.2.1
	RELENG_8_0:1.34.2.1.0.2
	RELENG_8_0_BP:1.34.2.1
	RELENG_8:1.34.0.2
	RELENG_8_BP:1.34
	RELENG_7_2_0_RELEASE:1.33.8.1
	RELENG_7_2:1.33.0.8
	RELENG_7_2_BP:1.33
	RELENG_7_1_0_RELEASE:1.33.6.1
	RELENG_6_4_0_RELEASE:1.31.2.1.10.1
	RELENG_7_1:1.33.0.6
	RELENG_7_1_BP:1.33
	RELENG_6_4:1.31.2.1.0.10
	RELENG_6_4_BP:1.31.2.1
	RELENG_7_0_0_RELEASE:1.33
	RELENG_6_3_0_RELEASE:1.31.2.1
	RELENG_7_0:1.33.0.4
	RELENG_7_0_BP:1.33
	RELENG_6_3:1.31.2.1.0.8
	RELENG_6_3_BP:1.31.2.1
	RELENG_7:1.33.0.2
	RELENG_7_BP:1.33
	RELENG_6_2_0_RELEASE:1.31.2.1
	RELENG_6_2:1.31.2.1.0.6
	RELENG_6_2_BP:1.31.2.1
	RELENG_5_5_0_RELEASE:1.28.2.1
	RELENG_5_5:1.28.2.1.0.6
	RELENG_5_5_BP:1.28.2.1
	RELENG_6_1_0_RELEASE:1.31.2.1
	RELENG_6_1:1.31.2.1.0.4
	RELENG_6_1_BP:1.31.2.1
	RELENG_6_0_0_RELEASE:1.31.2.1
	RELENG_6_0:1.31.2.1.0.2
	RELENG_6_0_BP:1.31.2.1
	RELENG_6:1.31.0.2
	RELENG_6_BP:1.31
	RELENG_5_4_0_RELEASE:1.28.2.1
	RELENG_5_4:1.28.2.1.0.4
	RELENG_5_4_BP:1.28.2.1
	RELENG_4_11_0_RELEASE:1.22.2.1
	RELENG_4_11:1.22.2.1.0.10
	RELENG_4_11_BP:1.22.2.1
	RELENG_5_3_0_RELEASE:1.28.2.1
	RELENG_5_3:1.28.2.1.0.2
	RELENG_5_3_BP:1.28.2.1
	RELENG_5:1.28.0.2
	RELENG_5_BP:1.28
	RELENG_4_10_0_RELEASE:1.22.2.1
	RELENG_4_10:1.22.2.1.0.8
	RELENG_4_10_BP:1.22.2.1
	RELENG_5_2_1_RELEASE:1.24
	RELENG_5_2_0_RELEASE:1.24
	RELENG_5_2:1.24.0.6
	RELENG_5_2_BP:1.24
	RELENG_4_9_0_RELEASE:1.22.2.1
	RELENG_4_9:1.22.2.1.0.6
	RELENG_4_9_BP:1.22.2.1
	RELENG_5_1_0_RELEASE:1.24
	RELENG_5_1:1.24.0.4
	RELENG_5_1_BP:1.24
	RELENG_4_8_0_RELEASE:1.22.2.1
	RELENG_4_8:1.22.2.1.0.4
	RELENG_4_8_BP:1.22.2.1
	RELENG_5_0_0_RELEASE:1.24
	RELENG_5_0:1.24.0.2
	RELENG_5_0_BP:1.24
	RELENG_4_7_0_RELEASE:1.22.2.1
	RELENG_4_7:1.22.2.1.0.2
	RELENG_4_7_BP:1.22.2.1
	RELENG_4_6_2_RELEASE:1.22
	RELENG_4_6_1_RELEASE:1.22
	RELENG_4_6_0_RELEASE:1.22
	RELENG_4_6:1.22.0.10
	RELENG_4_6_BP:1.22
	RELENG_4_5_0_RELEASE:1.22
	RELENG_4_5:1.22.0.8
	RELENG_4_5_BP:1.22
	RELENG_4_4_0_RELEASE:1.22
	RELENG_4_4:1.22.0.6
	RELENG_4_4_BP:1.22
	RELENG_4_3_0_RELEASE:1.22
	RELENG_4_3:1.22.0.4
	RELENG_4_3_BP:1.22
	RELENG_4_2_0_RELEASE:1.22
	RELENG_4_1_1_RELEASE:1.22
	PRE_SMPNG:1.22
	RELENG_4_1_0_RELEASE:1.22
	RELENG_3_5_0_RELEASE:1.19.2.1
	RELENG_4_0_0_RELEASE:1.22
	RELENG_4:1.22.0.2
	RELENG_4_BP:1.22
	RELENG_3_4_0_RELEASE:1.19.2.1
	RELENG_3_3_0_RELEASE:1.19.2.1
	RELENG_3_2_PAO:1.19.0.4
	RELENG_3_2_PAO_BP:1.19
	RELENG_3_2_0_RELEASE:1.19
	RELENG_3_1_0_RELEASE:1.19
	RELENG_3:1.19.0.2
	RELENG_3_BP:1.19
	RELENG_2_2_8_RELEASE:1.18.2.1
	RELENG_3_0_0_RELEASE:1.19
	RELENG_2_2_7_RELEASE:1.18.2.1
	RELENG_2_2_6_RELEASE:1.18.2.1
	RELENG_2_2_5_RELEASE:1.18.2.1
	RELENG_2_2_2_RELEASE:1.18.2.1
	RELENG_2_2_1_RELEASE:1.18.2.1
	RELENG_2_2_0_RELEASE:1.18.2.1
	RELENG_2_1_7_RELEASE:1.14.4.2
	RELENG_2_1_6_1_RELEASE:1.14.4.2
	RELENG_2_1_6_RELEASE:1.14.4.2
	RELENG_2_2:1.18.0.2
	RELENG_2_2_BP:1.18
	RELENG_2_1_5_RELEASE:1.14.4.2
	RELENG_2_1_0_RELEASE:1.14
	RELENG_2_1_0:1.14.0.4
	RELENG_2_1_0_BP:1.14
	RELENG_2_0_5_RELEASE:1.14
	RELENG_2_0_5:1.14.0.2
	RELENG_2_0_5_BP:1.14
	RELENG_2_0_5_ALPHA:1.14
	RELEASE_2_0:1.9
	BETA_2_0:1.9
	ALPHA_2_0:1.9.0.2
	MOVED_NEWCVS:1.8
	FINAL_1_1_5:1.8
	ALPHA_1_1_5:1.8
	FINAL_1_1:1.6
	GAMMA_1_1:1.6
	BETA_1_1:1.6.0.2
	BP_BETA_1_1:1.6
	FINAL_1_0:1.3
	EPSILON_1_0:1.3
	GAMMA_1_0:1.3
	BETA_1_0:1.2;
locks; strict;
comment	@# @;


1.36
date	2013.06.06.00.39.02;	author svnexp;	state Exp;
branches;
next	1.35;

1.35
date	2012.11.17.01.49.07;	author svnexp;	state Exp;
branches
	1.35.2.1;
next	1.34;

1.34
date	2009.07.19.17.25.24;	author kensmith;	state Exp;
branches
	1.34.2.1
	1.34.4.1;
next	1.33;

1.33
date	2007.06.18.18.47.53;	author rafan;	state Exp;
branches
	1.33.2.1
	1.33.6.1
	1.33.8.1
	1.33.10.1
	1.33.12.1;
next	1.32;

1.32
date	2005.07.22.17.18.58;	author kensmith;	state Exp;
branches;
next	1.31;

1.31
date	2005.05.10.11.37.37;	author tjr;	state Exp;
branches
	1.31.2.1;
next	1.30;

1.30
date	2004.09.19.12.15.25;	author ru;	state Exp;
branches;
next	1.29;

1.29
date	2004.09.16.01.39.13;	author peter;	state Exp;
branches;
next	1.28;

1.28
date	2004.03.22.14.44.00;	author ache;	state Exp;
branches
	1.28.2.1;
next	1.27;

1.27
date	2004.02.25.02.41.15;	author ache;	state Exp;
branches;
next	1.26;

1.26
date	2004.02.18.22.09.34;	author ache;	state Exp;
branches;
next	1.25;

1.25
date	2004.02.16.22.32.13;	author ache;	state Exp;
branches;
next	1.24;

1.24
date	2002.09.28.00.25.27;	author peter;	state Exp;
branches;
next	1.23;

1.23
date	2002.05.12.16.00.47;	author ru;	state Exp;
branches;
next	1.22;

1.22
date	99.08.28.04.58.19;	author peter;	state Exp;
branches
	1.22.2.1;
next	1.21;

1.21
date	99.04.03.22.54.47;	author obrien;	state Exp;
branches;
next	1.20;

1.20
date	99.04.03.22.52.35;	author obrien;	state Exp;
branches;
next	1.19;

1.19
date	96.11.16.22.53.42;	author joerg;	state Exp;
branches
	1.19.2.1;
next	1.18;

1.18
date	96.08.30.02.12.07;	author peter;	state Exp;
branches
	1.18.2.1;
next	1.17;

1.17
date	96.08.12.19.04.23;	author ache;	state Exp;
branches;
next	1.16;

1.16
date	96.08.12.18.03.53;	author ache;	state Exp;
branches;
next	1.15;

1.15
date	95.08.06.12.23.01;	author bde;	state Exp;
branches;
next	1.14;

1.14
date	95.03.12.23.21.29;	author ache;	state Exp;
branches
	1.14.4.1;
next	1.13;

1.13
date	95.03.06.05.51.32;	author nate;	state Exp;
branches;
next	1.12;

1.12
date	95.01.16.17.54.57;	author ache;	state Exp;
branches;
next	1.11;

1.11
date	95.01.11.06.12.01;	author ache;	state Exp;
branches;
next	1.10;

1.10
date	95.01.11.05.39.07;	author ache;	state Exp;
branches;
next	1.9;

1.9
date	94.09.15.19.52.50;	author bde;	state Exp;
branches;
next	1.8;

1.8
date	94.05.27.10.53.33;	author csgr;	state Exp;
branches;
next	1.7;

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

1.6
date	94.01.29.20.20.51;	author nate;	state Exp;
branches;
next	1.5;

1.5
date	93.12.28.07.57.07;	author smace;	state Exp;
branches;
next	1.4;

1.4
date	93.11.09.20.23.44;	author paul;	state Exp;
branches;
next	1.3;

1.3
date	93.08.23.05.26.19;	author rgrimes;	state Exp;
branches;
next	1.2;

1.2
date	93.08.08.04.38.56;	author rgrimes;	state Exp;
branches;
next	1.1;

1.1
date	93.07.30.20.15.28;	author conklin;	state Exp;
branches;
next	;

1.35.2.1
date	2012.11.17.01.49.07;	author svnexp;	state dead;
branches;
next	1.35.2.2;

1.35.2.2
date	2013.03.28.13.02.47;	author svnexp;	state Exp;
branches;
next	;

1.34.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.34.2.1.2.1
	1.34.2.1.4.1
	1.34.2.1.6.1
	1.34.2.1.8.1;
next	1.34.2.2;

1.34.2.2
date	2012.11.17.10.35.58;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.34.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.34.2.1.8.2;

1.34.2.1.8.2
date	2012.11.17.08.24.39;	author svnexp;	state Exp;
branches;
next	;

1.34.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.34.4.1.2.1
	1.34.4.1.4.1;
next	1.34.4.2;

1.34.4.2
date	2012.11.17.11.36.12;	author svnexp;	state Exp;
branches;
next	;

1.34.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.34.4.1.2.2;

1.34.4.1.2.2
date	2012.11.17.08.36.12;	author svnexp;	state Exp;
branches;
next	;

1.34.4.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.34.4.1.4.2;

1.34.4.1.4.2
date	2012.11.17.08.47.02;	author svnexp;	state Exp;
branches;
next	;

1.33.2.1
date	2012.11.17.08.01.27;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.33.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.33.12.2;

1.33.12.2
date	2012.11.17.08.16.38;	author svnexp;	state Exp;
branches;
next	;

1.31.2.1
date	2005.07.22.17.29.02;	author kensmith;	state Exp;
branches
	1.31.2.1.10.1;
next	1.31.2.2;

1.31.2.2
date	2012.11.17.07.39.14;	author svnexp;	state Exp;
branches;
next	;

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

1.28.2.1
date	2004.10.06.23.36.20;	author peter;	state Exp;
branches;
next	;

1.22.2.1
date	2002.07.22.14.21.45;	author ru;	state Exp;
branches;
next	1.22.2.2;

1.22.2.2
date	2012.11.17.07.22.53;	author svnexp;	state Exp;
branches;
next	;

1.19.2.1
date	99.08.29.14.29.03;	author peter;	state Exp;
branches;
next	;

1.18.2.1
date	96.11.20.15.05.46;	author joerg;	state Exp;
branches;
next	1.18.2.2;

1.18.2.2
date	99.09.05.11.05.22;	author peter;	state Exp;
branches;
next	;

1.14.4.1
date	96.05.29.22.31.31;	author jkh;	state Exp;
branches;
next	1.14.4.2;

1.14.4.2
date	96.06.05.02.38.54;	author jkh;	state Exp;
branches;
next	1.14.4.3;

1.14.4.3
date	99.09.05.11.10.16;	author peter;	state Exp;
branches;
next	;


desc
@@


1.36
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/251438
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# $FreeBSD: head/gnu/lib/libregex/Makefile 251438 2013-06-05 21:31:06Z jkim $

SUBDIR=		doc

LIB=		gnuregex
SHLIB_MAJOR=	5

REGEXDIR=	${.CURDIR}/../../../contrib/libgnuregex
.PATH:		${REGEXDIR}

SRCS=		gnuregex.c
INCSGROUPS=	INCS WRINCS PXINCS
INCS=		regex.h.patched
INCSNAME=	regex.h
INCSDIR=	${INCLUDEDIR}/gnu
WRINCS=		gnuregex.h
PXINCS=		${REGEXDIR}/regex.h
PXINCSDIR=	${INCSDIR}/posix

CFLAGS+=	-D__attribute_warn_unused_result__=""
CFLAGS+=	-DHAVE_CONFIG_H -I${.CURDIR} -I${REGEXDIR}

CLEANFILES=	regex.h.patched gnuregex.c
regex.h.patched: regex.h
	sed 's=<posix/regex\.h>=<gnu/posix/regex.h>=g' \
		< ${.ALLSRC} > ${.TARGET}

gnuregex.c: regex.c
	sed 's=<regex\.h>=<gnu/regex.h>=g' \
		< ${.ALLSRC} > ${.TARGET}

.include <bsd.lib.mk>
@


1.35
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/gnu/lib/libregex/Makefile 195767 2009-07-19 17:25:24Z kensmith $
d8 3
d17 1
a17 1
PXINCS=		posix/regex.h
d20 2
a21 1
CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}
@


1.35.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:02:47 +0000
@
text
@d1 28
@


1.35.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 28
# $FreeBSD: releng/8.4/gnu/lib/libregex/Makefile 195767 2009-07-19 17:25:24Z kensmith $

SUBDIR=		doc

LIB=		gnuregex
SHLIB_MAJOR=	5

SRCS=		gnuregex.c
INCSGROUPS=	INCS WRINCS PXINCS
INCS=		regex.h.patched
INCSNAME=	regex.h
INCSDIR=	${INCLUDEDIR}/gnu
WRINCS=		gnuregex.h
PXINCS=		posix/regex.h
PXINCSDIR=	${INCSDIR}/posix

CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}

CLEANFILES=	regex.h.patched gnuregex.c
regex.h.patched: regex.h
	sed 's=<posix/regex\.h>=<gnu/posix/regex.h>=g' \
		< ${.ALLSRC} > ${.TARGET}

gnuregex.c: regex.c
	sed 's=<regex\.h>=<gnu/regex.h>=g' \
		< ${.ALLSRC} > ${.TARGET}

.include <bsd.lib.mk>
@


1.34
log
@SVN rev 195767 on 2009-07-19 17:25:24Z by kensmith

Bump the version of all non-symbol-versioned shared libraries in
preparation for 8.0-RELEASE.  Add the previous version of those
libraries to ObsoleteFiles.inc and bump __FreeBSD_Version.

Reviewed by:    kib
Approved by:    re (rwatson)
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.34.4.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.34.4.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/gnu/lib/libregex/Makefile 195767 2009-07-19 17:25:24Z kensmith $
@


1.34.4.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.34.4.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/gnu/lib/libregex/Makefile 195767 2009-07-19 17:25:24Z kensmith $
@


1.34.4.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.34.4.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/gnu/lib/libregex/Makefile 195767 2009-07-19 17:25:24Z kensmith $
@


1.34.2.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.34.2.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/gnu/lib/libregex/Makefile 195767 2009-07-19 17:25:24Z kensmith $
@


1.34.2.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.34.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/gnu/lib/libregex/Makefile 195767 2009-07-19 17:25:24Z kensmith $
@


1.34.2.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.34.2.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.34.2.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.33
log
@- Bump share library version which were missed in last bump

Reported by: 	     jhb
Discussed with:	     deischen, des, doubg, harti
Approved by:	     re (kensmith)
@
text
@d6 1
a6 1
SHLIB_MAJOR=	4
@


1.33.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/gnu/lib/libregex/Makefile 170925 2007-06-18 18:47:54Z rafan $
@


1.33.12.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.33.12.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/gnu/lib/libregex/Makefile 170925 2007-06-18 18:47:54Z rafan $
@


1.33.10.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.33.8.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.33.6.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.32
log
@Bump the shared library version number of all libraries that have not
been bumped since RELENG_5.

Reviewed by:	ru
Approved by:	re (not needed for commit check but in principle...)
@
text
@d6 1
a6 1
SHLIB_MAJOR=	3
@


1.31
log
@Update build infrastructure for new GNU regex bits.
@
text
@d6 1
a6 1
SHLIB_MAJOR=	2
@


1.31.2.1
log
@Insta-MFC of the shared library version bump.  All shared libraries
whose version has not already been bumped since RELENG_5 are being
bumped.

Revisions of files being MFC-ed:

> Path						Revision
> src/gnu/lib/libdialog/Makefile		1.43
> src/gnu/lib/libg2c/Makefile			1.16
> src/gnu/lib/libobjc/Makefile			1.27
> src/gnu/lib/libreadline/Makefile.inc		1.12
> src/gnu/lib/libregex/Makefile			1.32
> src/gnu/lib/libstdc++/Makefile		1.56
> src/kerberos5/lib/Makefile.inc		1.7
> src/lib/Makefile.inc				1.3
> src/lib/libalias/Makefile			1.31
> src/lib/libarchive/Makefile			1.37
> src/lib/libbegemot/Makefile			1.3
> src/lib/libbluetooth/Makefile			1.2
> src/lib/libbsnmp/Makefile.inc			1.6
> src/lib/libbz2/Makefile			1.6
> src/lib/libc_r/Makefile			1.42
> src/lib/libcrypt/Makefile			1.36
> src/lib/libdevstat/Makefile			1.15
> src/lib/libdevstat/devstat.h			1.11
> src/lib/libedit/Makefile			1.29
> src/lib/libexpat/Makefile			1.5
> src/lib/libfetch/Makefile			1.45
> src/lib/libftpio/Makefile			1.14
> src/lib/libgpib/Makefile			1.2
> src/lib/libipsec/Makefile			1.17
> src/lib/libkiconv/Makefile			1.3
> src/lib/libmagic/Makefile			1.7
> src/lib/libmp/Makefile			1.10
> src/lib/libncp/Makefile			1.6
> src/lib/libncurses/Makefile			1.79
> src/lib/libnetgraph/Makefile			1.11
> src/lib/libngatm/Makefile			1.6
> src/lib/libopie/Makefile			1.21
> src/lib/libpam/Makefile.inc			1.17
> src/lib/libpthread/Makefile			1.54
> src/lib/libradius/Makefile			1.12
> src/lib/libsdp/Makefile			1.4
> src/lib/libsmb/Makefile			1.8
> src/lib/libtacplus/Makefile			1.7
> src/lib/libthr/Makefile			1.14
> src/lib/libthread_db/Makefile			1.6
> src/lib/libugidfw/Makefile			1.7
> src/lib/libusbhid/Makefile			1.10
> src/lib/libutil/Makefile			1.57
> src/lib/libvgl/Makefile			1.11
> src/lib/libwrap/Makefile			1.17
> src/lib/libypclnt/Makefile			1.13
> src/lib/msun/Makefile				1.72
> src/secure/lib/libcrypto/Makefile		1.74
> src/secure/lib/libssh/Makefile		1.35
> src/secure/lib/libssl/Makefile		1.22
> src/usr.sbin/bsnmpd/modules/Makefile.inc	1.10

Reviewed by:	ru
Approved by:	re (scottl)
@
text
@d6 1
a6 1
SHLIB_MAJOR=	3
@


1.31.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/gnu/lib/libregex/Makefile 148300 2005-07-22 17:29:10Z kensmith $
@


1.31.2.1.10.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.30
log
@Style.
@
text
@d17 1
a17 1
CFLAGS+=-D_REGEX_RE_COMP -DSTDC_HEADERS
@


1.29
log
@Be explicit about which regex.h file we are including.  This reduces the
need for hack workarounds in tools/lib32/build32.sh.
@
text
@d3 1
a3 1
SUBDIR+= doc
d8 1
a8 1
SRCS=	gnuregex.c
d10 1
a10 2
INCS=	 regex.h.patched
CLEANFILES+=	regex.h.patched gnuregex.c
d13 3
a15 4
WRINCS=	gnuregex.h
PXINCS= posix/regex.h
PXINCSDIR=	${INCLUDEDIR}/gnu/posix
NOMAN=	noman
d19 1
@


1.28
log
@Forced commit note to explain why NO_POSIX_COMPAT was removed with upgrade.

NO_POSIX_COMPAT was added in 1996 as attempt to resolve POSIX regex
functions conflict for fixit floppy (they are both in libc and libgnuregex)
The way it done (simple excluding POSIX functions from compile) breaks
legitimate case when, say, some program from ports calls both POSIX
and GNU regex functions (it will call POSIX ones from libc and fails,
because header <regex.h> is from GNU).

Now our fixit floppy (and other crunched floppies, as I check) not
use libgnuregex, so the hack can be removed.
@
text
@d8 1
a8 1
SRCS=	regex.c
d11 1
a11 1
CLEANFILES+=	regex.h.patched
d19 1
a19 1
CFLAGS+=-D_REGEX_RE_COMP -DSTDC_HEADERS -I${DESTDIR}/usr/include/gnu
d23 4
@


1.28.2.1
log
@MFC: make libgnuregex not depend on -I overrides that conflict with the
build32.sh script.

Approved by:  re (kensmith, scottl)
@
text
@d3 1
a3 1
SUBDIR=		doc
d8 1
a8 1
SRCS=		gnuregex.c
d10 2
a11 1
INCS=		regex.h.patched
d14 4
a17 3
WRINCS=		gnuregex.h
PXINCS=		posix/regex.h
PXINCSDIR=	${INCSDIR}/posix
d19 1
a19 1
CFLAGS+=-D_REGEX_RE_COMP -DSTDC_HEADERS
a20 1
CLEANFILES=	regex.h.patched gnuregex.c
a22 4
		< ${.ALLSRC} > ${.TARGET}

gnuregex.c: regex.c
	sed 's=<regex\.h>=<gnu/regex.h>=g' \
@


1.27
log
@Upgrade to regex from grep 2.4.2
@
text
@@


1.26
log
@Install gnuregex.h as wrapper for gnu/regex.h (with warning)
@
text
@d9 4
a12 2
INCSGROUPS=	INCS WRINCS
INCS=	regex.h
d15 2
d19 5
a23 1
CFLAGS+=-I${.CURDIR} -DHAVE_STRING_H=1 -DSTDC_HEADERS=1 -DNO_POSIX_COMPAT=1
@


1.25
log
@Install regex.h under include/gnu
@
text
@d9 1
d11 2
a12 1
INCSDIR=   ${INCLUDEDIR}/gnu
@


1.24
log
@Zap now-unused SHLIB_MINOR
@
text
@d10 1
a10 1
INCSNAME= gnuregex.h
@


1.23
log
@Added new bsd.incs.mk which handles installing of header files
via INCS.  Implemented INCSLINKS (equivalent to SYMLINKS) to
handle symlinking include files.  Allow for multiple groups of
include files to be installed, with the powerful INCSGROUPS knob.
Documentation to follow.

Added standard `includes' and `incsinstall' targets, use them
in Makefile.inc1.  Headers from the following makefiles were
not installed before (during `includes' in Makefile.inc1):

	kerberos5/lib/libtelnet/Makefile
	lib/libbz2/Makefile
	lib/libdevinfo/Makefile
	lib/libform/Makefile
	lib/libisc/Makefile
	lib/libmenu/Makefile
	lib/libmilter/Makefile
	lib/libpanel/Makefile

Replaced all `beforeinstall' targets for installing includes
with the INCS stuff.

Renamed INCDIR to INCSDIR, for consistency with FILES and SCRIPTS,
and for compatibility with NetBSD.  Similarly for INCOWN, INCGRP,
and INCMODE.

Consistently use INCLUDEDIR instead of /usr/include.

gnu/lib/libstdc++/Makefile and gnu/lib/libsupc++/Makefile changes
were only lightly tested due to the missing contrib/libstdc++-v3.
I fully tested the pre-WIP_GCC31 version of this patch with the
contrib/libstdc++.295 stuff.

These changes have been tested on i386 with the -DNO_WERROR "make
world" and "make release".
@
text
@a6 1
SHLIB_MINOR=	0
@


1.22
log
@$Header$ -> $FreeBSD$
@
text
@d10 2
a14 4

beforeinstall:
	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/regex.h \
		${DESTDIR}/usr/include/gnuregex.h
@


1.22.2.1
log
@MFC: bsd.incs.mk support and assorted header fixes:

Install sys/<arch>/include/pc/*.h to /usr/include/machine/pc/.

Install sys/netatm/*/*.h to /usr/include/netatm/*/.

Don't install compatibility symlinks for <machine/soundcard.h>
and <machine/joystick.h>.

Don't install IPFILTER headers.  Userland utilities fetch them
directly, and they were not visible in the SHARED=symlinks case.

Resurrect SHARED=symlinks in Makefile.inc1.

PR:		docs/29534, bin/28002
@
text
@a9 2
INCS=	regex.h
INCSNAME= gnuregex.h
d13 4
@


1.22.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/gnu/lib/libregex/Makefile 100501 2002-07-22 14:21:52Z ru $
@


1.21
log
@Commit msg for rev 1.20 should probably have added that gnu/lib/libregex was
the only lib that was using the SHLIB_* values from gnu/lib/Makefile.inc.
Thus I simply added the to the Makefile here.
@
text
@d1 1
a1 1
# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.20 1999/04/03 22:52:35 obrien Exp $
@


1.20
log
@Makefile.inc was politing all subdir's with SHLIB_{MAJOR,MINOR} definitions.
Since we aren't keeping all the GNU libs at the same versions, this is
useless and causes us to build a shared libgcc, which we don't want to do.
@
text
@d1 1
a1 1
# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.19 1996/11/16 22:53:42 joerg Exp $
@


1.19
log
@Disable the inclusion of the Posix regexp stuff into libgnuregexp.
We've already got it in libc, but both libraries are incompatible
wrt. their header files and internal data structures.  This
incompatibility caused the expr(1) on the fixit floppy to mysteriously
dump core for the colon operator.

Strong 2.2 candidate, since it fixes the usage of MAKEDEV on the fixit
floppy.  I'd like to get it reviewed by somebody else though.

Observed by: andreas
@
text
@d1 1
a1 1
# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.18 1996/08/30 02:12:07 peter Exp $
d3 5
a8 2
LIB=	gnuregex
CFLAGS+=-I${.CURDIR} -DHAVE_STRING_H=1 -DSTDC_HEADERS=1 -DNO_POSIX_COMPAT=1
d12 1
a12 1
SUBDIR+= doc
@


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


1.18
log
@cmp -s || install -c ==> install -C
@
text
@d1 1
a1 1
# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.17 1996/08/12 19:04:23 ache Exp $
d5 1
a5 1
CFLAGS+=-I${.CURDIR} -DHAVE_STRING_H=1 -DSTDC_HEADERS=1
@


1.18.2.1
log
@Merge from HEAD: don't duplicate the Posix regex stuff in libregex,
it's already in libc (and both implementations clash when linking both
libs simultaneously).
@
text
@d1 1
a1 1
# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.19 1996/11/16 22:53:42 joerg Exp $
d5 1
a5 1
CFLAGS+=-I${.CURDIR} -DHAVE_STRING_H=1 -DSTDC_HEADERS=1 -DNO_POSIX_COMPAT=1
@


1.18.2.2
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.18.2.1 1996/11/20 15:05:46 joerg Exp $
@


1.17
log
@Convert to newly aded collate compare function
@
text
@d1 1
a1 1
# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.16 1996/08/12 18:03:53 ache Exp $
d12 2
a13 3
	cmp -s ${.CURDIR}/regex.h ${DESTDIR}/usr/include/gnuregex.h || \
	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
		${.CURDIR}/regex.h ${DESTDIR}/usr/include/gnuregex.h
@


1.16
log
@Use collate for alpha character ranges
@
text
@d1 1
a1 1
# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.15 1995/08/06 12:23:01 bde Exp $
d5 1
a5 2
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../../lib/libc/locale \
	-DHAVE_STRING_H=1 -DSTDC_HEADERS=1
@


1.15
log
@Change `install' to `${INSTALL}' so that default install flags can be
specified in the top level Makefiles.

Previously I missed dozens of Makefiles that skip the install after
using `cmp -s' to decide that the install isn't necessary.
@
text
@d1 1
a1 1
# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.14 1995/03/12 23:21:29 ache Exp $
d5 2
a6 1
CFLAGS+=-I${.CURDIR} -DHAVE_STRING_H=1 -DSTDC_HEADERS=1
@


1.14
log
@Add cmp -s to beforeinstall target
@
text
@d1 1
a1 1
# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.13 1995/03/06 05:51:32 nate Exp $
d13 1
a13 1
	install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
@


1.14.4.1
log
@Merge from HEAD, except:

	Clients that used gnumalloc still do, despite the merge.  We're not
	bringing phkmalloc over.

	Thread stuff left out.

	PCCARD support left out.
@
text
@d1 1
a1 1
# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.14 1995/03/12 23:21:29 ache Exp $
d13 1
a13 1
	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
@


1.14.4.2
log
@This 3rd mega-commit should hopefully bring us back to where we were.
I can get it to `make world' succesfully, anyway!
@
text
@d1 1
a1 1
# $Header: /pub/FreeBSD/FreeBSD-CVS/src/gnu/lib/libregex/Makefile,v 1.14 1995/03/12 23:21:29 ache Exp $
d13 1
a13 1
	install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
@


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


1.13
log
@Install the include file in the same way that all other includes file are
in the 'beforeinstall' target.
@
text
@d1 1
a1 1
# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.12 1995/01/16 17:54:57 ache Exp $
d12 1
@


1.12
log
@Add doc to SUBDIR
@
text
@d1 1
a1 1
# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.11 1995/01/11 06:12:01 ache Exp $
d11 1
a11 1
afterinstall:
@


1.11
log
@Upgrade to code which should satisfy all things which we have
@
text
@d1 1
a1 1
# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.9 1994/09/15 19:52:50 bde Exp $
d8 2
@


1.10
log
@Upgrade regex code to most recent that I found
Version number still not changed
@
text
@d5 1
a5 1
CFLAGS+=-DHAVE_STRING_H=1 -DSTDC_HEADERS=1
@


1.9
log
@Install libregex.h with the correct owner, group and mode.
@
text
@d1 1
a1 1
# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.8 1994/05/27 10:53:33 csgr Exp $
d5 1
a5 1
CFLAGS+=-DHAVE_STRING_H=1
@


1.8
log
@Remove explicit specification of SHLIB major and minor nos.
@
text
@d1 1
a1 1
# $Header: /home/cvs/386BSD/src/gnu/lib/libregex/Makefile,v 1.7 1994/05/19 17:40:01 jkh Exp $
d10 2
a11 1
	install -c ${.CURDIR}/regex.h ${DESTDIR}/usr/include/gnuregex.h
@


1.7
log
@A perfectly good libgnuregex.a and you can't use it!  No header was being
installed.  Do so now as gnuregex.h
@
text
@d1 1
a1 1
# $Header: /home/cvs/386BSD/src/gnu/lib/libregex/Makefile,v 1.6 1994/01/29 20:20:51 nate Exp $
a2 2
SHLIB_MAJOR=1
SHLIB_MINOR=0
@


1.6
log
@No longer install the GNU regex.h include file.
@
text
@d1 1
a1 1
# $Header: /a/cvs/386BSD/src/gnu/libregex/Makefile,v 1.5 1993/12/28 07:57:07 smace Exp $
d10 3
@


1.5
log
@Update shlib version to 1.0
@
text
@d1 1
a1 1
# $Header: /a/cvs/386BSD/src/gnu/libregex/Makefile,v 1.4 1993/11/09 20:23:44 paul Exp $
a9 4

beforeinstall:
	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/regex.h \
		${DESTDIR}/usr/include
@


1.4
log
@Added
SHLIB_MAJOR=0
SHLIB_MINOR=0
@
text
@d1 1
a1 1
# $Header: /a/cvs/386BSD/src/gnu/libregex/Makefile,v 1.3 1993/08/23 05:26:19 rgrimes Exp $
d3 1
a3 1
SHLIB_MAJOR=0
@


1.3
log
@Changed install -o root -g bin to -o ${BINOWN} -g ${BINGRP} on the header
install commands to be consistent with other header files.
@
text
@d1 4
a4 1
# $Header: /a/cvs/386BSD/src/gnu/libregex/Makefile,v 1.2 1993/08/08 04:38:56 rgrimes Exp $
@


1.2
log
@Changed afterintall: target to beforeinstall: so that it is easy to get
the regex.h header file installed.
@
text
@d1 1
a1 1
# $Header: /a/cvs/386BSD/src/gnu/libregex/Makefile,v 1.1 1993/07/30 20:15:28 conklin Exp $
d9 1
a9 1
	install -c -o root -g wheel -m 444 ${.CURDIR}/regex.h \
@


1.1
log
@GNU Regex 0.12
@
text
@d1 1
a1 1
# $Header: /b/source/CVS/src/gnu/lib/libregex/Makefile,v 1.2 1993/04/10 15:24:44 cgd Exp $
d8 1
a8 1
afterinstall:
@
