+ Add and document the PKG_RELATIVE_SYMLINKS option, which makes sure

that a symbolic link in a package is relative to ${PREFIX}, if it is
under ${PREFIX}, using the -l argument to pkg_create.

+ Build a +BUILD_INFO file with appropriate information from the
package build.  Thanks to Christoph Badura for pointers to the
appropriate information.

2 files changed, 27 insertions, 2 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index ef1bef1ec5f..304b37a82e3 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.180 1998/10/19 12:50:51 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.181 1998/10/20 16:01:03 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -389,6 +389,9 @@ __PKG_CREATE_C__!=	${PKG_CREATE} -C 2>&1 | /usr/bin/egrep 'illegal option' ; ech
 PKG_ARGS+=		-C "${CONFLICTS}"
 .endif
 .endif
+.ifdef PKG_RELATIVE_SYMLINKS
+PKG_ARGS+=		-l
+.endif
 .ifdef INSTALL_FILE
 PKG_ARGS+=		-i ${INSTALL_FILE}
 .endif
@@ -714,6 +717,11 @@ package:
 .endif # IGNORE
 .endif # !NO_IGNORE
 
+# Add these defs to the ones dumped into +BUILD_DEFS
+BUILD_DEFS+=	OPSYS OS_VERSION MACHINE_ARCH MACHINE_GNU_ARCH
+BUILD_DEFS+=	CPPFLAGS CFLAGS LDFLAGS _PKGTOOLS_VER LICENSE
+BUILD_DEFS+=	CONFIGURE_ENV CONFIGURE_ARGS
+
 .if !defined(__ARCH_OK)
 .MAIN:	all
 
@@ -1966,6 +1974,16 @@ fake-pkg: ${PLIST} ${DESCR}
 			fi;						\
 		done;							\
 	fi
+.for def in ${BUILD_DEFS}
+	@${ECHO} "${def}=	${${def}}" | ${SED} -e 's|PATH=[^ 	]*|PATH=...|' >> ${PKG_DBDIR}/${PKGNAME}/+BUILD_INFO
+.endfor
+	@${ECHO} "CC=	${CC}-`${CC} --version`" >> ${PKG_DBDIR}/${PKGNAME}/+BUILD_INFO
+.ifdef USE_PERL5
+	@${ECHO} "PERL=	`${LOCALBASE}/bin/perl --version | ${GREP} version`" >> ${PKG_DBDIR}/${PKGNAME}/+BUILD_INFO
+.endif
+.ifdef USE_GMAKE
+	@${ECHO} "GMAKE=	`${LOCALBASE}/bin/gmake --version | ${GREP} version`" >> ${PKG_DBDIR}/${PKGNAME}/+BUILD_INFO
+.endif
 .endif
 
 # Depend is generally meaningless for arbitrary ports, but if someone wants
diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index 862f7a3a22c..33cacf3693e 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.31 1998/10/19 11:23:31 agc Exp $
+# $NetBSD: mk.conf.example,v 1.32 1998/10/20 16:01:03 agc Exp $
 #
 # Sample /etc/mk.conf file, which can be used to set specific values
 # for building either NetBSD or some of the NetBSD packages collection.
@@ -174,6 +174,13 @@ PAPERSIZE=	A4		# Default paper size for packages.
                                 # Possible: any user name
                                 # Default: pgsql
 
+#PKG_RELATIVE_SYMLINKS=yes	# Change any "absolute" symlinks (i.e. ones
+                                # containing the full pathname) into relative
+                                # ones (relative to $PREFIX) when building
+                                # a package.
+                                # Possible: defined, not defined
+                                # Default: not defined
+
 #RCS_LOCALID=			# Used in cvs-current package for an RCS Id
                                 # which is expanded.
                                 # Possible: anything (within reason)