Respect system ${CFLAGS} when building Perl modules.

bsd.obj.mk -> bsd.prog.mk in modules makefiles, as the
latter automatically includes ../Makefile.inc and adds
-I${DESTDIR}/usr/include to ${CFLAGS} needed for "make
world" which is built with -nostdinc.

Reviewed by:	MAINTAINER timeout

21 files changed, 23 insertions, 43 deletions

diff --git a/gnu/usr.bin/perl/Makefile.inc b/gnu/usr.bin/perl/Makefile.inc
index 91628f4..b5b8d21 100644
--- a/gnu/usr.bin/perl/Makefile.inc
+++ b/gnu/usr.bin/perl/Makefile.inc
@@ -60,8 +60,8 @@ links: ${DEPEND_H}
 	@ln -sf ${PERL5SRC}/writemain.SH writemain.sh
 	@ln -sf ${PERL5SRC}/regcomp.c regcomp.c
 	@ln -sf ${PERL5SRC}/regexec.c regexec.c
-	@ln -sf ${PERL5LIBSRC}/config.SH-${OBJFORMAT}.${MACHINE_ARCH} \
-		config.sh
+	@sed "s;^optimize=.*$$;optimize=\'${CFLAGS}\';" \
+		${PERL5LIBSRC}/config.SH-${OBJFORMAT}.${MACHINE_ARCH} > config.sh
 	@touch ${.TARGET}
 
 scripts: links
@@ -92,7 +92,7 @@ MAKEMAKER_ARGS?=	INSTALLDIRS=perl PERL_SRC=${.OBJDIR} \
 		PERL=${MINIPERL} FULLPERL=perl DEFINE=-I${DESTDIR}/usr/include \
 		DEFINE=-DPERL_CORE
 
-CFLAGS+=	'-DAPPLLIB_EXP="/usr/libdata/perl/BSDPAN"'
+CFLAGS+=	-DAPPLLIB_EXP=\"/usr/libdata/perl/BSDPAN\"
 
 .if defined(PERL_DEBUGGING) && ${PERL_DEBUGGING} == "true"
 CFLAGS+=        -DDEBUGGING
diff --git a/gnu/usr.bin/perl/library/B/Makefile b/gnu/usr.bin/perl/library/B/Makefile
index fae4d74..a3733d2 100644
--- a/gnu/usr.bin/perl/library/B/Makefile
+++ b/gnu/usr.bin/perl/library/B/Makefile
@@ -2,5 +2,4 @@
 
 MODULE=	B
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/ByteLoader/Makefile b/gnu/usr.bin/perl/library/ByteLoader/Makefile
index 13e4936..2ab9e68 100644
--- a/gnu/usr.bin/perl/library/ByteLoader/Makefile
+++ b/gnu/usr.bin/perl/library/ByteLoader/Makefile
@@ -2,5 +2,4 @@
 
 MODULE=	ByteLoader
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/DB_File/Makefile b/gnu/usr.bin/perl/library/DB_File/Makefile
index b35ab10..49730767 100644
--- a/gnu/usr.bin/perl/library/DB_File/Makefile
+++ b/gnu/usr.bin/perl/library/DB_File/Makefile
@@ -2,5 +2,4 @@
 
 MODULE=	DB_File
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/DProf/Makefile b/gnu/usr.bin/perl/library/DProf/Makefile
index f0a93e5..8f36a2e 100644
--- a/gnu/usr.bin/perl/library/DProf/Makefile
+++ b/gnu/usr.bin/perl/library/DProf/Makefile
@@ -3,5 +3,4 @@
 MODULE=		DProf
 MODULEDIR=	Devel/DProf
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/Dumper/Makefile b/gnu/usr.bin/perl/library/Dumper/Makefile
index f102067..8fc53c8 100644
--- a/gnu/usr.bin/perl/library/Dumper/Makefile
+++ b/gnu/usr.bin/perl/library/Dumper/Makefile
@@ -3,5 +3,4 @@
 MODULE=		Dumper
 MODULEDIR=	Data/Dumper
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/Errno/Makefile b/gnu/usr.bin/perl/library/Errno/Makefile
index 2210e03..148eeb3 100644
--- a/gnu/usr.bin/perl/library/Errno/Makefile
+++ b/gnu/usr.bin/perl/library/Errno/Makefile
@@ -2,5 +2,4 @@
 
 MODULE=	Errno
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/Fcntl/Makefile b/gnu/usr.bin/perl/library/Fcntl/Makefile
index d2a0a68..752604e 100644
--- a/gnu/usr.bin/perl/library/Fcntl/Makefile
+++ b/gnu/usr.bin/perl/library/Fcntl/Makefile
@@ -2,5 +2,4 @@
 
 MODULE=	Fcntl
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/Glob/Makefile b/gnu/usr.bin/perl/library/Glob/Makefile
index 8a96e12..80699af 100644
--- a/gnu/usr.bin/perl/library/Glob/Makefile
+++ b/gnu/usr.bin/perl/library/Glob/Makefile
@@ -3,5 +3,4 @@
 MODULE=		Glob
 MODULEDIR=	File/Glob
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/Hostname/Makefile b/gnu/usr.bin/perl/library/Hostname/Makefile
index a13c094..38360dc 100644
--- a/gnu/usr.bin/perl/library/Hostname/Makefile
+++ b/gnu/usr.bin/perl/library/Hostname/Makefile
@@ -3,5 +3,4 @@
 MODULE=		Hostname
 MODULEDIR=	Sys/Hostname
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/IO/Makefile b/gnu/usr.bin/perl/library/IO/Makefile
index 69a7753..2a4109a 100644
--- a/gnu/usr.bin/perl/library/IO/Makefile
+++ b/gnu/usr.bin/perl/library/IO/Makefile
@@ -2,5 +2,4 @@
 
 MODULE=	IO
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/NDBM_File/Makefile b/gnu/usr.bin/perl/library/NDBM_File/Makefile
index 1395f67..3ae4a6b 100644
--- a/gnu/usr.bin/perl/library/NDBM_File/Makefile
+++ b/gnu/usr.bin/perl/library/NDBM_File/Makefile
@@ -2,5 +2,4 @@
 
 MODULE=	NDBM_File
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/Opcode/Makefile b/gnu/usr.bin/perl/library/Opcode/Makefile
index 5497061..200dd46 100644
--- a/gnu/usr.bin/perl/library/Opcode/Makefile
+++ b/gnu/usr.bin/perl/library/Opcode/Makefile
@@ -2,5 +2,4 @@
 
 MODULE=	Opcode
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/POSIX/Makefile b/gnu/usr.bin/perl/library/POSIX/Makefile
index 7345909..068850b 100644
--- a/gnu/usr.bin/perl/library/POSIX/Makefile
+++ b/gnu/usr.bin/perl/library/POSIX/Makefile
@@ -2,5 +2,4 @@
 
 MODULE=	POSIX
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/Peek/Makefile b/gnu/usr.bin/perl/library/Peek/Makefile
index 24df80b..13a7cdb 100644
--- a/gnu/usr.bin/perl/library/Peek/Makefile
+++ b/gnu/usr.bin/perl/library/Peek/Makefile
@@ -3,5 +3,4 @@
 MODULE=		Peek
 MODULEDIR=	Devel/Peek
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/SDBM_File/Makefile b/gnu/usr.bin/perl/library/SDBM_File/Makefile
index 3695e76..8eb30cc 100644
--- a/gnu/usr.bin/perl/library/SDBM_File/Makefile
+++ b/gnu/usr.bin/perl/library/SDBM_File/Makefile
@@ -2,5 +2,4 @@
 
 MODULE=	SDBM_File
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/Socket/Makefile b/gnu/usr.bin/perl/library/Socket/Makefile
index 4102086..baa5435 100644
--- a/gnu/usr.bin/perl/library/Socket/Makefile
+++ b/gnu/usr.bin/perl/library/Socket/Makefile
@@ -2,5 +2,4 @@
 
 MODULE=	Socket
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/SysV/Makefile b/gnu/usr.bin/perl/library/SysV/Makefile
index 2386888..9f932d4 100644
--- a/gnu/usr.bin/perl/library/SysV/Makefile
+++ b/gnu/usr.bin/perl/library/SysV/Makefile
@@ -3,5 +3,4 @@
 MODULE=		SysV
 MODULEDIR=	IPC/SysV
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/Syslog/Makefile b/gnu/usr.bin/perl/library/Syslog/Makefile
index 350e7d2..10f82bb 100644
--- a/gnu/usr.bin/perl/library/Syslog/Makefile
+++ b/gnu/usr.bin/perl/library/Syslog/Makefile
@@ -3,5 +3,4 @@
 MODULE=		Syslog
 MODULEDIR=	Sys/Syslog
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/attrs/Makefile b/gnu/usr.bin/perl/library/attrs/Makefile
index 462815b..a1d8125 100644
--- a/gnu/usr.bin/perl/library/attrs/Makefile
+++ b/gnu/usr.bin/perl/library/attrs/Makefile
@@ -2,5 +2,4 @@
 
 MODULE=	attrs
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/library/re/Makefile b/gnu/usr.bin/perl/library/re/Makefile
index 1752651..87a1eb0 100644
--- a/gnu/usr.bin/perl/library/re/Makefile
+++ b/gnu/usr.bin/perl/library/re/Makefile
@@ -2,5 +2,4 @@
 
 MODULE=	re
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>