Index: bsd.port.mk
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.639
diff -u -r1.639 bsd.port.mk
--- bsd.port.mk	25 May 2010 00:25:02 -0000	1.639
+++ bsd.port.mk	2 Jun 2010 19:09:21 -0000
@@ -2291,6 +2291,16 @@
 .endif
 .endif
 
+# stack protector support
+#.if !defined(STACK_PROTECTOR_UNSAFE) && !defined(DISABLE_STACK_PROTECTOR) && (defined(FORCE_STACK_PROTECTOR) || defined(STACK_PROTECTOR_SAFE))	    # enabled by default, disable with DISABLE_STACK_PROTECTOR
+.if !defined(STACK_PROTECTOR_UNSAFE) && (defined(FORCE_STACK_PROTECTOR) || (defined(ENABLE_STACK_PROTECTOR) && defined(STACK_PROTECTOR_SAFE)))		# disabled by default, enable with ENABLE_STACK_PROTECTOR
+CFLAGS+=	-fstack-protector
+CXXFLAGS+=	-fstack-protector
+.if defined(FORCE_STACK_PROTECTOR) && !defined(STACK_PROTECTOR_SAFE)
+BUILD_FAIL_MESSAGE+=	"You have chosen to use stack protector for all ports.  This port was not tested for this setting.  Please remove FORCE_STACK_PROTECTOR and retry the build before reporting the failure to the maintainer."
+.endif
+.endif
+
 PTHREAD_CFLAGS?=
 PTHREAD_LIBS?=		-pthread