[patch] Patch over 20050307 snapshot overlay

freebsd-overlay-20050307.patch (text/plain), 22.58 KB, created by Diego Elio Pettenò (RETIRED) on 2005-03-11 05:50:44 UTC

diff -x Manifest -x digest-* -Npaur /root/overlay/eclass/freebsd-utils.eclass overlay/eclass/freebsd-utils.eclass
--- /root/overlay/eclass/freebsd-utils.eclass	Sat Feb 12 00:04:55 2005
+++ overlay/eclass/freebsd-utils.eclass	Thu Mar 10 16:19:37 2005
@@ -21,9 +21,11 @@ BASE_SRC_URI="http://dev.gentoo.org/~ang
 
 #unalias -a
 alias make='/usr/bin/make'
-alias emake='/usr/bin/make'
 alias install-info='/usr/bin/bsdinstall-info'
 
+# For freebsd-* utils default to bsd make
+MAKE="/usr/bin/make"
+
 #### unlock-file <files> ####
 # Unlock a particular file using freebsd's 
 # chflags command. 
@@ -52,6 +54,12 @@ alias install-info='/usr/bin/bsdinstall-
 # function. It runs dosbin
 # and doman.
 #
+#### fmake <options>
+# calls ${MAKE} command with
+# the given options, passing
+# ${mymakeopts} to enable
+# ports to useflags bridge.
+#
 #############################
 
 unlock-file() {
@@ -150,6 +158,10 @@ recursive-sb-install() { 
 		fi
 	done
 	return 0
+}
+
+fmake() {
+	${MAKE} ${MAKEOPTS} ${EXTRA_EMAKE} ${mymakeopts} "$@"
 }
 
 # Consider this testing for future versions of freebsd sources ebuild 
diff -x Manifest -x digest-* -Npaur /root/overlay/profiles/default-bsd/fbsd/5.3/make.defaults overlay/profiles/default-bsd/fbsd/5.3/make.defaults
--- /root/overlay/profiles/default-bsd/fbsd/5.3/make.defaults	Mon Feb  7 03:05:23 2005
+++ overlay/profiles/default-bsd/fbsd/5.3/make.defaults	Fri Mar 11 13:28:35 2005
@@ -1,7 +1,7 @@
 # Copyright 2002 Gentoo Foundation.
 # System-wide defaults for the gcc 3.2 Portage system
 
-USE="-* x86-fbsd"
+USE="-* x86-fbsd ssh"
 
 ARCH="x86-fbsd"
 CHOST="i386-unknown-freebsd5.3"
diff -x Manifest -x digest-* -Npaur /root/overlay/profiles/default-bsd/fbsd/5.3/package.mask overlay/profiles/default-bsd/fbsd/5.3/package.mask
--- /root/overlay/profiles/default-bsd/fbsd/5.3/package.mask	Wed Mar  2 15:57:09 2005
+++ overlay/profiles/default-bsd/fbsd/5.3/package.mask	Fri Mar 11 13:27:23 2005
@@ -4,6 +4,5 @@ sys-libs/glibc
 sys-apps/coreutils
 sys-apps/debianutils
 sys-devel/binutils
-=sys-devel/gcc
+sys-devel/gcc
 dev-libs/openssl
-net-misc/openssh
diff -x Manifest -x digest-* -Npaur /root/overlay/profiles/default-bsd/fbsd/5.3/package.provided overlay/profiles/default-bsd/fbsd/5.3/package.provided
--- /root/overlay/profiles/default-bsd/fbsd/5.3/package.provided	Wed Mar  2 15:57:09 2005
+++ overlay/profiles/default-bsd/fbsd/5.3/package.provided	Fri Mar 11 13:34:52 2005
@@ -26,6 +26,7 @@ sys-apps/groff-1.19.1-r2
 sys-apps/grep-2.5.1-r7
 dev-util/dialog-1.0.20050206
 sys-devel/make-3.80-r2
-dev-libs/openssl-0.9.7
-net-misc/openssh-3.9
-net-misc/ssh/3.2
+dev-libs/openssl-0.9.7d
+sys-devel/flex-2.5.4
+app-arch/bzip2-1.0.2
+dev-util/cvs-1.11.17
diff -x Manifest -x digest-* -Npaur /root/overlay/profiles/default-bsd/fbsd/5.3/packages overlay/profiles/default-bsd/fbsd/5.3/packages
--- /root/overlay/profiles/default-bsd/fbsd/5.3/packages	Wed Mar  2 15:57:09 2005
+++ overlay/profiles/default-bsd/fbsd/5.3/packages	Fri Mar 11 13:33:14 2005
@@ -50,7 +50,6 @@
 *~app-arch/bzip2-1
 *~sys-apps/grep-2
 *~dev-libs/openssl-0
-*~net-misc/openssh-3
 *~sys-libs/glibc-2
 *~sys-apps/coreutils-5
 *~sys-apps/debianutils-1
diff -x Manifest -x digest-* -Npaur /root/overlay/profiles/default-bsd/fbsd/5.3/virtuals overlay/profiles/default-bsd/fbsd/5.3/virtuals
--- /root/overlay/profiles/default-bsd/fbsd/5.3/virtuals	Sat Dec 11 21:25:38 2004
+++ overlay/profiles/default-bsd/fbsd/5.3/virtuals	Fri Mar 11 13:30:27 2005
@@ -10,7 +10,7 @@ virtual/jdk			dev-java/blackdown-jdk
 virtual/jre			dev-java/blackdown-jre
 virtual/blackbox		x11-wm/blackbox
 virtual/emacs			app-editors/emacs
-virtual/cron			sys-apps/dcron
+virtual/cron			sys-apps/freebsd-usbin
 virtual/xemacs			app-editors/xemacs
 virtual/krb5			app-crypt/mit-krb5
 virtual/bootloader		sys-boot/grub
diff -x Manifest -x digest-* -Npaur /root/overlay/sys-apps/freebsd-bin/freebsd-bin-5.3.ebuild overlay/sys-apps/freebsd-bin/freebsd-bin-5.3.ebuild
--- /root/overlay/sys-apps/freebsd-bin/freebsd-bin-5.3.ebuild	Fri Dec 17 20:14:33 2004
+++ overlay/sys-apps/freebsd-bin/freebsd-bin-5.3.ebuild	Fri Mar 11 13:00:16 2005
@@ -15,32 +15,46 @@ SRC_URI="${SRC_URI} 
 		${BASE_SRC_URI}${LIB}.tar.bz2"
 
 DEPEND="=sys-devel/freebsd-mk-defs-5.3*
-	=sys-libs/freebsd-lib-5.3*"
+	=sys-libs/freebsd-lib-5.3*
+	tcsh? ( !app-shells/tcsh )"
 
 S=${WORKDIR}/bin
 
+IUSE="rcp sendmail tcsh nls"
+
+pkg_setup() {
+	use rcp || mymakeopts="${mymakeopts} NO_RCMNDS= "
+	use sendmail || mymakeopts="${mymakeopts} NO_SENDMAIL= "
+	use tcsh || mymakeopts="${mymakeopts} NO_TCSH= "
+	use nls || mymakeopts="${mymakeopts} NO_NLS= "
+}
+
 src_unpack() { 
 	unpack ${P}.tar.bz2
 	unpack ${CONTRIB}.tar.bz2
 	unpack ${SBIN}.tar.bz2
 	unpack ${LIB}.tar.bz2
 
-	# Disables NLS Symlinking. Currently broken.
-	cd ${S}/csh
-	epatch ${FILESDIR}/${P}-csh-makefile.patch
+	if use tcsh; then
+		# Disables NLS Symlinking. Currently broken.
+		cd ${S}/csh
+		epatch ${FILESDIR}/${P}-csh-makefile.patch
+	fi
 }
 
 src_compile() {
-	# bin/rmail needs to link against libsm.a which is built here:
-	einfo "Building library dependency for this package"
-	cd ${WORKDIR}/lib/libsm
-	emake || die "emake libsm failed"
+	if use sendmail; then
+		# bin/rmail needs to link against libsm.a which is built here:
+		einfo "Building library dependency for this package"
+		cd ${WORKDIR}/lib/libsm
+		fmake || die "fmake libsm failed"
+	fi
 	
 	einfo "Now building the package"
 	cd ${S}
-	emake || die "emake failed"
+	fmake || die "fmake failed"
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "Install failed"
+	fmake DESTDIR=${D} install || die "Install failed"
 }
diff -x Manifest -x digest-* -Npaur /root/overlay/sys-apps/freebsd-contrib/freebsd-contrib-5.3-r1.ebuild overlay/sys-apps/freebsd-contrib/freebsd-contrib-5.3-r1.ebuild
--- /root/overlay/sys-apps/freebsd-contrib/freebsd-contrib-5.3-r1.ebuild	Fri Feb 11 17:44:24 2005
+++ overlay/sys-apps/freebsd-contrib/freebsd-contrib-5.3-r1.ebuild	Thu Mar 10 17:07:36 2005
@@ -22,6 +22,19 @@ PROVIDE="virtual/gzip"
 
 S=${WORKDIR}/gnu
 
+IUSE="nocxx objc"
+
+pkg_setup() {
+	use nocxx && mymakeopts="${mymakeopts} NO_CXX= "
+	use objc || mymakeopts="${mymakeopts} NO_OBJC= "
+	# Fortran support seems not to be enable in any case
+	# use fortran || mymakeopts="${mymakeopts} NO_FORTRAN= "
+	
+	# Placeholder to disable cvs compilation, as we can't disable
+	# it for now else it will broke everything
+	# use cvs || mymakeopts="${mymakeopts} NO_CVS= "
+}
+
 src_unpack() { 
 	unpack ${P}.tar.bz2
 	unpack ${GNU}.tar.bz2
@@ -58,8 +71,6 @@ src_compile() {
 	# -pg and -fomit-frame-pointer are incompatible
 	filter-flags "-fomit-frame-pointer"
 
-	# Set emake to gmake
-	emake="/usr/bin/gmake"
 
 	# It does not build without this
 	unset CFLAGS
@@ -69,26 +80,25 @@ src_compile() {
 
 	einfo "Building object/headers dependencies for this package"
 	cd ${S}/usr.bin/cc/cc_tools
-	emake || die "make cc_tools failed"
+	fmake || die "make cc_tools failed"
 	einfo "Building binutils static libraries for this package"
 	cd ${S}/usr.bin/binutils
-	emake || die "make binutils failed"
+	fmake || die "make binutils failed"
 
 	cd ${S}
 
-	#CXX=c++ gmake -j1 || die "emake failed"
+	#CXX=c++ gmake -j1 || die "fmake failed"
 	einfo "Buiding package now"
-	emake || die "emake failed"
+	fmake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "Install failed"
+	fmake DESTDIR=${D} install || die "Install failed"
 	einfo "Moving headers to standard format"
 	move_headers
 	move_headers ${D}/usr/include/c++/3.4/bits ${D}/tmp/include/bits/
 
 	sleep 5
-
 }
 
 # This function removes the files installed inside directories in 
diff -x Manifest -x digest-* -Npaur /root/overlay/sys-apps/freebsd-crypto/files/sshd.pam overlay/sys-apps/freebsd-crypto/files/sshd.pam
--- /root/overlay/sys-apps/freebsd-crypto/files/sshd.pam	Thu Jan  1 00:00:00 1970
+++ overlay/sys-apps/freebsd-crypto/files/sshd.pam	Fri Mar 11 13:12:47 2005
@@ -0,0 +1,9 @@
+#%PAM-1.0
+
+auth       required	pam_stack.so service=system-auth
+auth       required     pam_shells.so
+auth	   required	pam_nologin.so
+account    required	pam_stack.so service=system-auth
+password   required	pam_stack.so service=system-auth
+session	   required	pam_stack.so service=system-auth
+
diff -x Manifest -x digest-* -Npaur /root/overlay/sys-apps/freebsd-crypto/files/sshd.rc6 overlay/sys-apps/freebsd-crypto/files/sshd.rc6
--- /root/overlay/sys-apps/freebsd-crypto/files/sshd.rc6	Thu Jan  1 00:00:00 1970
+++ overlay/sys-apps/freebsd-crypto/files/sshd.rc6	Fri Mar 11 13:12:47 2005
@@ -0,0 +1,52 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6,v 1.13 2004/07/15 00:07:55 agriffis Exp $
+
+depend() {
+	use logger dns
+	need net
+}
+
+checkconfig() {
+	if [ ! -d /var/empty ] ; then
+		mkdir -p /var/empty || return 1
+	fi
+
+	if [ ! -e /etc/ssh/sshd_config ] ; then
+		eerror "You need an /etc/ssh/sshd_config file to run sshd"
+		eerror "There is a sample file in  /usr/share/doc/openssh"
+		return 1
+	fi
+
+	gen_keys
+}
+
+gen_keys() {
+	if [ ! -e /etc/ssh/ssh_host_key ] ; then
+		einfo "Generating Hostkey..."
+		/usr/bin/ssh-keygen -t rsa1 -b 1024 -f /etc/ssh/ssh_host_key -N ''
+	fi
+	if [ ! -e /etc/ssh/ssh_host_dsa_key ] ; then
+		einfo "Generating DSA-Hostkey..."
+		/usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N ''
+	fi
+	if [ ! -e /etc/ssh/ssh_host_rsa_key ] ; then
+		einfo "Generating RSA-Hostkey..."
+		/usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting sshd"
+	start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid \
+		--startas /usr/sbin/sshd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping sshd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/sshd.pid
+	eend $?
+}
diff -x Manifest -x digest-* -Npaur /root/overlay/sys-apps/freebsd-crypto/freebsd-crypto-5.3-r1.ebuild overlay/sys-apps/freebsd-crypto/freebsd-crypto-5.3-r1.ebuild
--- /root/overlay/sys-apps/freebsd-crypto/freebsd-crypto-5.3-r1.ebuild	Sun Feb 27 21:40:49 2005
+++ overlay/sys-apps/freebsd-crypto/freebsd-crypto-5.3-r1.ebuild	Fri Mar 11 13:22:54 2005
@@ -11,10 +11,28 @@ DESCRIPTION="Contributed sources related
 SRC_URI="${SRC_URI}
 	${BASE_SRC_URI}${LIB}.tar.bz2"
 LICENSE="AS-IS BSD"
-IUSE=""
-DEPEND="=sys-libs/freebsd-lib-5.3*"
+
+IUSE="ssh pam"
+DEPEND="=sys-libs/freebsd-lib-5.3*
+	ssh? ( !virtual/ssh )"
+
 S=${WORKDIR}/secure
 
+PROVIDE="ssh? ( virtual/ssh )"
+
+pkg_setup() {
+	# IDEA stuff seems to be broken but better know that we can
+	# enable it in this way.
+	# use idea && mymakeopts="${mymakeopts} MAKE_IDEA= "
+
+	use ssh || mymakeopts="${mymakeopts} NO_OPENSSH= "
+	
+	# openssl tries to install the mans in its own directory
+	# this forces it to use the standard one
+	# Note: man/man states that it will use man/man1 man/man3 and so on
+	mymakeopts="${mymakeopts} MANDIR=/usr/share/man/man"
+}
+
 src_unpack() { 
 	# I don't think it's elegant to use this, but we just need 
 	# the two Makefiles from its base dir.
@@ -30,16 +48,26 @@ src_unpack() { 
 src_compile() {
 	# -pg and -fomit-frame-pointer are incompatible
 	filter-flags "-fomit-frame-pointer"
-	emake || die "emake failed"
+	fmake || die "emake failed"
 	einfo "Building kerberos5 now"
 	cd ${WORKDIR}/kerberos5
-	emake || die "emake kerberos failed"
+	fmake || die "emake kerberos failed"
 }
 
 src_install() {
 	einfo "Installing general cryptographic utilities ..."
-	emake DESTDIR=${D} install || die "emake install failed"
+	fmake DESTDIR=${D} install || die "emake install failed"
 	einfo "Installing kerberos5 ..."
 	cd ${WORKDIR}/kerberos5
-	emake DESTDIR=${D} install || die "emake install kerberos failed"
+	fmake DESTDIR=${D} install || die "emake install kerberos failed"
+
+	if use nossh; then
+		exeinto /etc/init.d
+		newexe ${FILESDIR}/sshd.rc6 sshd
+		
+		if use pam; then
+			insinto /etc/pam.d
+			newins ${FILESDIR}/sshd.pam sshd
+		fi
+	fi
 }
diff -x Manifest -x digest-* -Npaur /root/overlay/sys-apps/freebsd-sbin/freebsd-sbin-5.3.ebuild overlay/sys-apps/freebsd-sbin/freebsd-sbin-5.3.ebuild
--- /root/overlay/sys-apps/freebsd-sbin/freebsd-sbin-5.3.ebuild	Tue Feb 15 01:21:58 2005
+++ overlay/sys-apps/freebsd-sbin/freebsd-sbin-5.3.ebuild	Thu Mar 10 23:34:28 2005
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-projects/bsd/fbsd/overlay/sys-apps/freebsd-sbin/freebsd-sbin-5.3.ebuild,v 1.4 2005/02/15 01:21:58 spb Exp $
 
-inherit freebsd-utils
+inherit flag-o-matic freebsd-utils
 
 CONTRIB=freebsd-contrib-${PV}
 LIB=freebsd-lib-${PV}
@@ -24,8 +24,22 @@ DEPEND="=sys-kernel/freebsd-sources-5.3*
 	=sys-libs/freebsd-lib-5.3*
 	=sys-libs/freebsd-libexec-5.3*"
 
+PROVIDE="!nocxx? ( virtual/dev-manager )
+	virtual/dhcpc"
+
 S=${WORKDIR}/sbin
 
+IUSE="atm nocxx ipfilter pf ipv6 vinum"
+
+pkg_setup() {
+	use atm || mymakeopts="${mymakeopts} NO_ATM= "
+	use nocxx || mymakeopts="${mymakeopts} NO_CXX= "
+	use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
+	use pf || mymakeopts="${mymakeopts} NO_PF= "
+	use ipv6 || mymakeopts="${mymakeopts} NOINET6= "
+	use vinum || mymakeopts="${mymakeopts} NO_VINUM= "
+}
+
 src_unpack() { 
 	unpack ${P}.tar.bz2
 	unpack ${CONTRIB}.tar.bz2
@@ -72,9 +86,9 @@ src_unpack() { 
 src_compile() {
 	# O3 breaks this, apparently
 	replace-flags -O3 -O2
-	emake || die "Compilation failed"
+	fmake || die "Compilation failed"
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "emake failed"
+	fmake DESTDIR=${D} install || die "fmake failed"
 }
diff -x Manifest -x digest-* -Npaur /root/overlay/sys-apps/freebsd-ubin/freebsd-ubin-5.3.ebuild overlay/sys-apps/freebsd-ubin/freebsd-ubin-5.3.ebuild
--- /root/overlay/sys-apps/freebsd-ubin/freebsd-ubin-5.3.ebuild	Fri Dec 17 20:14:33 2004
+++ overlay/sys-apps/freebsd-ubin/freebsd-ubin-5.3.ebuild	Thu Mar 10 23:11:03 2005
@@ -19,9 +19,28 @@ SRC_URI="${SRC_URI}
 DEPEND="=sys-devel/freebsd-mk-defs-5.3*
 	=sys-libs/freebsd-lib-5.3*
 	=sys-kernel/freebsd-headers-5.3*
-	=sys-kernel/freebsd-sources-5.3*"
+	=sys-kernel/freebsd-sources-5.3*
+	ssl? ( =sys-apps/freebsd-crypto-5.3* )
+	sendmail? ( virtual/mta )"
+
+PROVIDE="virtual/editor"
+
 S=${WORKDIR}/usr.bin
 
+IUSE="atm bind-utils bluetooth crypt ssl sendmail usb nls ipv6"
+
+pkg_setup() {
+	use nls || mymakeopts="${mymakeopts} NO_NLS= "
+	use atm || mymakeopts="${mymakeopts} NOATM= "
+	use bind-utils || mymakeopts="${mymakeopts} NO_BIND_UTILS= "
+	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
+	use crypt || mymakeopts="${mymakeopts} NOCRYPT= "
+	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= "
+	use sendmail || mymakeopts="${mymakeopts} NO_SENDMAIL= "
+	use usb || mymakeopts="${mymakeopts} NO_USB= "
+	use ipv6 || mymakeopts="${mymakeopts} NOINET6= "
+}
+
 src_unpack() { 
 	unpack ${P}.tar.bz2
 	unpack ${CONTRIB}.tar.bz2
@@ -53,23 +72,29 @@ src_compile() {
 	filter-flags "-fomit-frame-pointer"
 
 	einfo "Building library dependencies"
-	cd ${WORKDIR}/lib/bind
-	make || die "emake libbind failed"
+	if use bind-utils; then
+		cd ${WORKDIR}/lib/bind
+		fmake || die "fmake libbind failed"
+	fi
+
 	cd ${WORKDIR}/lib/libtelnet
-	emake || die "emake libtelnet failed"
-	cd ${WORKDIR}/lib/libsm
-	emake || die "emake libsm failed"
-	cd ${WORKDIR}/lib/libsmutil
-	emake || die "emake libsmutil failed"
-	cd ${WORKDIR}/lib/libsmdb
-	emake || die "emake libsmdb failed"
+	fmake || die "fmake libtelnet failed"
+	
+	if use sendmail; then
+		cd ${WORKDIR}/lib/libsm
+		fmake || die "fmake libsm failed"
+		cd ${WORKDIR}/lib/libsmutil
+		fmake || die "fmake libsmutil failed"
+		cd ${WORKDIR}/lib/libsmdb
+		fmake || die "fmake libsmdb failed"
+	fi
 
 	cd ${S}
 	einfo "Building package"
-	emake || die "emake failed"
+	fmake || die "fmake failed"
 }
 
 src_install() {
 	cd ${S}
-	emake DESTDIR=${D} install || die "Install failed"
+	fmake DESTDIR=${D} install || die "Install failed"
 }
diff -x Manifest -x digest-* -Npaur /root/overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-makefile-docpaths.patch overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-makefile-docpaths.patch
--- /root/overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-makefile-docpaths.patch	Thu Jan  1 00:00:00 1970
+++ overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-makefile-docpaths.patch	Thu Mar 10 22:00:45 2005
@@ -0,0 +1,31 @@
+diff -Npaur usr.sbin.orig/ntp/doc/Makefile usr.sbin/ntp/doc/Makefile
+--- usr.sbin.orig/ntp/doc/Makefile	Thu Mar 10 21:57:57 2005
++++ usr.sbin/ntp/doc/Makefile	Thu Mar 10 21:59:04 2005
+@@ -2,7 +2,7 @@
+ 
+ MAINTAINER=	sheldonh
+ 
+-FILESDIR=	${SHAREDIR}/doc/ntp
++FILESDIR=	${DOCDIR}/ntp
+ 
+ FILES=	accopt.html assoc.html audio.html authopt.html build.html \
+ 	clockopt.html \
+diff -Npaur usr.sbin.orig/pcvt/Misc/Doc/Makefile usr.sbin/pcvt/Misc/Doc/Makefile
+--- usr.sbin.orig/pcvt/Misc/Doc/Makefile	Thu Mar 10 21:57:58 2005
++++ usr.sbin/pcvt/Misc/Doc/Makefile	Thu Mar 10 21:59:39 2005
+@@ -4,6 +4,6 @@ NOOBJ=	noobj
+ FILES=	Acknowledgements Bibliography CharGen \
+ 	Charsets EscapeSequences Keyboard.HP Keyboard.VT \
+ 	NotesAndHints
+-FILESDIR=	${BINDIR}/Doc
++FILESDIR=	${DOCDIR}/pcvt_misc
+ 
+ .include <bsd.prog.mk>
+diff -Npaur usr.sbin.orig/pcvt/Misc/Makefile.inc usr.sbin/pcvt/Misc/Makefile.inc
+--- usr.sbin.orig/pcvt/Misc/Makefile.inc	Thu Mar 10 21:57:58 2005
++++ usr.sbin/pcvt/Misc/Makefile.inc	Thu Mar 10 21:58:38 2005
+@@ -2,3 +2,4 @@
+ 
+ DISTRIBUTION=	doc
+ BINDIR=		${SHAREDIR}/pcvt
++FILESDIR=	${DOCDIR}/pcvt
diff -x Manifest -x digest-* -Npaur /root/overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-nologin-makefile.patch overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-nologin-makefile.patch
--- /root/overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-nologin-makefile.patch	Thu Jan  1 00:00:00 1970
+++ overlay/sys-apps/freebsd-usbin/files/freebsd-usbin-5.3-r1-nologin-makefile.patch	Thu Mar 10 20:57:56 2005
@@ -0,0 +1,11 @@
+--- Makefile.orig	Mon Nov  8 23:26:31 2004
++++ Makefile	Mon Nov  8 23:35:53 2004
+@@ -4,7 +4,7 @@
+ PROG=	nologin
+ MAN=	nologin.5 nologin.8
+ 
+-SYMLINKS=	${BINDIR}/nologin /sbin/nologin
++SYMLINKS=	${BINDIR}/nologin ${DESTDIR}sbin/nologin
+ 
+ # It is important that nologin be statically linked for security
+ # reasons.  A dynamic non-setuid binary can be linked against a trojan
diff -x Manifest -x digest-* -Npaur /root/overlay/sys-apps/freebsd-usbin/freebsd-usbin-5.3-r1.ebuild overlay/sys-apps/freebsd-usbin/freebsd-usbin-5.3-r1.ebuild
--- /root/overlay/sys-apps/freebsd-usbin/freebsd-usbin-5.3-r1.ebuild	Mon Feb 28 00:17:13 2005
+++ overlay/sys-apps/freebsd-usbin/freebsd-usbin-5.3-r1.ebuild	Thu Mar 10 22:11:57 2005
@@ -26,16 +26,42 @@ SRC_URI="${BASE_SRC_URI}${P}.tar.bz2 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86-fbsd"
-IUSE=""
+IUSE="atm bluetooth crypt ssl sendmail usb bind named dnssec bind-utils ipv6
+	pf acpi lpr ipfilter"
 DEPEND="=sys-devel/freebsd-mk-defs-5.3*
 	=sys-libs/freebsd-lib-5.3*
 	=sys-libs/freebsd-libexec-5.3*
 	=sys-kernel/freebsd-sources-5.3*
-	=sys-kernel/freebsd-headers-5.3*"
-PROVIDE="virtual/cron"
+	=sys-kernel/freebsd-headers-5.3*
+	ssl? ( =sys-apps/freebsd-crypto-5.3* )
+	sendmail? ( net-mail/mailbase )"
+PROVIDE="virtual/cron
+	lpr? ( virtual/lpr )
+	sendmail? ( virtual/mta )"
 
 S=${WORKDIR}/usr.sbin
 
+pkg_setup() {
+	if ! use bind && ( use named || use dnssec || use bind-utils ); then
+		eerror "Please enable bind if you want to use named, dnssec or bind-utils"
+	fi	
+
+	use atm || mymakeopts="${mymakeopts} NO_ATM= "
+	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
+	use bind || mymakeopts="${mymakeopts} NO_BIND= "
+	use dnssec || mymakeopts="${mymakeopts} NO_BIND_DNSSEC= "
+	use named || mymakeopts="${mymakeopts} NO_BIND_NAMED= "
+	use ipv6 || mymakeopts="${mymakeopts} NOINET6= "
+	use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
+	use pf || mymakeopts="${mymakeopts} NO_PF= "
+	use lpr || mymakeopts="${mymakeopts} NO_LPR= "
+	use crypt || mymakeopts="${mymakeopts} NOCRYPT= "
+	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= "
+	use sendmail || mymakeopts="${mymakeopts} NO_SENDMAIL= "
+	use usb || mymakeopts="${mymakeopts} NO_USB= "
+	use acpi || mymakeopts="${mymakeopts} NO_ACPI= "
+}
+
 src_unpack() {
 	unpack ${P}.tar.bz2
 	unpack ${CONTRIB}.tar.bz2
@@ -92,12 +118,12 @@ src_unpack() {
 	# sandbox)
 	cd ${S}/mailwrapper
 	epatch ${FILESDIR}/${MY_PATCH}-mailwrapper-makefile.patch
-
-	# Installation related patches
-	cd ${S}/nologin
-	epatch ${FILESDIR}/${MY_PATCH}-nologin-makefile.patch
+	
 	cd ${S}/pcvt/keycap
 	epatch ${FILESDIR}/${MY_PATCH}-pcvt_keycap-makefile.patch
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-r1-makefile-docpaths.patch
 }
 
 src_compile() {
@@ -107,35 +133,33 @@ src_compile() {
 	replace-flags "-O?" "-O1"
 
 	einfo "Building library dependencies for this package"
-	cd ${WORKDIR}/lib/bind
-	emake || die "emake libbind failed"
-	cd ${WORKDIR}/lib/libsm
-	emake || die "emake libsm failed"
-	cd ${WORKDIR}/lib/libsmdb
-	emake || die "emake libsmdb failed"
-	cd ${WORKDIR}/lib/libsmutil
-	emake || die "emake libsmdb failed"
+	if use bind; then
+		cd ${WORKDIR}/lib/bind
+		fmake || die "fmake libbind failed"
+	fi
+	
+	if use sendmail; then
+		cd ${WORKDIR}/lib/libsm
+		fmake || die "fmake libsm failed"
+		cd ${WORKDIR}/lib/libsmdb
+		fmake || die "fmake libsmdb failed"
+		cd ${WORKDIR}/lib/libsmutil
+		fmake || die "fmake libsmdb failed"
+	fi
 	
 	einfo "Building package now"
 	cd ${S}
-	emake || die "emake failed"
+	fmake || die "fmake failed"
 }
 
 src_install() {	
 	# By creating these two directories we avoid having to do a 
 	# more complex hack inside lpr/SMM.doc and nologin makefiles.
-	dodir ${D}/usr/share/doc
-	dodir ${D}/sbin
-	emake DESTDIR=${D} install || die "Install failed"
-	enforce_correct_path
-}
-
-enforce_correct_path() {
-	local WRONG="local/sys-apps/freebsd-usbin/files/"
-	local CORRECT="/usr/libexec/lpr/ru/"
-
-	einfo "Correcting the path of files installed in an incorrect dir"
-	mv ${D}/${PORTDIR}/${WRONG}/bjc-240.sh.sample ${D}/${CORRECT}
-	rm -rf ${D}/${PORTDIR}
-
+	dodir /usr/share/doc
+	dodir /sbin
+	dodir /usr/libexec
+
+	# FILESDIR is used by some makefiles which will install files
+	# in the wrong place, just put it in the doc directory.
+	fmake DESTDIR=${D} DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
 }
diff -x Manifest -x digest-* -Npaur /root/overlay/sys-kernel/freebsd-headers/freebsd-headers-5.3.ebuild overlay/sys-kernel/freebsd-headers/freebsd-headers-5.3.ebuild
--- /root/overlay/sys-kernel/freebsd-headers/freebsd-headers-5.3.ebuild	Tue Feb  8 17:13:57 2005
+++ overlay/sys-kernel/freebsd-headers/freebsd-headers-5.3.ebuild	Fri Mar 11 13:40:02 2005
@@ -20,9 +20,10 @@ DEPEND=""
 S=${WORKDIR}/include
 
 src_compile() { 
-	setvar=export emake
+	make || die "make failed"
 }
 
-src_install() { 
-	make install DESTDIR=${D} || die "Install failed"
+src_install() {
+	dodir /usr/include
+	setvar=export fmake install DESTDIR=${D} || die "Install failed"
 }