head	1.7;
access;
symbols
	RELEASE_8_3_0:1.6
	RELEASE_9_0_0:1.6
	RELEASE_7_4_0:1.6
	RELEASE_8_2_0:1.6
	RELEASE_6_EOL:1.5
	RELEASE_8_1_0:1.5
	RELEASE_7_3_0:1.5
	RELEASE_8_0_0:1.5
	RELEASE_7_2_0:1.5
	RELEASE_7_1_0:1.5
	RELEASE_6_4_0:1.5
	RELEASE_5_EOL:1.5
	RELEASE_7_0_0:1.5
	RELEASE_6_3_0:1.5
	PRE_XORG_7:1.5
	RELEASE_4_EOL:1.5
	RELEASE_6_2_0:1.5
	RELEASE_6_1_0:1.5
	RELEASE_5_5_0:1.5
	RELEASE_6_0_0:1.5
	RELEASE_5_4_0:1.5
	RELEASE_4_11_0:1.5
	RELEASE_5_3_0:1.5
	RELEASE_4_10_0:1.5
	RELEASE_5_2_1:1.5
	RELEASE_5_2_0:1.5
	RELEASE_4_9_0:1.5
	RELEASE_5_1_0:1.4
	RELEASE_4_8_0:1.4
	RELEASE_5_0_0:1.4
	RELEASE_4_7_0:1.4
	RELEASE_4_6_2:1.3
	RELEASE_4_6_1:1.3
	RELEASE_4_6_0:1.3
	RELEASE_5_0_DP1:1.2
	RELEASE_4_5_0:1.2
	RELEASE_4_4_0:1.2
	RELEASE_4_3_0:1.2;
locks; strict;
comment	@# @;


1.7
date	2012.09.23.14.59.36;	author matthew;	state dead;
branches;
next	1.6;

1.6
date	2010.12.23.10.54.46;	author roam;	state Exp;
branches;
next	1.5;

1.5
date	2003.09.02.15.45.45;	author roam;	state Exp;
branches;
next	1.4;

1.4
date	2002.09.20.08.26.34;	author roam;	state Exp;
branches;
next	1.3;

1.3
date	2002.05.21.10.25.17;	author roam;	state Exp;
branches;
next	1.2;

1.2
date	2001.04.09.11.09.33;	author roam;	state Exp;
branches;
next	1.1;

1.1
date	2001.01.20.00.13.18;	author roam;	state Exp;
branches;
next	;


desc
@@


1.7
log
@SVN rev 304744 on 2012-09-23 14:59:36Z by matthew

- Fix spelling in docs: normally I'd submit this change upstream, but
  upstream has been completely unresponsive for years.
- While here, rebuild patches using current naming conventions
- Trim Makefile headers

PR:		165312
Submitted by:	Anatoly Borodin
@
text
@Description: Add CrackLib support and conditionalize the build variables.
Forwarded: no
Author: Peter Pentchev <roam@@FreeBSD.org>,
	Dominic Marks <dominic_marks@@btinternet.com>,
	Roman Neuhauser <roman@@bellavista.cz>
Last-Update: 2010-12-23

--- Makefile.orig
+++ Makefile
@@@@ -44,10 +44,12 @@@@
 # If you want to use cracklib for password quality check then you
 # must uncomment the folowing 4 lines (you must not do this for WIN32)
 #
-#CRACKLIB_DICTPATH = "/usr/local/lib/pw_dict"
-#STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
-#CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
-#APG_CLIBS += -lcrack
+.if defined(WITH_CRACKLIB)
+CRACKLIB_DICTPATH = "${LOCALBASE}/libdata/cracklib/pw_dict"
+STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I${LOCALBASE}/include -L${LOCALBASE}/lib
+CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I${LOCALBASE}/include -L${LOCALBASE}/lib
+APG_CLIBS += -lcrack
+.endif
 
 ##################################################################
 # Support for ANSI X9.17/SHA1 PRNG
@@@@ -60,12 +62,12 @@@@
 ##################################################################
 # You can modify CC variable if you have compiler other than GCC
 # But the code was designed and tested with GCC
-CC = gcc
+CC ?= gcc
 
 ##################################################################
 # Compilation flags
 # You should comment the line below for AIX+native cc
-CFLAGS = -Wall
+CFLAGS ?= -Wall
 
 ####################################################################
 # If you plan to install APG daemon you should look at lines below #
@@@@ -135,7 +137,7 @@@@
 	${CC} ${CFLAGS} -DCLISERV ${CLISERV_OPTIONS} -o ${CS_PROGNAME} ${SOURCES} ${APG_CS_CLIBS}
 
 apgbfm:
-	${CC} ${FLAGS} -DAPGBFM -o ${BFM_PROGNAME} ${BFM_SOURCES} ${APGBFM_CLIBS}
+	${CC} ${CFLAGS} -DAPGBFM -o ${BFM_PROGNAME} ${BFM_SOURCES} ${APGBFM_CLIBS}
 
 strip:
 	strip ${PROGNAME}
@


1.6
log
@Fix a segfault when using the -y option.  While I'm here:
- remove the MD5 checksum from the distfile
- note upstream's BSD license
- OPTIONSify the support for CrackLib
- add a descriptive patch header to the existing patch-aa
- remove the packetstorm master site, it only seems to carry a much
  older version of apg
- bump PORTREVISION for the segfault fix

PR:		153382 (the segfault fix)
Submitted by:	David Boyd <David.Boyd@@insightbb.com>
@
text
@@


1.5
log
@Update to 2.3.0b, enabling cracklib use and installing docfiles.

PR:		55884
Submitted by:	Roman Neuhauser <roman@@bellavista.cz>
@
text
@d1 9
a9 2
--- Makefile.orig	Thu Aug  7 17:40:39 2003
+++ Makefile	Sat Aug 23 00:18:35 2003
@


1.4
log
@Update to apg-2.1.0.

PR:		42837
Submitted by:	Dominic Marks <dominic_marks@@btinternet.com>
@
text
@d1 20
a20 3
--- Makefile	20 Sep 2002 07:24:50 -0000	1.1.1.4
+++ Makefile	20 Sep 2002 07:27:21 -0000	1.6
@@@@ -1,12 +1,12 @@@@
d30 1
a30 1
-FLAGS = -Wall
d33 4
a36 22
 ##################################################################
 # Libraries
@@@@ -37,7 +37,8 @@@@
 ##################################################################
 # Directories
 # Install dirs
-INSTALL_PREFIX = /usr/local
+PREFIX ?= /usr/local
+INSTALL_PREFIX = ${PREFIX}
 APG_BIN_DIR = /bin
 APG_MAN_DIR = /man/man1
 APGD_BIN_DIR = /sbin
@@@@ -88,13 +89,13 @@@@
 cygwin: standalone
 
 apg:
-	${CC} ${FLAGS} -D${CRYPTED_PASS} -D${USE_SHA} -o ${PROGNAME} ${SOURCES} ${LIBS} ${LIBM}
+	${CC} ${CFLAGS} -D${CRYPTED_PASS} -D${USE_SHA} -o ${PROGNAME} ${SOURCES} ${LIBS} ${LIBM}
 
 apgd:
-	${CC} ${FLAGS} -DCLISERV -D${USE_SHA} -o ${CS_PROGNAME} ${SOURCES} ${CS_LIBS} ${LIBM}
+	${CC} ${CFLAGS} -DCLISERV -D${USE_SHA} -o ${CS_PROGNAME} ${SOURCES} ${CS_LIBS} ${LIBM}
d39 2
a40 2
-	${CC} ${FLAGS} -o ${BFM_PROGNAME} ${BFM_SOURCES} ${LIBM}
+	${CC} ${CFLAGS} -o ${BFM_PROGNAME} ${BFM_SOURCES} ${LIBM}
@


1.3
log
@Update to apg-2.0.0final.

PR:		38311
Submitted by:	Dominic Marks <dominic_marks@@btinternet.com>
@
text
@d1 2
a2 2
--- Makefile	21 May 2002 10:01:23 -0000	1.1.1.3
+++ Makefile	21 May 2002 10:07:25 -0000	1.5
d32 2
a33 2
-	${CC} ${FLAGS} ${LIBS} ${LIBM} -D${CRYPTED_PASS} -D${USE_SHA} -o ${PROGNAME} ${SOURCES}
+	${CC} ${CFLAGS} ${LIBS} ${LIBM} -D${CRYPTED_PASS} -D${USE_SHA} -o ${PROGNAME} ${SOURCES}
d36 2
a37 2
-	${CC} ${FLAGS} ${CS_LIBS} ${LIBM} -DCLISERV -D${USE_SHA} -o ${CS_PROGNAME} ${SOURCES}
+	${CC} ${CFLAGS} ${CS_LIBS} ${LIBM} -DCLISERV -D${USE_SHA} -o ${CS_PROGNAME} ${SOURCES}
d40 2
a41 2
-	${CC} ${FLAGS} ${LIBM} -o ${BFM_PROGNAME} ${BFM_SOURCES}
+	${CC} ${CFLAGS} ${LIBM} -o ${BFM_PROGNAME} ${BFM_SOURCES}
@


1.2
log
@Update to 1.2.13, fix a fennerism along the way ;)
@
text
@d1 4
a4 3
--- Makefile	Tue Feb 27 08:24:14 2001
+++ Makefile	Mon Apr  9 14:05:45 2001
@@@@ -1,10 +1,10 @@@@
d8 1
a8 1
+CC?=		gcc
d10 2
a11 1
 # compilation flags
d14 1
a14 6
+CFLAGS?=	-Wall
 
 # libraries
 LIBS = -lcrypt
@@@@ -15,7 +15,8 @@@@
 CRYPTED_PASS = APG_USE_CRYPT
d16 5
d23 1
a23 1
+PREFIX?=	/usr/local
d28 1
a28 1
@@@@ -50,10 +51,10 @@@@
d31 7
a37 3
 cliserv: ${SOURCES} ${HEADERS}
-	${CC} ${FLAGS} ${CS_LIBS} -DCLISERV -o ${CS_PROGNAME} ${SOURCES}
+	${CC} ${CFLAGS} ${CS_LIBS} -DCLISERV -o ${CS_PROGNAME} ${SOURCES}
d39 3
a41 3
 standalone: ${SOURCES} ${HEADERS}
-	${CC} ${FLAGS} ${LIBS} -D${CRYPTED_PASS} -o ${PROGNAME} ${SOURCES}
+	${CC} ${CFLAGS} ${LIBS} -D${CRYPTED_PASS} -o ${PROGNAME} ${SOURCES}
@


1.1
log
@apg is an automated generator for pronounceable passwords.
@
text
@d1 3
a3 3
--- Makefile	2000/09/30 14:55:17	1.1.1.1
+++ Makefile	2001/01/17 14:12:15	1.3
@@@@ -1,12 +1,13 @@@@
d7 1
a7 1
+CC ?= gcc
d10 1
d12 6
a17 1
+CFLAGS ?= -Wall
d21 1
a21 1
+PREFIX ?= /usr/local
d26 1
a26 1
@@@@ -41,10 +42,10 @@@@
d34 2
a35 2
-	${CC} ${FLAGS} -o ${PROGNAME} ${SOURCES}
+	${CC} ${CFLAGS} -o ${PROGNAME} ${SOURCES}
@

