Add packages for unzip and use them.

* remove unzip Jamfile from the build, <build>unzip stays with us. * clean up image and package definitions. * added unzip in regular builds.
2015-02-26 19:21:04 +01:00
parent 609834be06
commit 85e5aa30b1
14 changed files with 10 additions and 37 deletions
@@ -9,7 +9,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
 	driveinfo dstcheck dumpcatalog
 	eject error
 	fdinfo ffm filepanel finddir findpaths fortune fstrim
-	ftp ftpd funzip
+	ftp ftpd
 	getarch groupadd groupdel groupmod gzip gzexe
 	hd hey
 	ideinfo@ide idestatus@ide ifconfig iroster isvolume
@@ -30,11 +30,11 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
 	strace su sysinfo
 	tcpdump tcptester telnet telnetd top
 	traceroute trash
-	unchop unmount unzip unzipsfx
+	unchop unmount
 	uptime urlwrapper useradd userdel
 	version vmstat
 	waitfor watch writembr@x86,x86_64 xres
-	zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
+	zdiff zforce zgrep zip zipcloak zipnote zipsplit zmore znew
 ] ;

 SYSTEM_APPS = [ FFilterByBuildFeatures
@@ -125,7 +125,6 @@ AddSymlinkToPackage bin : less : more ;
 AddSymlinkToPackage bin : gzip : gunzip ;
 AddSymlinkToPackage bin : gzip : zcat ;
 AddSymlinkToPackage bin : zdiff : zcmp ;
-AddSymlinkToPackage bin : unzip : zipinfo ;

 # scripts and data files
 local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript
@@ -122,7 +122,6 @@ AddSymlinkToPackage bin : less : more ;
 AddSymlinkToPackage bin : gzip : gunzip ;
 AddSymlinkToPackage bin : gzip : zcat ;
 AddSymlinkToPackage bin : zdiff : zcmp ;
-AddSymlinkToPackage bin : unzip : zipinfo ;

 # scripts and data files
 local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript
@@ -197,6 +197,7 @@ RemotePackageRepository HaikuPorts
 	tinyxml_devel-2.6.2-1
 	transmission-2.84-3
 	unrar-5.1.5-1
+	unzip-6.0-1
 	vision-0.9.7.r949-1
 	vim-7.4-1
 	wget-1.15-1
@@ -398,6 +399,7 @@ RemotePackageRepository HaikuPorts
 	tinyxml
 	transmission
 	unrar
+	unzip
 	vim
 	vision
 	wget
@@ -208,6 +208,7 @@ RemotePackageRepository HaikuPorts
 	tinyxml_devel-2.6.2-1
 	transmission-2.84-3
 	unrar-5.1.5-1
+	unzip-6.0-1
 	vim-7.4-2
 	vision-0.9.7.r949-2
 	wget-1.15-1
@@ -338,6 +339,7 @@ RemotePackageRepository HaikuPorts
 	tinyxml
 	transmission
 	unrar
+	unzip
 	vim
 	vision
 	wget
@@ -373,6 +373,7 @@ RemotePackageRepository HaikuPorts
 	tinyxml_devel-2.6.2-1
 	ubertuber-0.9.10-3
 	unrar-5.1.5-1
+	unzip-6.0-1
 	util_macros-1.19.0-2
 	vim-7.4-3
 	virtualbox_guest_additions-4.3.53_svn-1
@@ -1012,6 +1013,7 @@ RemotePackageRepository HaikuPorts
 	transmission_x86
 	ubertuber
 	unrar
+	unzip
 	util_macros
 	vcmi_x86
 	vim