From nobody@FreeBSD.org  Sun Mar  2 03:08:25 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 5E7A68E9
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  2 Mar 2014 03:08:25 +0000 (UTC)
Received: from newred.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 49C2A131E
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  2 Mar 2014 03:08:25 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by newred.freebsd.org (8.14.7/8.14.7) with ESMTP id s2238O0p073803
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 2 Mar 2014 03:08:24 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.7/8.14.7/Submit) id s2238OEP073799;
	Sun, 2 Mar 2014 03:08:24 GMT
	(envelope-from nobody)
Message-Id: <201403020308.s2238OEP073799@cgiserv.freebsd.org>
Date: Sun, 2 Mar 2014 03:08:24 GMT
From: TAKEMON Takashi <takemon@bamboogate.co.jp>
To: freebsd-gnats-submit@FreeBSD.org
Subject: freesbie for pkgng
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: riggs@rrr.de

>Number:         187187
>Category:       ports
>Synopsis:       fix sysutils/freesbie for pkgng
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    riggs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 02 03:10:00 UTC 2014
>Closed-Date:    Sat Mar 15 17:11:48 UTC 2014
>Last-Modified:  Sat Mar 15 17:11:48 UTC 2014
>Originator:     TAKEMON Takashi
>Release:        
>Organization:
Bamboogate CO.,LTD
>Environment:
FreeBSD zfs2 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014     root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
freesbie environment allows you to create a 1CD system very easily.
But adding the package now I can not in pkgng environment.
So, we created a patch to address pkgng.

>How-To-Repeat:

>Fix:
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	patch-conf-i386-FREESBIE
#	patch-scripts-pkginstall.sh
#	patch-scripts-pkgselect.sh
#
echo x - patch-conf-i386-FREESBIE
sed 's/^X//' >patch-conf-i386-FREESBIE << 'e5354f9ec278acc0980a3577610c5674'
X--- conf/i386/FREESBIE.org	2006-07-24 04:35:29.000000000 +0900
X+++ conf/i386/FREESBIE	2014-02-27 01:03:01.000000000 +0900
X@@ -1,286 +1,5 @@
X-# $FreeBSD$
X-# $Id: FREESBIE,v 1.6 2006/07/23 19:35:29 rionda Exp $
X-
X-machine		i386
X-cpu		I486_CPU
X-cpu		I586_CPU
X-cpu		I686_CPU
X-ident		FREESBIE
X-
X-# To statically compile in device wiring instead of /boot/device.hints
X-#hints		"GENERIC.hints"		# Default places to look for devices.
X-
X-#options 	SCHED_ULE		# ULE scheduler
X-options 	SCHED_4BSD		# 4BSD scheduler
X-options 	PREEMPTION		# Enable kernel thread preemption
X-options 	INET			# InterNETworking
X-options 	INET6			# IPv6 communications protocols
X-options 	FFS			# Berkeley Fast Filesystem
X-options 	SOFTUPDATES		# Enable FFS soft updates support
X-options 	UFS_ACL			# Support for access control lists
X-options 	UFS_DIRHASH		# Improve performance on big directories
X-options 	MD_ROOT			# MD is a potential root device
X-options 	NFSCLIENT		# Network Filesystem Client
X-options 	NFSSERVER		# Network Filesystem Server
X-options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
X-options 	MSDOSFS			# MSDOS Filesystem
X-options 	CD9660			# ISO 9660 Filesystem
X-options 	PROCFS			# Process filesystem (requires PSEUDOFS)
X-options 	PSEUDOFS		# Pseudo-filesystem framework
X-options 	GEOM_GPT		# GUID Partition Tables.
X-options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
X-options 	COMPAT_FREEBSD5		# Compatible with FreeBSD4
X-options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
X-options 	KTRACE			# ktrace(1) support
X-options 	SYSVSHM			# SYSV-style shared memory
X-options 	SYSVMSG			# SYSV-style message queues
X-options 	SYSVSEM			# SYSV-style semaphores
X-options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
X-options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
X-options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
X-					# output.  Adds ~128k to driver.
X-options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
X-					# output.  Adds ~215k to driver.
X-options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
X-options 	UNIONFS			# Union filesystem
X-
X-# To make an SMP kernel, the next two lines are needed
X-options 	SMP			# Symmetric MultiProcessor Kernel
X-device		apic			# I/O APIC
X-
X-# Bus support.  Do not remove isa, even if you have no isa slots
X-device		eisa
X-device		pci
X-
X-device 		firmware
X-# Floppy drives
X-device		fdc
X-
X-# ATA and ATAPI devices
X-device		ata
X-device		atadisk		# ATA disk drives
X-device		ataraid		# ATA RAID drives
X-device		atapicd		# ATAPI CDROM drives
X-device		atapifd		# ATAPI floppy drives
X-device		atapist		# ATAPI tape drives
X-options 	ATA_STATIC_ID	# Static device numbering
X-
X-# SCSI Controllers
X-device		ahb		# EISA AHA1742 family
X-device		ahc		# AHA2940 and onboard AIC7xxx devices
X-device		ahd		# AHA39320/29320 and onboard AIC79xx devices
X-device		amd		# AMD 53C974 (Tekram DC-390(T))
X-device		isp		# Qlogic family
X-#device 	ispfw	# Firmware for QLogic HBAs- normally a module
X-device		mpt		# LSI-Logic MPT-Fusion
X-#device		ncr		# NCR/Symbios Logic
X-device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
X-device		trm		# Tekram DC395U/UW/F DC315U adapters
X-
X-device		adv		# Advansys SCSI adapters
X-device		adw		# Advansys wide SCSI adapters
X-device		aha		# Adaptec 154x SCSI adapters
X-device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
X-device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
X-
X-device		ncv		# NCR 53C500
X-device		nsp		# Workbit Ninja SCSI-3
X-device		stg		# TMC 18C30/18C50
X-
X-# SCSI peripherals
X-device		scbus		# SCSI bus (required for SCSI)
X-device		ch		# SCSI media changers
X-device		da		# Direct Access (disks)
X-device		sa		# Sequential Access (tape etc)
X-device		cd		# CD
X-device		pass		# Passthrough device (direct SCSI access)
X-device		ses		# SCSI Environmental Services (and SAF-TE)
X-
X-# RAID controllers interfaced to the SCSI subsystem
X-device		amr		# AMI MegaRAID
X-device		arcmsr		# Areca SATA II RAID
X-device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
X-device		ciss		# Compaq Smart RAID 5*
X-device		dpt		# DPT Smartcache III, IV - See NOTES for options
X-device		hptmv		# Highpoint RocketRAID 182x
X-device		iir		# Intel Integrated RAID
X-device		ips		# IBM (Adaptec) ServeRAID
X-device		mly		# Mylex AcceleRAID/eXtremeRAID
X-device		twa		# 3ware 9000 series PATA/SATA RAID
X-
X-# RAID controllers
X-device		aac		# Adaptec FSA RAID
X-device		aacp		# SCSI passthrough for aac (requires CAM)
X-device		ida		# Compaq Smart RAID
X-device		mlx		# Mylex DAC960 family
X-device		pst		# Promise Supertrak SX6000
X-device		twe		# 3ware ATA RAID
X-
X-# atkbdc0 controls both the keyboard and the PS/2 mouse
X-device		atkbdc		# AT keyboard controller
X-device		atkbd		# AT keyboard
X-device		psm		# PS/2 mouse
X-
X-device		vga		# VGA video card driver
X-
X-device		splash		# Splash screen and screen saver support
X-
X-# syscons is the default console driver, resembling an SCO console
X-device		sc
X-
X-# Enable this for the pcvt (VT220 compatible) console driver
X-#device		vt
X-#options 	XSERVER		# support for X server on a vt console
X-#options 	FAT_CURSOR	# start with block cursor
X-
X-device		agp		# support several AGP chipsets
X-
X-
X-# Power management support (see NOTES for more options)
X-#device		apm
X-# Add suspend/resume support for the i8254.
X-device		pmtimer
X-
X-# PCCARD (PCMCIA) support
X-# PCMCIA and cardbus bridge support
X-device		cbb		# cardbus (yenta) bridge
X-device		pccard		# PC Card (16-bit) bus
X-device		cardbus		# CardBus (32-bit) bus
X-
X-# Serial (COM) ports
X-device		sio		# 8250, 16[45]50 based serial ports
X-
X-# Parallel port
X-device		ppc
X-device		ppbus		# Parallel port bus (required)
X-device		lpt		# Printer
X-device		plip		# TCP/IP over parallel
X-device		ppi		# Parallel port interface device
X-#device		vpo		# Requires scbus and da
X-
X-# If you've got a "dumb" serial or parallel PCI card that is
X-# supported by the puc(4) glue driver, uncomment the following
X-# line to enable it (connects to the sio and/or ppc drivers):
X-#device 	puc
X-
X-# PCI Ethernet NICs.
X-device		de		# DEC/Intel DC21x4x (``Tulip'')
X-device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
X-device		ixgb		# Intel PRO/10GbE Ethernet Card
X-device		txp		# 3Com 3cR990 (``Typhoon'')
X-device		vx		# 3Com 3c590, 3c595 (``Vortex'')
X-
X-# PCI Ethernet NICs that use the common MII bus controller code.
X-# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
X-device		miibus		# MII bus support
X-device		bfe		# Broadcom BCM440x 10/100 Ethernet
X-device		bge		# Broadcom BCM570xx Gigabit Ethernet
X-device		dc		# DEC/Intel 21143 and various workalikes
X-device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
X-device		lge		# Level 1 LXT1001 gigabit Ethernet
X-device		nge		# NatSemi DP83820 gigabit Ethernet
X-device		nve		# nVidia nForce MCP on-board Ethernet Networking
X-device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
X-device		re		# RealTek 8139C+/8169/8169S/8110S
X-device		rl		# RealTek 8129/8139
X-device		sf		# Adaptec AIC-6915 (``Starfire'')
X-device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
X-device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
X-device		ste		# Sundance ST201 (D-Link DFE-550TX)
X-device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
X-device		tl		# Texas Instruments ThunderLAN
X-device		tx		# SMC EtherPower II (83c170 ``EPIC'')
X-device		vge		# VIA VT612x gigabit Ethernet
X-device		vr		# VIA Rhine, Rhine II
X-device		wb		# Winbond W89C840F
X-device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
X-
X-# ISA Ethernet NICs.  pccard NICs included.
X-device		cs		# Crystal Semiconductor CS89x0 NIC
X-# 'device ed' requires 'device miibus'
X-device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
X-device		ex		# Intel EtherExpress Pro/10 and Pro/10+
X-device		ep		# Etherlink III based cards
X-device		fe		# Fujitsu MB8696x based cards
X-device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
X-device		lnc		# NE2100, NE32-VL Lance Ethernet cards
X-device		sn		# SMC's 9000 series of Ethernet chips
X-device		xe		# Xircom pccard Ethernet
X-
X-# ISA devices that use the old ISA shims
X-#device		le
X-
X-# Wireless NIC cards
X-device		wlan		# 802.11 support
X-device		an		# Aironet 4500/4800 802.11 wireless NICs.
X-device		awi		# BayStack 660 and others
X-device		ral		# Ralink Technology RT2500 wireless NICs.
X-device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
X-#device		wl		# Older non 802.11 Wavelan wireless NIC.
X-
X-# Pseudo devices.
X-device		loop		# Network loopback
X-device		random		# Entropy device
X-device		ether		# Ethernet support
X-device		sl		# Kernel SLIP
X-device		ppp		# Kernel PPP
X-device		tun		# Packet tunnel.
X-device		pty		# Pseudo-ttys (telnet etc)
X-device		md		# Memory "disks"
X-device		gif		# IPv6 and IPv4 tunneling
X-device		faith		# IPv6-to-IPv4 relaying (translation)
X-
X-# The `bpf' device enables the Berkeley Packet Filter.
X-# Be aware of the administrative consequences of enabling this!
X-# Note that 'bpf' is required for DHCP.
X-device		bpf		# Berkeley packet filter
X-
X-# USB support
X-device		uhci		# UHCI PCI->USB interface
X-device		ohci		# OHCI PCI->USB interface
X-device		ehci		# EHCI PCI->USB interface (USB 2.0)
X-device		usb		# USB Bus (required)
X-#device		udbp		# USB Double Bulk Pipe devices
X-device		ugen		# Generic
X-device		uhid		# "Human Interface Devices"
X-device		ukbd		# Keyboard
X-device		ulpt		# Printer
X-device		umass		# Disks/Mass storage - Requires scbus and da
X-device		ums		# Mouse
X-device		ural		# Ralink Technology RT2500USB wireless NICs
X-device		urio		# Diamond Rio 500 MP3 player
X-device		uscanner	# Scanners
X-# USB Ethernet, requires miibus
X-device		aue		# ADMtek USB Ethernet
X-device		axe		# ASIX Electronics USB Ethernet
X-device		cdce		# Generic USB over Ethernet
X-device		cue		# CATC USB Ethernet
X-device		kue		# Kawasaki LSI USB Ethernet
X-device		rue		# RealTek RTL8150 USB Ethernet
X-
X-# FireWire support
X-device		firewire	# FireWire bus code
X-device		sbp		# SCSI over FireWire (Requires scbus and da)
X-device		fwe		# Ethernet over FireWire (non-standard!)
X-device		fwip		# IP over FireWire (rfc2734 and rfc3146)
X-
X-device		bktr
X-
X-options		IPFIREWALL			#firewall
X-options		IPFIREWALL_VERBOSE		#print information about
X-options		IPFIREWALL_DEFAULT_TO_ACCEPT    #allow everything by default
X-
X-device		pf				#PF OpenBSD packet-filter firewall
X-device		pflog				#logging support interface for PF
X-device		pfsync				#synchronization interface for PF
X-
X-options		IPSTEALTH
X-options		IPDIVERT
X-options		TCP_DROP_SYNFIN			#drop TCP packets with SYN+FIN
X-
X-options		GEOM_UZIP		# Read-only compressed disks
X-options 	GEOM_LABEL		# Providers labelization.
X-
X-options		VESA
X-options		SC_PIXEL_MODE
X-
X+include /usr/src/sys/i386/conf/GENERIC
X+ident FREESBIE
X+options GEOM_UZIP # Read-only compressed disks
X+options GEOM_LABEL # Providers labelization.
X+options UNIONFS # Union filesystem
e5354f9ec278acc0980a3577610c5674
echo x - patch-scripts-pkginstall.sh
sed 's/^X//' >patch-scripts-pkginstall.sh << '8c865a206843a7b4b6f05ea3a169de88'
X--- scripts/pkginstall.sh.org	2014-02-16 11:43:29.000000000 +0900
X+++ scripts/pkginstall.sh	2014-03-02 11:02:22.000000000 +0900
X@@ -52,7 +52,7 @@
X 
X 	# pkg_info might fail if the listed package isn't present
X 	set +e
X-	origins=$(pkg_info -EX "^$(escape_pkg ${pkg})($|-[^-]+$)")
X+	origins=$(pkg query -x "%n-%v" "^$(escape_pkg ${pkg})($|-[^-]+$)")
X 	retval=$?
X 	set -e
X 	if [ ${retval} -eq 0 ]; then
X@@ -84,7 +84,7 @@
X     touch deps
X     echo -n "Finding dependencies... "
X     while read pkg; do
X-	deps=$(pkg_info -qr ${pkg} | cut -d ' ' -f 2)
X+	deps=$(pkg query "%dn-%dv" ${pkg})
X 	for dep in ${deps}; do
X 	    echo ${dep} >> tmp_deps
X 	done      
X@@ -142,7 +142,7 @@
X     export PACKAGE_BUILDING=yo
X     chrootpkgpath=${CHROOTWD#$BASEDIR}
X     pkgfile=${WORKDIR}/sortpkg
X-    pkgaddcmd="chroot ${BASEDIR} pkg_add -v"
X+    pkgaddcmd="chroot ${BASEDIR} pkg add -f "
X     totpkg=$(wc -l $pkgfile | awk '{print $1}')
X     echo "Copying ${totpkg} packages"
X     cd ${CHROOTWD}
X@@ -159,7 +159,11 @@
X 	count=$((${count} + 1))
X 
X 	echo "Running pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar" >> ${LOGFILE}
X-	pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar >> ${LOGFILE} 2>&1
X+	rpkg=`pkg query %dn-%dv ${pkg}` 
X+	for spkg in ${rpkg}; do
X+		pkg create -o ${CHROOTWD} -n -f tar ${spkg} >> ${LOGFILE} 2>&1
X+	done
X+	pkg create -o ${CHROOTWD} -n -f tar ${pkg} >> ${LOGFILE} 2>&1
X 
X 	echo "Running $pkgaddcmd ${chrootpkgpath}/${pkg}.tar" >> ${LOGFILE}
X 	$pkgaddcmd ${chrootpkgpath}/${pkg}.tar >> ${LOGFILE} 2>&1
X@@ -168,12 +172,17 @@
X 
X     done < $pkgfile
X     echo "]"
X+    if [ -f ${WORKDIR}/extra/customroot/var/db ]; then
X+	chroot ${BASEDIR} pkg backup -d test.db
X+	env PKG_DBDIR=${WORKDIR}extra/customroot/var/db/pkg pkg backup -r ${BASEDIR}/test.db
X+	rm ${BASEDIR}/test.db
X+    fi
X     set -e
X }
X 
X delete_old_packages() {
X     echo "Deleting previously installed packages"
X-    chroot ${BASEDIR} pkg_delete -a >> ${LOGFILE} 2>&1
X+    chroot ${BASEDIR} pkg query %n-%v | grep -v pkg- | sed "s|^|chroot ${BASEDIR} pkg delete -fy  |g" |sh 
X }
X 
X # Deletes workdirs
X@@ -182,6 +191,16 @@
X     rm -rf ${WORKDIR} ${BASEDIR}/tmp/freesbie*
X }
X 
X+#pkgng install
X+pkgng_bootstrap() {
X+    if [ ! -f ${BASEDIR}/usr/local/sbin/pkg ]; then
X+	if [ ! -f ${BASEDIR}/etc/resolv.conf ]; then
X+	    echo "nameserver 8.8.8.8" >> ${BASEDIR}/etc/resolv.conf
X+	fi
X+	chroot ${BASEDIR} pkg bootstrap
X+    fi
X+}
X+
X trap "purge_wd && exit 1" INT
X 
X echo "Installing packages listed in ${PKGFILE}"
X@@ -194,6 +213,7 @@
X 
X find_deps
X sort_packages
X+pkgng_bootstrap
X delete_old_packages
X copy_packages
X purge_wd
8c865a206843a7b4b6f05ea3a169de88
echo x - patch-scripts-pkgselect.sh
sed 's/^X//' >patch-scripts-pkgselect.sh << '842c40c17145776c5512ec9bb20c933d'
X--- scripts/pkgselect.sh.org	2014-02-16 02:43:17.000000000 +0000
X+++ scripts/pkgselect.sh	2014-02-25 20:55:34.000000000 +0000
X@@ -21,7 +21,7 @@
X 
X # Check if there are packages installed on the system
X check_pkgs() {
X-    count=$(pkg_info -Qoa | wc -l)
X+    count=$(pkg query -a "%n-%v:%o" | wc -l)
X     if [ ${count} -eq 0 ]; then
X 	/usr/bin/dialog --title "FreeSBIE Packages selection" --clear \
X 	--msgbox "Sorry, you don't have any packages installed.\n\nPlease install at least the packages you want\nto include in your distribution." 10 50
X@@ -40,7 +40,7 @@
X     # Create a different file for each category. Each row in each file
X     # will look like:
X     # PKGNAME PKGNAME-version    
X-    pkg_info -Qoa | awk \
X+    pkg query -a "%n-%v:%o" | awk \
X ' BEGIN { FS=":|/" } 
X { 
X     a=$1;
X@@ -63,7 +63,7 @@
X 
X 	    # pkg_info might fail if the listed package isn't present
X 	    set +e
X-	    origins=$(pkg_info -QoX "^$(escape_pkg ${pkg})($|-[^-]+$)")
X+	    origins=$(pkg query -x "%n-%v:%o" "^$(escape_pkg ${pkg})($|-[^-]+$)")
X 	    retval=$?
X 	    set -e
X 	    if [ ${retval} -eq 0 ]; then
842c40c17145776c5512ec9bb20c933d
exit



>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Mar 2 15:17:36 UTC 2014 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187187 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: riggs@rrr.de
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/187187: fix sysutils/freesbie for pkgng
Date: Sun, 2 Mar 2014 15:17:36 UT

 Maintainer of sysutils/freesbie,
 
 Please note that PR ports/187187 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/187187
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->riggs 
Responsible-Changed-By: riggs 
Responsible-Changed-When: Sun Mar 2 15:33:19 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187187 

From: Thomas Zander <riggs@freebsd.org>
To: bug-followup@FreeBSD.org, takemon@bamboogate.co.jp
Cc:  
Subject: Re: ports/187187: fix sysutils/freesbie for pkgng
Date: Sat, 8 Mar 2014 21:56:10 +0100

 --+g7M9IMkV8truYOl
 Content-Type: multipart/mixed; boundary="pf9I7BMVVzbSWLtt"
 Content-Disposition: inline
 
 
 --pf9I7BMVVzbSWLtt
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Thanks for the pr. I have prepared an update using your ideas, but
 - support the amd64 and powerpc users as well
 - select the pkg management tool based on whether we are on a
   WITH_PKGNG system or not (support for old pkg_* tools until at least
   September 2014!)
 - support staging
 
 Could you test the attached version and confirm that it works for you?
 
 Thanks
 Riggs
 
 --pf9I7BMVVzbSWLtt
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="freesbie.diff.txt"
 Content-Transfer-Encoding: quoted-printable
 
 Index: Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- Makefile	(revision 347449)
 +++ Makefile	(working copy)
 @@ -3,15 +3,17 @@
 =20
  PORTNAME=3D	freesbie
  PORTVERSION=3D	2.0.20070710
 -PORTREVISION=3D	1
 +PORTREVISION=3D	2
  CATEGORIES=3D	sysutils
  MASTER_SITES=3D	http://www.rrr.de/~riggs/freesbie/
  MASTER_SITES+=3D	${MASTER_SITE_LOCAL:S/%SUBDIR%/delphij/}
  DISTNAME=3D	${PORTNAME}-${PORTVERSION:S/2.0.//}
 =20
 -MAINTAINER=3D	riggs@rrr.de
 +MAINTAINER=3D	riggs@FreeBSD.org
  COMMENT=3D	Yet another cool answer to the system-on-cd question
 =20
 +LICENSE=3D	BSD2CLAUSE
 +
  RUN_DEPENDS=3D	cdrecord:${PORTSDIR}/sysutils/cdrtools
 =20
  USE_BZIP2=3D	yes
 @@ -19,11 +21,26 @@
 =20
  WRKSRC=3D		${WRKDIR}/${PORTNAME}2
 =20
 -NO_STAGE=3D	yes
 +ONLY_FOR_ARCHS=3D	amd64 i386 powerpc
 +ONLY_FOR_ARCHS_REASON=3D	FreeSBIE build system only supports amd64, i386 a=
 nd powerpc
 +
 +.include <bsd.port.pre.mk>
 +
 +.if defined(WITH_PKGNG)
 +EXTRA_PATCHES+=3D	${FILESDIR}/extra-patch-pkgng
 +.endif
 +
  do-install:
 -	@ ${MKDIR} ${DATADIR}
 -	@ ${RM} ${WRKSRC}/scripts/iso.sh.orig
 +	@ ${MKDIR} ${STAGEDIR}${DATADIR}
 +	@ ${RM} ${WRKSRC}/scripts/iso.sh.orig \
 +		${WRKSRC}/conf/amd64/FREESBIE.orig \
 +		${WRKSRC}/conf/i386/FREESBIE.orig \
 +		${WRKSRC}/conf/powerpc/FREESBIE.orig
 +.if defined(WITH_PKGNG)
 +	@ ${RM} ${WRKSRC}/scripts/pkginstall.sh.orig \
 +		${WRKSRC}/scripts/pkgselect.sh.orig
 +.endif
  	@ cd ${WRKSRC} && ${FIND} . -type f -print | tar -cf - -T - | \
 -	tar -xf - -C ${DATADIR}
 +	tar -xf - -C ${STAGEDIR}${DATADIR}
 =20
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 Index: files/extra-patch-pkgng
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/extra-patch-pkgng	(revision 0)
 +++ files/extra-patch-pkgng	(working copy)
 @@ -0,0 +1,115 @@
 +--- scripts/pkginstall.sh.org	2014-02-16 11:43:29.000000000 +0900
 ++++ scripts/pkginstall.sh	2014-03-02 11:02:22.000000000 +0900
 +@@ -52,7 +52,7 @@
 +=20
 + 	# pkg_info might fail if the listed package isn't present
 + 	set +e
 +-	origins=3D$(pkg_info -EX "^$(escape_pkg ${pkg})($|-[^-]+$)")
 ++	origins=3D$(pkg query -x "%n-%v" "^$(escape_pkg ${pkg})($|-[^-]+$)")
 + 	retval=3D$?
 + 	set -e
 + 	if [ ${retval} -eq 0 ]; then
 +@@ -84,7 +84,7 @@
 +     touch deps
 +     echo -n "Finding dependencies... "
 +     while read pkg; do
 +-	deps=3D$(pkg_info -qr ${pkg} | cut -d ' ' -f 2)
 ++	deps=3D$(pkg query "%dn-%dv" ${pkg})
 + 	for dep in ${deps}; do
 + 	    echo ${dep} >> tmp_deps
 + 	done     =20
 +@@ -142,7 +142,7 @@
 +     export PACKAGE_BUILDING=3Dyo
 +     chrootpkgpath=3D${CHROOTWD#$BASEDIR}
 +     pkgfile=3D${WORKDIR}/sortpkg
 +-    pkgaddcmd=3D"chroot ${BASEDIR} pkg_add -v"
 ++    pkgaddcmd=3D"chroot ${BASEDIR} pkg add -f "
 +     totpkg=3D$(wc -l $pkgfile | awk '{print $1}')
 +     echo "Copying ${totpkg} packages"
 +     cd ${CHROOTWD}
 +@@ -159,7 +159,11 @@
 + 	count=3D$((${count} + 1))
 +=20
 + 	echo "Running pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar" >> ${LOGFILE}
 +-	pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar >> ${LOGFILE} 2>&1
 ++	rpkg=3D`pkg query %dn-%dv ${pkg}`=20
 ++	for spkg in ${rpkg}; do
 ++		pkg create -o ${CHROOTWD} -n -f tar ${spkg} >> ${LOGFILE} 2>&1
 ++	done
 ++	pkg create -o ${CHROOTWD} -n -f tar ${pkg} >> ${LOGFILE} 2>&1
 +=20
 + 	echo "Running $pkgaddcmd ${chrootpkgpath}/${pkg}.tar" >> ${LOGFILE}
 + 	$pkgaddcmd ${chrootpkgpath}/${pkg}.tar >> ${LOGFILE} 2>&1
 +@@ -168,12 +172,17 @@
 +=20
 +     done < $pkgfile
 +     echo "]"
 ++    if [ -f ${WORKDIR}/extra/customroot/var/db ]; then
 ++	chroot ${BASEDIR} pkg backup -d test.db
 ++	env PKG_DBDIR=3D${WORKDIR}extra/customroot/var/db/pkg pkg backup -r ${BA=
 SEDIR}/test.db
 ++	rm ${BASEDIR}/test.db
 ++    fi
 +     set -e
 + }
 +=20
 + delete_old_packages() {
 +     echo "Deleting previously installed packages"
 +-    chroot ${BASEDIR} pkg_delete -a >> ${LOGFILE} 2>&1
 ++    chroot ${BASEDIR} pkg query %n-%v | grep -v pkg- | sed "s|^|chroot ${=
 BASEDIR} pkg delete -fy  |g" |sh=20
 + }
 +=20
 + # Deletes workdirs
 +@@ -182,6 +191,16 @@
 +     rm -rf ${WORKDIR} ${BASEDIR}/tmp/freesbie*
 + }
 +=20
 ++#pkgng install
 ++pkgng_bootstrap() {
 ++    if [ ! -f ${BASEDIR}/usr/local/sbin/pkg ]; then
 ++	if [ ! -f ${BASEDIR}/etc/resolv.conf ]; then
 ++	    echo "nameserver 8.8.8.8" >> ${BASEDIR}/etc/resolv.conf
 ++	fi
 ++	chroot ${BASEDIR} pkg bootstrap
 ++    fi
 ++}
 ++
 + trap "purge_wd && exit 1" INT
 +=20
 + echo "Installing packages listed in ${PKGFILE}"
 +@@ -194,6 +213,7 @@
 +=20
 + find_deps
 + sort_packages
 ++pkgng_bootstrap
 + delete_old_packages
 + copy_packages
 + purge_wd
 +--- scripts/pkgselect.sh.org	2014-02-16 02:43:17.000000000 +0000
 ++++ scripts/pkgselect.sh	2014-02-25 20:55:34.000000000 +0000
 +@@ -21,7 +21,7 @@
 +=20
 + # Check if there are packages installed on the system
 + check_pkgs() {
 +-    count=3D$(pkg_info -Qoa | wc -l)
 ++    count=3D$(pkg query -a "%n-%v:%o" | wc -l)
 +     if [ ${count} -eq 0 ]; then
 + 	/usr/bin/dialog --title "FreeSBIE Packages selection" --clear \
 + 	--msgbox "Sorry, you don't have any packages installed.\n\nPlease instal=
 l at least the packages you want\nto include in your distribution." 10 50
 +@@ -40,7 +40,7 @@
 +     # Create a different file for each category. Each row in each file
 +     # will look like:
 +     # PKGNAME PKGNAME-version   =20
 +-    pkg_info -Qoa | awk \
 ++    pkg query -a "%n-%v:%o" | awk \
 + ' BEGIN { FS=3D":|/" }=20
 + {=20
 +     a=3D$1;
 +@@ -63,7 +63,7 @@
 +=20
 + 	    # pkg_info might fail if the listed package isn't present
 + 	    set +e
 +-	    origins=3D$(pkg_info -QoX "^$(escape_pkg ${pkg})($|-[^-]+$)")
 ++	    origins=3D$(pkg query -x "%n-%v:%o" "^$(escape_pkg ${pkg})($|-[^-]+$=
 )")
 + 	    retval=3D$?
 + 	    set -e
 + 	    if [ ${retval} -eq 0 ]; then
 
 Property changes on: files/extra-patch-pkgng
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: files/patch-conf-amd64-FREESBIE
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/patch-conf-amd64-FREESBIE	(revision 0)
 +++ files/patch-conf-amd64-FREESBIE	(working copy)
 @@ -0,0 +1,288 @@
 +--- conf/amd64/FREESBIE.orig	2006-07-12 20:53:24.000000000 +0200
 ++++ conf/amd64/FREESBIE	2014-03-08 16:39:04.266990176 +0100
 +@@ -1,280 +1,5 @@
 +- # $FreeBSD$
 +-# $Id: FREESBIE,v 1.7 2006/07/12 18:53:24 rionda Exp $
 +-
 +-machine		amd64
 +-cpu 		HAMMER
 +-ident		FREESBIE
 +-
 +-# To statically compile in device wiring instead of /boot/device.hints
 +-#hints		"GENERIC.hints"		# Default places to look for devices.
 +-
 +-#options 	SCHED_ULE		# ULE scheduler
 +-options 	SCHED_4BSD		# 4BSD scheduler
 +-options 	PREEMPTION		# Enable kernel thread preemption
 +-options 	INET			# InterNETworking
 +-options 	INET6			# IPv6 communications protocols
 +-options 	FFS			# Berkeley Fast Filesystem
 +-options 	SOFTUPDATES		# Enable FFS soft updates support
 +-options 	UFS_ACL			# Support for access control lists
 +-options 	UFS_DIRHASH		# Improve performance on big directories
 +-options 	MD_ROOT			# MD is a potential root device
 +-options 	NFSCLIENT		# Network Filesystem Client
 +-options 	NFSSERVER		# Network Filesystem Server
 +-options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
 +-options 	NTFS 			# NT Filesystem
 +-options 	MSDOSFS			# MSDOS Filesystem
 +-options 	CD9660			# ISO 9660 Filesystem
 +-options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 +-options 	PSEUDOFS		# Pseudo-filesystem framework
 +-options 	GEOM_GPT		# GUID Partition Tables.
 +-options 	COMPAT_43		# Needed by COMPAT_LINUX32
 +-options 	COMPAT_IA32		# Compatible with i386 binaries
 +-options 	COMPAT_FREEBSD5		# Compatible with FreeBSD4
 +-options 	SCSI_DELAY=3D5000		# Delay (in ms) before probing SCSI
 +-options 	KTRACE			# ktrace(1) support
 +-options 	SYSVSHM			# SYSV-style shared memory
 +-options 	SYSVMSG			# SYSV-style message queues
 +-options 	SYSVSEM			# SYSV-style semaphores
 +-options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 +-options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 +-options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
 +-options 	UNIONFS			# Union filesystem
 +-
 +-# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150)
 +-device		atpic			# 8259A compatability
 +-
 +-# Enabling NO_MIXED_MODE gives a performance improvement on some motherbo=
 ards
 +-# but does not work with some boards (mostly nVidia chipset based).
 +-#options 	NO_MIXED_MODE	# Don't penalize working chipsets
 +-
 +-# SMP kernel
 +-options 	SMP			# Symmetric MultiProcessor Kernel
 +-
 +-# Bus supports
 +-device		acpi
 +-device		pci
 +-
 +-# Floppy drives
 +-device		fdc
 +-
 +-# ATA and ATAPI devices
 +-device		ata
 +-device		atadisk		# ATA disk drives
 +-device		ataraid		# ATA RAID drives
 +-device		atapicd		# ATAPI CDROM drives
 +-device		atapifd		# ATAPI floppy drives
 +-device		atapist		# ATAPI tape drives
 +-options 	ATA_STATIC_ID	# Static device numbering
 +-
 +-# SCSI Controllers
 +-device		ahc		# AHA2940 and onboard AIC7xxx devices
 +-options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
 +-					# output.  Adds ~128k to driver.
 +-device		ahd		# AHA39320/29320 and onboard AIC79xx devices
 +-options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
 +-					# output.  Adds ~215k to driver.
 +-device		amd		# AMD 53C974 (Tekram DC-390(T))
 +-device		isp		# Qlogic family
 +-#device 	ispfw	# Firmware for QLogic HBAs- normally a module
 +-device		mpt		# LSI-Logic MPT-Fusion
 +-#device		ncr		# NCR/Symbios Logic
 +-device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 +-device		trm		# Tekram DC395U/UW/F DC315U adapters
 +-
 +-device		adv		# Advansys SCSI adapters
 +-device		adw		# Advansys wide SCSI adapters
 +-device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
 +-device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
 +-
 +-
 +-# SCSI peripherals
 +-device		scbus		# SCSI bus (required for SCSI)
 +-device		ch		# SCSI media changers
 +-device		da		# Direct Access (disks)
 +-device		sa		# Sequential Access (tape etc)
 +-device		cd		# CD
 +-device		pass		# Passthrough device (direct SCSI access)
 +-device		ses		# SCSI Environmental Services (and SAF-TE)
 +-
 +-# RAID controllers interfaced to the SCSI subsystem
 +-device		amr		# AMI MegaRAID
 +-device		arcmsr		# Areca SATA II RAID
 +-device		ciss		# Compaq Smart RAID 5*
 +-device		dpt		# DPT Smartcache III, IV - See NOTES for options
 +-device		hptmv		# Highpoint RocketRAID 182x
 +-device		rr232x		# Highpoint RocketRAID 232x
 +-device		iir		# Intel Integrated RAID
 +-device		ips		# IBM (Adaptec) ServeRAID
 +-device		mly		# Mylex AcceleRAID/eXtremeRAID
 +-device		twa		# 3ware 9000 series PATA/SATA RAID
 +-
 +-# RAID controllers
 +-device		aac		# Adaptec FSA RAID
 +-device		aacp		# SCSI passthrough for aac (requires CAM)
 +-device		ida		# Compaq Smart RAID
 +-device 		mfi 		# LSI MegaRAID SAS
 +-device		mlx		# Mylex DAC960 family
 +-#XXX pointer/int warnings
 +-#device		pst		# Promise Supertrak SX6000
 +-device		twe		# 3ware ATA RAID
 +-
 +-# atkbdc0 controls both the keyboard and the PS/2 mouse
 +-device		atkbdc		# AT keyboard controller
 +-device		atkbd		# AT keyboard
 +-device		psm		# PS/2 mouse
 +-
 +-device		kbdmux		# keyboard multiplexer
 +-
 +-device		vga		# VGA video card driver
 +-
 +-device		splash		# Splash screen and screen saver support
 +-
 +-# syscons is the default console driver, resembling an SCO console
 +-device		sc
 +-
 +-device		agp		# support several AGP chipsets
 +-
 +-# PCCARD (PCMCIA) support
 +-# PCMCIA and cardbus bridge support
 +-device		cbb		# cardbus (yenta) bridge
 +-device		pccard		# PC Card (16-bit) bus
 +-device		cardbus		# CardBus (32-bit) bus
 +-
 +-# Serial (COM) ports
 +-device		sio		# 8250, 16[45]50 based serial ports
 +-device		uart		# Generic UART driver
 +-
 +-# Parallel port
 +-device		ppc
 +-device		ppbus		# Parallel port bus (required)
 +-device		lpt		# Printer
 +-device		plip		# TCP/IP over parallel
 +-device		ppi		# Parallel port interface device
 +-#device		vpo		# Requires scbus and da
 +-
 +-# If you've got a "dumb" serial or parallel PCI card that is
 +-# supported by the puc(4) glue driver, uncomment the following
 +-# line to enable it (connects to the sio and/or ppc drivers):
 +-#device 	puc
 +-
 +-# PCI Ethernet NICs.
 +-device		de		# DEC/Intel DC21x4x (``Tulip'')
 +-device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
 +-device		ixgb		# Intel PRO/10GbE Ethernet Card
 +-device		txp		# 3Com 3cR990 (``Typhoon'')
 +-device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 +-
 +-# PCI Ethernet NICs that use the common MII bus controller code.
 +-# NOTE: Be sure to keep the 'device miibus' line in order to use these NI=
 Cs!
 +-device		miibus		# MII bus support
 +-device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
 +-device		bfe		# Broadcom BCM440x 10/100 Ethernet
 +-device		bge		# Broadcom BCM570xx Gigabit Ethernet
 +-device		dc		# DEC/Intel 21143 and various workalikes
 +-device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 +-device		lge		# Level 1 LXT1001 gigabit Ethernet
 +-device		nge		# NatSemi DP83820 gigabit Ethernet
 +-device		nve		# nVidia nForce MCP on-board Ethernet Networking
 +-device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
 +-device		re		# RealTek 8139C+/8169/8169S/8110S
 +-device		rl		# RealTek 8129/8139
 +-device		sf		# Adaptec AIC-6915 (``Starfire'')
 +-device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 +-device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 +-device		ste		# Sundance ST201 (D-Link DFE-550TX)
 +-device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 +-device		tl		# Texas Instruments ThunderLAN
 +-device		tx		# SMC EtherPower II (83c170 ``EPIC'')
 +-device		vge		# VIA VT612x gigabit Ethernet
 +-device		vr		# VIA Rhine, Rhine II
 +-device		wb		# Winbond W89C840F
 +-device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 +-
 +-# ISA Ethernet NICs.  pccard NICs included.
 +-device		cs		# Crystal Semiconductor CS89x0 NIC
 +-# 'device ed' requires 'device miibus'
 +-device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
 +-device		ex		# Intel EtherExpress Pro/10 and Pro/10+
 +-device		ep		# Etherlink III based cards
 +-device		fe		# Fujitsu MB8696x based cards
 +-device		sn		# SMC's 9000 series of Ethernet chips
 +-device		xe		# Xircom pccard Ethernet
 +-
 +-# Wireless NIC cards
 +-device		wlan		# 802.11 support
 +-device		wlan_wep	# 802.11 WEP support
 +-device		wlan_ccmp	# 802.11 CCMP support
 +-device		wlan_tkip	# 802.11 TKIP support
 +-device		an		# Aironet 4500/4800 802.11 wireless NICs.
 +-device		ath		# Atheros pci/cardbus NIC's
 +-device		ath_hal		# Atheros HAL (Hardware Access Layer)
 +-device		ath_rate_sample	# SampleRate tx rate control for ath
 +-device		awi		# BayStack 660 and others
 +-device		ral		# Ralink Technology RT2500 wireless NICs.
 +-device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 +-
 +-# Pseudo devices.
 +-device		loop		# Network loopback
 +-device		random		# Entropy device
 +-device		ether		# Ethernet support
 +-device		sl		# Kernel SLIP
 +-device		ppp		# Kernel PPP
 +-device		tun		# Packet tunnel.
 +-device		pty		# Pseudo-ttys (telnet etc)
 +-device		md		# Memory "disks"
 +-device		gif		# IPv6 and IPv4 tunneling
 +-device		faith		# IPv6-to-IPv4 relaying (translation)
 +-device		firmware	# firmware assist module
 +-
 +-# The `bpf' device enables the Berkeley Packet Filter.
 +-# Be aware of the administrative consequences of enabling this!
 +-# Note that 'bpf' is required for DHCP.
 +-device		bpf		# Berkeley packet filter
 +-
 +-# USB support
 +-device		uhci		# UHCI PCI->USB interface
 +-device		ohci		# OHCI PCI->USB interface
 +-device		ehci		# EHCI PCI->USB interface (USB 2.0)
 +-device		usb		# USB Bus (required)
 +-#device		udbp		# USB Double Bulk Pipe devices
 +-device		ugen		# Generic
 +-device		uhid		# "Human Interface Devices"
 +-device		ukbd		# Keyboard
 +-device		ulpt		# Printer
 +-device		umass		# Disks/Mass storage - Requires scbus and da
 +-device		ums		# Mouse
 +-device		ural		# Ralink Technology RT2500USB wireless NICs
 +-device		urio		# Diamond Rio 500 MP3 player
 +-device		uscanner	# Scanners
 +-# USB Ethernet, requires miibus
 +-device		aue		# ADMtek USB Ethernet
 +-device		axe		# ASIX Electronics USB Ethernet
 +-device		cdce		# Generic USB over Ethernet
 +-device		cue		# CATC USB Ethernet
 +-device		kue		# Kawasaki LSI USB Ethernet
 +-device		rue		# RealTek RTL8150 USB Ethernet
 +-
 +-# FireWire support
 +-device		firewire	# FireWire bus code
 +-device		sbp		# SCSI over FireWire (Requires scbus and da)
 +-device		fwe		# Ethernet over FireWire (non-standard!)
 +-device		fwip		# IP over FireWire (rfc2734 and rfc3146)
 +-
 +-device		bktr
 +-
 +-options		IPFIREWALL			#firewall
 +-options		IPFIREWALL_VERBOSE		#print information about
 +-options		IPFIREWALL_DEFAULT_TO_ACCEPT    #allow everything by default
 +-
 +-device		pf				#PF OpenBSD packet-filter firewall
 +-device		pflog				#logging support interface for PF
 +-device		pfsync				#synchronization interface for PF
 +-
 +-options		IPSTEALTH
 +-options		IPDIVERT
 +-options		TCP_DROP_SYNFIN			#drop TCP packets with SYN+FIN
 +-
 +-options		GEOM_UZIP		# Read-only compressed disks
 +-options 	GEOM_LABEL		# Providers labelization.
 +-
 +-options		SC_PIXEL_MODE			# add support for the raster text mode
 ++include /usr/src/sys/amd64/conf/GENERIC
 ++ident FREESBIE
 ++options GEOM_UZIP # Read-only compressed disks
 ++options GEOM_LABEL # Providers labelization.
 ++options UNIONFS # Union filesystem
 
 Property changes on: files/patch-conf-amd64-FREESBIE
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: files/patch-conf-i386-FREESBIE
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/patch-conf-i386-FREESBIE	(revision 0)
 +++ files/patch-conf-i386-FREESBIE	(working copy)
 @@ -0,0 +1,294 @@
 +--- conf/i386/FREESBIE.org	2006-07-24 04:35:29.000000000 +0900
 ++++ conf/i386/FREESBIE	2014-02-27 01:03:01.000000000 +0900
 +@@ -1,286 +1,5 @@
 +-# $FreeBSD$
 +-# $Id: FREESBIE,v 1.6 2006/07/23 19:35:29 rionda Exp $
 +-
 +-machine		i386
 +-cpu		I486_CPU
 +-cpu		I586_CPU
 +-cpu		I686_CPU
 +-ident		FREESBIE
 +-
 +-# To statically compile in device wiring instead of /boot/device.hints
 +-#hints		"GENERIC.hints"		# Default places to look for devices.
 +-
 +-#options 	SCHED_ULE		# ULE scheduler
 +-options 	SCHED_4BSD		# 4BSD scheduler
 +-options 	PREEMPTION		# Enable kernel thread preemption
 +-options 	INET			# InterNETworking
 +-options 	INET6			# IPv6 communications protocols
 +-options 	FFS			# Berkeley Fast Filesystem
 +-options 	SOFTUPDATES		# Enable FFS soft updates support
 +-options 	UFS_ACL			# Support for access control lists
 +-options 	UFS_DIRHASH		# Improve performance on big directories
 +-options 	MD_ROOT			# MD is a potential root device
 +-options 	NFSCLIENT		# Network Filesystem Client
 +-options 	NFSSERVER		# Network Filesystem Server
 +-options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
 +-options 	MSDOSFS			# MSDOS Filesystem
 +-options 	CD9660			# ISO 9660 Filesystem
 +-options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 +-options 	PSEUDOFS		# Pseudo-filesystem framework
 +-options 	GEOM_GPT		# GUID Partition Tables.
 +-options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
 +-options 	COMPAT_FREEBSD5		# Compatible with FreeBSD4
 +-options 	SCSI_DELAY=3D5000		# Delay (in ms) before probing SCSI
 +-options 	KTRACE			# ktrace(1) support
 +-options 	SYSVSHM			# SYSV-style shared memory
 +-options 	SYSVMSG			# SYSV-style message queues
 +-options 	SYSVSEM			# SYSV-style semaphores
 +-options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 +-options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 +-options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
 +-					# output.  Adds ~128k to driver.
 +-options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
 +-					# output.  Adds ~215k to driver.
 +-options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
 +-options 	UNIONFS			# Union filesystem
 +-
 +-# To make an SMP kernel, the next two lines are needed
 +-options 	SMP			# Symmetric MultiProcessor Kernel
 +-device		apic			# I/O APIC
 +-
 +-# Bus support.  Do not remove isa, even if you have no isa slots
 +-device		eisa
 +-device		pci
 +-
 +-device 		firmware
 +-# Floppy drives
 +-device		fdc
 +-
 +-# ATA and ATAPI devices
 +-device		ata
 +-device		atadisk		# ATA disk drives
 +-device		ataraid		# ATA RAID drives
 +-device		atapicd		# ATAPI CDROM drives
 +-device		atapifd		# ATAPI floppy drives
 +-device		atapist		# ATAPI tape drives
 +-options 	ATA_STATIC_ID	# Static device numbering
 +-
 +-# SCSI Controllers
 +-device		ahb		# EISA AHA1742 family
 +-device		ahc		# AHA2940 and onboard AIC7xxx devices
 +-device		ahd		# AHA39320/29320 and onboard AIC79xx devices
 +-device		amd		# AMD 53C974 (Tekram DC-390(T))
 +-device		isp		# Qlogic family
 +-#device 	ispfw	# Firmware for QLogic HBAs- normally a module
 +-device		mpt		# LSI-Logic MPT-Fusion
 +-#device		ncr		# NCR/Symbios Logic
 +-device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 +-device		trm		# Tekram DC395U/UW/F DC315U adapters
 +-
 +-device		adv		# Advansys SCSI adapters
 +-device		adw		# Advansys wide SCSI adapters
 +-device		aha		# Adaptec 154x SCSI adapters
 +-device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
 +-device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
 +-
 +-device		ncv		# NCR 53C500
 +-device		nsp		# Workbit Ninja SCSI-3
 +-device		stg		# TMC 18C30/18C50
 +-
 +-# SCSI peripherals
 +-device		scbus		# SCSI bus (required for SCSI)
 +-device		ch		# SCSI media changers
 +-device		da		# Direct Access (disks)
 +-device		sa		# Sequential Access (tape etc)
 +-device		cd		# CD
 +-device		pass		# Passthrough device (direct SCSI access)
 +-device		ses		# SCSI Environmental Services (and SAF-TE)
 +-
 +-# RAID controllers interfaced to the SCSI subsystem
 +-device		amr		# AMI MegaRAID
 +-device		arcmsr		# Areca SATA II RAID
 +-device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
 +-device		ciss		# Compaq Smart RAID 5*
 +-device		dpt		# DPT Smartcache III, IV - See NOTES for options
 +-device		hptmv		# Highpoint RocketRAID 182x
 +-device		iir		# Intel Integrated RAID
 +-device		ips		# IBM (Adaptec) ServeRAID
 +-device		mly		# Mylex AcceleRAID/eXtremeRAID
 +-device		twa		# 3ware 9000 series PATA/SATA RAID
 +-
 +-# RAID controllers
 +-device		aac		# Adaptec FSA RAID
 +-device		aacp		# SCSI passthrough for aac (requires CAM)
 +-device		ida		# Compaq Smart RAID
 +-device		mlx		# Mylex DAC960 family
 +-device		pst		# Promise Supertrak SX6000
 +-device		twe		# 3ware ATA RAID
 +-
 +-# atkbdc0 controls both the keyboard and the PS/2 mouse
 +-device		atkbdc		# AT keyboard controller
 +-device		atkbd		# AT keyboard
 +-device		psm		# PS/2 mouse
 +-
 +-device		vga		# VGA video card driver
 +-
 +-device		splash		# Splash screen and screen saver support
 +-
 +-# syscons is the default console driver, resembling an SCO console
 +-device		sc
 +-
 +-# Enable this for the pcvt (VT220 compatible) console driver
 +-#device		vt
 +-#options 	XSERVER		# support for X server on a vt console
 +-#options 	FAT_CURSOR	# start with block cursor
 +-
 +-device		agp		# support several AGP chipsets
 +-
 +-
 +-# Power management support (see NOTES for more options)
 +-#device		apm
 +-# Add suspend/resume support for the i8254.
 +-device		pmtimer
 +-
 +-# PCCARD (PCMCIA) support
 +-# PCMCIA and cardbus bridge support
 +-device		cbb		# cardbus (yenta) bridge
 +-device		pccard		# PC Card (16-bit) bus
 +-device		cardbus		# CardBus (32-bit) bus
 +-
 +-# Serial (COM) ports
 +-device		sio		# 8250, 16[45]50 based serial ports
 +-
 +-# Parallel port
 +-device		ppc
 +-device		ppbus		# Parallel port bus (required)
 +-device		lpt		# Printer
 +-device		plip		# TCP/IP over parallel
 +-device		ppi		# Parallel port interface device
 +-#device		vpo		# Requires scbus and da
 +-
 +-# If you've got a "dumb" serial or parallel PCI card that is
 +-# supported by the puc(4) glue driver, uncomment the following
 +-# line to enable it (connects to the sio and/or ppc drivers):
 +-#device 	puc
 +-
 +-# PCI Ethernet NICs.
 +-device		de		# DEC/Intel DC21x4x (``Tulip'')
 +-device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
 +-device		ixgb		# Intel PRO/10GbE Ethernet Card
 +-device		txp		# 3Com 3cR990 (``Typhoon'')
 +-device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 +-
 +-# PCI Ethernet NICs that use the common MII bus controller code.
 +-# NOTE: Be sure to keep the 'device miibus' line in order to use these NI=
 Cs!
 +-device		miibus		# MII bus support
 +-device		bfe		# Broadcom BCM440x 10/100 Ethernet
 +-device		bge		# Broadcom BCM570xx Gigabit Ethernet
 +-device		dc		# DEC/Intel 21143 and various workalikes
 +-device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 +-device		lge		# Level 1 LXT1001 gigabit Ethernet
 +-device		nge		# NatSemi DP83820 gigabit Ethernet
 +-device		nve		# nVidia nForce MCP on-board Ethernet Networking
 +-device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
 +-device		re		# RealTek 8139C+/8169/8169S/8110S
 +-device		rl		# RealTek 8129/8139
 +-device		sf		# Adaptec AIC-6915 (``Starfire'')
 +-device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 +-device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 +-device		ste		# Sundance ST201 (D-Link DFE-550TX)
 +-device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 +-device		tl		# Texas Instruments ThunderLAN
 +-device		tx		# SMC EtherPower II (83c170 ``EPIC'')
 +-device		vge		# VIA VT612x gigabit Ethernet
 +-device		vr		# VIA Rhine, Rhine II
 +-device		wb		# Winbond W89C840F
 +-device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 +-
 +-# ISA Ethernet NICs.  pccard NICs included.
 +-device		cs		# Crystal Semiconductor CS89x0 NIC
 +-# 'device ed' requires 'device miibus'
 +-device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
 +-device		ex		# Intel EtherExpress Pro/10 and Pro/10+
 +-device		ep		# Etherlink III based cards
 +-device		fe		# Fujitsu MB8696x based cards
 +-device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
 +-device		lnc		# NE2100, NE32-VL Lance Ethernet cards
 +-device		sn		# SMC's 9000 series of Ethernet chips
 +-device		xe		# Xircom pccard Ethernet
 +-
 +-# ISA devices that use the old ISA shims
 +-#device		le
 +-
 +-# Wireless NIC cards
 +-device		wlan		# 802.11 support
 +-device		an		# Aironet 4500/4800 802.11 wireless NICs.
 +-device		awi		# BayStack 660 and others
 +-device		ral		# Ralink Technology RT2500 wireless NICs.
 +-device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 +-#device		wl		# Older non 802.11 Wavelan wireless NIC.
 +-
 +-# Pseudo devices.
 +-device		loop		# Network loopback
 +-device		random		# Entropy device
 +-device		ether		# Ethernet support
 +-device		sl		# Kernel SLIP
 +-device		ppp		# Kernel PPP
 +-device		tun		# Packet tunnel.
 +-device		pty		# Pseudo-ttys (telnet etc)
 +-device		md		# Memory "disks"
 +-device		gif		# IPv6 and IPv4 tunneling
 +-device		faith		# IPv6-to-IPv4 relaying (translation)
 +-
 +-# The `bpf' device enables the Berkeley Packet Filter.
 +-# Be aware of the administrative consequences of enabling this!
 +-# Note that 'bpf' is required for DHCP.
 +-device		bpf		# Berkeley packet filter
 +-
 +-# USB support
 +-device		uhci		# UHCI PCI->USB interface
 +-device		ohci		# OHCI PCI->USB interface
 +-device		ehci		# EHCI PCI->USB interface (USB 2.0)
 +-device		usb		# USB Bus (required)
 +-#device		udbp		# USB Double Bulk Pipe devices
 +-device		ugen		# Generic
 +-device		uhid		# "Human Interface Devices"
 +-device		ukbd		# Keyboard
 +-device		ulpt		# Printer
 +-device		umass		# Disks/Mass storage - Requires scbus and da
 +-device		ums		# Mouse
 +-device		ural		# Ralink Technology RT2500USB wireless NICs
 +-device		urio		# Diamond Rio 500 MP3 player
 +-device		uscanner	# Scanners
 +-# USB Ethernet, requires miibus
 +-device		aue		# ADMtek USB Ethernet
 +-device		axe		# ASIX Electronics USB Ethernet
 +-device		cdce		# Generic USB over Ethernet
 +-device		cue		# CATC USB Ethernet
 +-device		kue		# Kawasaki LSI USB Ethernet
 +-device		rue		# RealTek RTL8150 USB Ethernet
 +-
 +-# FireWire support
 +-device		firewire	# FireWire bus code
 +-device		sbp		# SCSI over FireWire (Requires scbus and da)
 +-device		fwe		# Ethernet over FireWire (non-standard!)
 +-device		fwip		# IP over FireWire (rfc2734 and rfc3146)
 +-
 +-device		bktr
 +-
 +-options		IPFIREWALL			#firewall
 +-options		IPFIREWALL_VERBOSE		#print information about
 +-options		IPFIREWALL_DEFAULT_TO_ACCEPT    #allow everything by default
 +-
 +-device		pf				#PF OpenBSD packet-filter firewall
 +-device		pflog				#logging support interface for PF
 +-device		pfsync				#synchronization interface for PF
 +-
 +-options		IPSTEALTH
 +-options		IPDIVERT
 +-options		TCP_DROP_SYNFIN			#drop TCP packets with SYN+FIN
 +-
 +-options		GEOM_UZIP		# Read-only compressed disks
 +-options 	GEOM_LABEL		# Providers labelization.
 +-
 +-options		VESA
 +-options		SC_PIXEL_MODE
 +-
 ++include /usr/src/sys/i386/conf/GENERIC
 ++ident FREESBIE
 ++options GEOM_UZIP # Read-only compressed disks
 ++options GEOM_LABEL # Providers labelization.
 ++options UNIONFS # Union filesystem
 
 Property changes on: files/patch-conf-i386-FREESBIE
 ___________________________________________________________________
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Index: files/patch-conf-powerpc-FREESBIE
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/patch-conf-powerpc-FREESBIE	(revision 0)
 +++ files/patch-conf-powerpc-FREESBIE	(working copy)
 @@ -0,0 +1,150 @@
 +--- conf/powerpc/FREESBIE.orig	2005-10-02 01:26:15.000000000 +0200
 ++++ conf/powerpc/FREESBIE	2014-03-08 16:39:34.465990693 +0100
 +@@ -1,142 +1,5 @@
 +-# $FreeBSD$
 +-# $Id: FREESBIE,v 1.3 2005/10/01 23:26:15 saturnero Exp $
 +-
 +-machine		powerpc
 +-cpu		OEA
 +-ident		FREESBIE
 +-
 +-#To statically compile in device wiring instead of /boot/device.hints
 +-#hints		"GENERIC.hints"
 +-
 +-makeoptions	WERROR=3D-Wno-error	#XXX: We don't want -Werror just now
 +-
 +-# Platform support
 +-options 	POWERMAC		#NewWorld Apple PowerMacs
 +-options 	PSIM			#GDB PSIM ppc simulator
 +-
 +-#options 	SCHED_ULE		#ULE scheduler
 +-options 	SCHED_4BSD		#4BSD scheduler
 +-options 	INET			#InterNETworking
 +-options 	INET6			#IPv6 communications protocols
 +-options 	FFS			#Berkeley Fast Filesystem
 +-options 	SOFTUPDATES		#Enable FFS soft updates support
 +-options 	UFS_ACL			#Support for access control lists
 +-options 	UFS_DIRHASH		#Improve performance on big directories
 +-options 	MD_ROOT			#MD is a potential root device
 +-options 	NFSCLIENT		#Network Filesystem Client
 +-options 	NFSSERVER		#Network Filesystem Server
 +-options 	NFS_ROOT		#NFS usable as root device
 +-options 	MSDOSFS			#MSDOS Filesystem
 +-options 	CD9660			#ISO 9660 Filesystem
 +-options 	PROCFS			#Process filesystem (requires PSEUDOFS)
 +-options 	PSEUDOFS		#Pseudo-filesystem framework
 +-options 	GEOM_GPT		#GUID Partition Tables.
 +-options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
 +-options 	COMPAT_FREEBSD4		#Keep this for a while
 +-options 	SCSI_DELAY=3D5000		#Delay (in ms) before probing SCSI=20
 +-options 	KTRACE			#ktrace(1) syscall trace support
 +-options 	SYSVSHM			#SYSV-style shared memory
 +-options 	SYSVMSG			#SYSV-style message queues
 +-options 	SYSVSEM			#SYSV-style semaphores
 +-options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 +-
 +-# To make an SMP kernel, the next line is needed
 +-#options 	SMP			# Symmetric MultiProcessor Kernel
 +-
 +-# Standard busses
 +-device		pci
 +-
 +-# ATA and ATAPI devices
 +-device		ata
 +-device		atadisk		# ATA disk drives
 +-device		atapicd		# ATAPI CDROM drives
 +-#device		atapifd		# ATAPI floppy drives
 +-#device		atapist		# ATAPI tape drives
 +-
 +-# SCSI peripherals
 +-device		scbus		# SCSI bus (required for SCSI)
 +-device		da		# Direct Access (disks)
 +-device		sa		# Sequential Access (tape etc)
 +-device		cd		# CD
 +-device		pass		# Passthrough device (direct SCSI access)
 +-
 +-# syscons is the default console driver, resembling an SCO console
 +-device		sc
 +-options		SC_OFWFB	# OFW frame buffer
 +-options		SC_DFLT_FONT	# compile font in
 +-makeoptions	SC_DFLT_FONT=3Dcp437
 +-
 +-# Serial (COM) ports
 +-#device		sio		# 8250, 16[45]50 based serial ports
 +-device		zs		# Zilog 8350 based serial ports
 +-
 +-# PCI Ethernet NICs that use the common MII bus controller code.
 +-device		miibus		# MII bus support
 +-device		gem		# Sun GEM/Sun ERI/Apple GMAC
 +-device 		dc		# DEC/Intel 21143 and various workalikes
 +-device 		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 +-
 +-# Pseudo devices.
 +-device		loop		# Network loopback
 +-device		mem		# Memory and kernel memory devices
 +-device		random		# Entropy device
 +-device		ether		# Ethernet support
 +-device		sl		# Kernel SLIP
 +-device		ppp		# Kernel PPP
 +-device		tun		# Packet tunnel.
 +-device		pty		# Pseudo-ttys (telnet etc)
 +-device		md		# Memory "disks"
 +-device		ofwd		# Open Firmware disks
 +-device		gif		# IPv6 and IPv4 tunneling
 +-device		faith		# IPv6-to-IPv4 relaying/(translation)
 +-
 +-# The `bpf' device enables the Berkeley Packet Filter.
 +-# Be aware of the administrative consequences of enabling this!
 +-# Note that 'bpf' is required for DHCP.
 +-device		bpf		#Berkeley packet filter
 +-
 +-# USB support
 +-device		uhci		# UHCI PCI->USB interface
 +-device		ohci		# OHCI PCI->USB interface
 +-device		ehci		# EHCI PCI->USB interface
 +-device		usb		# USB Bus (required)
 +-device		ugen		# Generic
 +-device		uhid		# "Human Interface Devices"
 +-device		ukbd		# Keyboard
 +-device		ulpt		# Printer
 +-device		umass		# Disks/Mass storage - Requires scbus and da0
 +-device		ums		# Mouse
 +-device		urio		# Diamond Rio 500 MP3 player
 +-device		uscanner	# Scanners
 +-# USB Ethernet
 +-device		aue		# ADMtek USB Ethernet
 +-device		axe		# ASIX Electronics USB Ethernet
 +-device		cdce		# Generic USB over Ethernet
 +-device		cue		# CATC USB Ethernet
 +-device		kue		# Kawasaki LSI USB Ethernet
 +-
 +-# FireWire support
 +-device		firewire	# FireWire bus code
 +-device		sbp		# SCSI over FireWire (Requires scbus and da)
 +-device		fwe		# Ethernet over FireWire (non-standard!)
 +-
 +-options 	KTR
 +-options 	KTR_COMPILE=3D0xffffffff
 +-#options 	KTR_MASK=3DKTR_SIG
 +-options 	KTR_VERBOSE
 +-
 +-options		IPFIREWALL	#firewall
 +-options		IPFIREWALL_VERBOSE	#print information about
 +-options         IPFIREWALL_DEFAULT_TO_ACCEPT	#allow everything by default
 +-
 +-device		pf		#PF OpenBSD packet-filter firewall
 +-device          pflog		#logging support interface for PF
 +-device          pfsync		#synchronization interface for PF
 +-
 +-options		IPSTEALTH
 +-options		IPDIVERT
 +-options		TCP_DROP_SYNFIN	#drop TCP packets with SYN+FIN
 +-
 +-options		GEOM_UZIP		# Read-only compressed disks
 +-options 	GEOM_LABEL		# Providers labelization.
 +-
 ++include /usr/src/sys/powerpc/conf/GENERIC
 ++ident FREESBIE
 ++options GEOM_UZIP # Read-only compressed disks
 ++options GEOM_LABEL # Providers labelization.
 ++options UNIONFS # Union filesystem
 
 Property changes on: files/patch-conf-powerpc-FREESBIE
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 
 --pf9I7BMVVzbSWLtt--
 
 --+g7M9IMkV8truYOl
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 
 iEYEARECAAYFAlMbg+gACgkQjdSJKchZls0wuACcCxdZo/0ES2A72pKFM1aPSWtx
 o3kAniOe80IWGIpvGzyp/9Gi+AQVPp0G
 =BZBb
 -----END PGP SIGNATURE-----
 
 --+g7M9IMkV8truYOl--
State-Changed-From-To: feedback->open 
State-Changed-By: riggs 
State-Changed-When: Sat Mar 8 21:19:51 UTC 2014 
State-Changed-Why:  
Maintainer has fixed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187187 
State-Changed-From-To: open->feedback 
State-Changed-By: riggs 
State-Changed-When: Sat Mar 8 21:20:00 UTC 2014 
State-Changed-Why:  
Ask for submitter approval. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187187 

From: TAKEMON Takashi <takemon@bamboogate.co.jp>
To: Thomas Zander <riggs@freebsd.org>, bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/187187: fix sysutils/freesbie for pkgng
Date: Mon, 10 Mar 2014 15:44:03 +0900

 This is a multi-part message in MIME format.
 --------------030803030209040701050002
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Hello.
 Thank you for incorporating the patch.
 
 I do not have PowerPC machine.
 So, I can not test on PowerPC machines.
 
 but Fixes Makefile, config of the i386, amd64 worked fine.
 
 pkginstall.sh patch that I made was incorrect.
 I made a another patch that works fine more.
 Please use this instead.
 
 Thank you.
 TAKEMON Takashi
 
 (2014/03/09 5:56), Thomas Zander wrote:
 > Thanks for the pr. I have prepared an update using your ideas, but
 > - support the amd64 and powerpc users as well
 > - select the pkg management tool based on whether we are on a
 >    WITH_PKGNG system or not (support for old pkg_* tools until at least
 >    September 2014!)
 > - support staging
 >
 > Could you test the attached version and confirm that it works for you?
 >
 > Thanks
 > Riggs
 >
 
 
 --------------030803030209040701050002
 Content-Type: text/plain; charset=Shift_JIS;
  name="patch-scripts-pkginstall.sh"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch-scripts-pkginstall.sh"
 
 --- scripts/pkginstall.sh.orig	2007-01-16 19:14:46.000000000 +0900
 +++ scripts/pkginstall.sh	2014-03-10 15:36:47.962245461 +0900
 @@ -52,7 +52,7 @@
  
  	# pkg_info might fail if the listed package isn't present
  	set +e
 -	origins=$(pkg_info -EX "^$(escape_pkg ${pkg})($|-[^-]+$)")
 +	origins=$(pkg query -x "%n-%v" "^$(escape_pkg ${pkg})($|-[^-]+$)")
  	retval=$?
  	set -e
  	if [ ${retval} -eq 0 ]; then
 @@ -84,7 +84,7 @@
      touch deps
      echo -n "Finding dependencies... "
      while read pkg; do
 -	deps=$(pkg_info -qr ${pkg} | cut -d ' ' -f 2)
 +	deps=$(pkg query "%dn-%dv" ${pkg})
  	for dep in ${deps}; do
  	    echo ${dep} >> tmp_deps
  	done      
 @@ -142,7 +142,7 @@
      export PACKAGE_BUILDING=yo
      chrootpkgpath=${CHROOTWD#$BASEDIR}
      pkgfile=${WORKDIR}/sortpkg
 -    pkgaddcmd="chroot ${BASEDIR} pkg_add -v"
 +    pkgaddcmd="/usr/local/sbin/pkg -c ${BASEDIR} add -f "
      totpkg=$(wc -l $pkgfile | awk '{print $1}')
      echo "Copying ${totpkg} packages"
      cd ${CHROOTWD}
 @@ -159,7 +159,11 @@
  	count=$((${count} + 1))
  
  	echo "Running pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar" >> ${LOGFILE}
 -	pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar >> ${LOGFILE} 2>&1
 +	rpkg=`pkg query %dn-%dv ${pkg}` 
 +	for spkg in ${rpkg}; do
 +		pkg create -o ${CHROOTWD} -n -f tar ${spkg} >> ${LOGFILE} 2>&1
 +	done
 +	pkg create -o ${CHROOTWD} -n -f tar ${pkg} >> ${LOGFILE} 2>&1
  
  	echo "Running $pkgaddcmd ${chrootpkgpath}/${pkg}.tar" >> ${LOGFILE}
  	$pkgaddcmd ${chrootpkgpath}/${pkg}.tar >> ${LOGFILE} 2>&1
 @@ -168,12 +172,17 @@
  
      done < $pkgfile
      echo "]"
 +    if [ -f ${WORKDIR}/extra/customroot/var/db ]; then
 +	chroot ${BASEDIR} pkg backup -d test.db
 +	env PKG_DBDIR=${WORKDIR}extra/customroot/var/db/pkg pkg backup -r ${BASEDIR}/test.db
 +	rm ${BASEDIR}/test.db
 +    fi
      set -e
  }
  
  delete_old_packages() {
      echo "Deleting previously installed packages"
 -    chroot ${BASEDIR} pkg_delete -a >> ${LOGFILE} 2>&1
 +    pkg -c ${BASEDIR} delete -afy >> ${LOGFILE} 2>&1
  }
  
  # Deletes workdirs
 
 --------------030803030209040701050002--

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/187187: commit references a PR
Date: Sat, 15 Mar 2014 17:05:54 +0000 (UTC)

 Author: riggs
 Date: Sat Mar 15 17:05:50 2014
 New Revision: 348356
 URL: http://svnweb.freebsd.org/changeset/ports/348356
 QAT: https://qat.redports.org/buildarchive/r348356/
 
 Log:
   - Support PKGNG
   - Support Staging
   - Update maintainer e-mail address
   - Introduce limitation of the port to supported ARCHs
   - Add LICENSE
   - USE_BZIP2 -> USES tar:bzip2
   - Bump PORTREVISION
   
   PR:		ports/187187
   Submitted by:	TAKEMON Takashi <takemon@bamboogate.co.jp>
   Approved by:	thierry (mentor)
 
 Added:
   head/sysutils/freesbie/files/conf-arch-FREESBIE.in   (contents, props changed)
   head/sysutils/freesbie/files/extra-patch-pkgng   (contents, props changed)
 Modified:
   head/sysutils/freesbie/Makefile
 
 Modified: head/sysutils/freesbie/Makefile
 ==============================================================================
 --- head/sysutils/freesbie/Makefile	Sat Mar 15 16:55:47 2014	(r348355)
 +++ head/sysutils/freesbie/Makefile	Sat Mar 15 17:05:50 2014	(r348356)
 @@ -3,27 +3,42 @@
  
  PORTNAME=	freesbie
  PORTVERSION=	2.0.20070710
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	sysutils
  MASTER_SITES=	http://www.rrr.de/~riggs/freesbie/
  MASTER_SITES+=	${MASTER_SITE_LOCAL:S/%SUBDIR%/delphij/}
  DISTNAME=	${PORTNAME}-${PORTVERSION:S/2.0.//}
  
 -MAINTAINER=	riggs@rrr.de
 +MAINTAINER=	riggs@FreeBSD.org
  COMMENT=	Yet another cool answer to the system-on-cd question
  
 +LICENSE=	BSD2CLAUSE
 +
  RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
  
 -USE_BZIP2=	yes
 +USES=		tar:bzip2
  NO_BUILD=	yes
  
  WRKSRC=		${WRKDIR}/${PORTNAME}2
  
 -NO_STAGE=	yes
 +ONLY_FOR_ARCHS=	amd64 i386 powerpc
 +ONLY_FOR_ARCHS_REASON=	FreeSBIE build system only supports amd64, i386 and powerpc
 +
 +.include <bsd.port.pre.mk>
 +
 +.if defined(WITH_PKGNG)
 +EXTRA_PATCHES+=	${FILESDIR}/extra-patch-pkgng
 +.endif
 +
 +pre-configure:
 +	@${SED} -e "s:%%ARCH%%:${ARCH}:g" ${FILESDIR}/conf-arch-FREESBIE.in > ${WRKSRC}/conf/${ARCH}/FREESBIE
 +
  do-install:
 -	@ ${MKDIR} ${DATADIR}
 -	@ ${RM} ${WRKSRC}/scripts/iso.sh.orig
 +	@ ${MKDIR} ${STAGEDIR}${DATADIR}
 +	@ ${RM} -f ${WRKSRC}/scripts/iso.sh.orig \
 +		${WRKSRC}/scripts/pkginstall.sh.orig \
 +		${WRKSRC}/scripts/pkgselect.sh.orig
  	@ cd ${WRKSRC} && ${FIND} . -type f -print | tar -cf - -T - | \
 -	tar -xf - -C ${DATADIR}
 +	tar -xf - -C ${STAGEDIR}${DATADIR}
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 
 Added: head/sysutils/freesbie/files/conf-arch-FREESBIE.in
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/sysutils/freesbie/files/conf-arch-FREESBIE.in	Sat Mar 15 17:05:50 2014	(r348356)
 @@ -0,0 +1,5 @@
 +include /usr/src/sys/%%ARCH%%/conf/GENERIC
 +ident FREESBIE
 +options GEOM_UZIP # Read-only compressed disks
 +options GEOM_LABEL # Providers labelization.
 +options UNIONFS # Union filesystem
 
 Added: head/sysutils/freesbie/files/extra-patch-pkgng
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/sysutils/freesbie/files/extra-patch-pkgng	Sat Mar 15 17:05:50 2014	(r348356)
 @@ -0,0 +1,90 @@
 +--- scripts/pkginstall.sh.orig	2007-01-16 19:14:46.000000000 +0900
 ++++ scripts/pkginstall.sh	2014-03-10 15:36:47.962245461 +0900
 +@@ -52,7 +52,7 @@
 + 
 + 	# pkg_info might fail if the listed package isn't present
 + 	set +e
 +-	origins=$(pkg_info -EX "^$(escape_pkg ${pkg})($|-[^-]+$)")
 ++	origins=$(pkg query -x "%n-%v" "^$(escape_pkg ${pkg})($|-[^-]+$)")
 + 	retval=$?
 + 	set -e
 + 	if [ ${retval} -eq 0 ]; then
 +@@ -84,7 +84,7 @@
 +     touch deps
 +     echo -n "Finding dependencies... "
 +     while read pkg; do
 +-	deps=$(pkg_info -qr ${pkg} | cut -d ' ' -f 2)
 ++	deps=$(pkg query "%dn-%dv" ${pkg})
 + 	for dep in ${deps}; do
 + 	    echo ${dep} >> tmp_deps
 + 	done      
 +@@ -142,7 +142,7 @@
 +     export PACKAGE_BUILDING=yo
 +     chrootpkgpath=${CHROOTWD#$BASEDIR}
 +     pkgfile=${WORKDIR}/sortpkg
 +-    pkgaddcmd="chroot ${BASEDIR} pkg_add -v"
 ++    pkgaddcmd="/usr/local/sbin/pkg -c ${BASEDIR} add -f "
 +     totpkg=$(wc -l $pkgfile | awk '{print $1}')
 +     echo "Copying ${totpkg} packages"
 +     cd ${CHROOTWD}
 +@@ -159,7 +159,11 @@
 + 	count=$((${count} + 1))
 + 
 + 	echo "Running pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar" >> ${LOGFILE}
 +-	pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar >> ${LOGFILE} 2>&1
 ++	rpkg=`pkg query %dn-%dv ${pkg}` 
 ++	for spkg in ${rpkg}; do
 ++		pkg create -o ${CHROOTWD} -n -f tar ${spkg} >> ${LOGFILE} 2>&1
 ++	done
 ++	pkg create -o ${CHROOTWD} -n -f tar ${pkg} >> ${LOGFILE} 2>&1
 + 
 + 	echo "Running $pkgaddcmd ${chrootpkgpath}/${pkg}.tar" >> ${LOGFILE}
 + 	$pkgaddcmd ${chrootpkgpath}/${pkg}.tar >> ${LOGFILE} 2>&1
 +@@ -168,12 +172,17 @@
 + 
 +     done < $pkgfile
 +     echo "]"
 ++    if [ -f ${WORKDIR}/extra/customroot/var/db ]; then
 ++	chroot ${BASEDIR} pkg backup -d test.db
 ++	env PKG_DBDIR=${WORKDIR}extra/customroot/var/db/pkg pkg backup -r ${BASEDIR}/test.db
 ++	rm ${BASEDIR}/test.db
 ++    fi
 +     set -e
 + }
 + 
 + delete_old_packages() {
 +     echo "Deleting previously installed packages"
 +-    chroot ${BASEDIR} pkg_delete -a >> ${LOGFILE} 2>&1
 ++    pkg -c ${BASEDIR} delete -afy >> ${LOGFILE} 2>&1
 + }
 + 
 + # Deletes workdirs
 +--- scripts/pkgselect.sh.orig	2014-02-16 02:43:17.000000000 +0000
 ++++ scripts/pkgselect.sh	2014-02-25 20:55:34.000000000 +0000
 +@@ -21,7 +21,7 @@
 + 
 + # Check if there are packages installed on the system
 + check_pkgs() {
 +-    count=$(pkg_info -Qoa | wc -l)
 ++    count=$(pkg query -a "%n-%v:%o" | wc -l)
 +     if [ ${count} -eq 0 ]; then
 + 	/usr/bin/dialog --title "FreeSBIE Packages selection" --clear \
 + 	--msgbox "Sorry, you don't have any packages installed.\n\nPlease install at least the packages you want\nto include in your distribution." 10 50
 +@@ -40,7 +40,7 @@
 +     # Create a different file for each category. Each row in each file
 +     # will look like:
 +     # PKGNAME PKGNAME-version    
 +-    pkg_info -Qoa | awk \
 ++    pkg query -a "%n-%v:%o" | awk \
 + ' BEGIN { FS=":|/" } 
 + { 
 +     a=$1;
 +@@ -63,7 +63,7 @@
 + 
 + 	    # pkg_info might fail if the listed package isn't present
 + 	    set +e
 +-	    origins=$(pkg_info -QoX "^$(escape_pkg ${pkg})($|-[^-]+$)")
 ++	    origins=$(pkg query -x "%n-%v:%o" "^$(escape_pkg ${pkg})($|-[^-]+$)")
 + 	    retval=$?
 + 	    set -e
 + 	    if [ ${retval} -eq 0 ]; then
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: riggs 
State-Changed-When: Sat Mar 15 17:11:45 UTC 2014 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187187 
>Unformatted:
