Add Özgür's package split

3 files changed, 176 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e66fd61f158d..eb839a011888 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,97 @@
+# Generated by makepkg 4.2.1
+# Sun Sep 20 05:30:44 UTC 2015
 pkgbase = cmdpack
-	pkgdesc = Collection of command line utilities, most for emulation or disk images (bin2iso, bincomp, brrrip, byteshuf, byteswap, cdpatch, ecm, fakecrc, hax65816, id3point, pecompat, rels, screamf, subfile, uips, usfv, vb2rip, wordadd, zerofill)
+	pkgdesc = Collection of command line utilities, most for emulation or disk images. (bin2iso bincomp brrrip byteshuf byteswap cdpatch ecm fakecrc hax65816 id3point pecompat rels screamf subfile uips usfv vb2rip wordadd zerofill docs)
 	pkgver = 1.03
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.neillcorlett.com/cmdpack/
-	install = cmdpack.install
 	arch = i686
 	arch = x86_64
+	groups = cmdpack
 	license = GPL3
-	provides = ecm
-	provides = unecm
-	source = http://www6.frugalware.org/mirrors/linux/frugalware/frugalware-current/source/apps-extra/cmdpack/cmdpack-1.03-src.tar.gz
-	sha256sums = 56a806f075dded183e29e85c9cda2c4662644a310e6916aea688a7b26f4e0a6c
+	source = dummy://cmdpack-1.03-src.tar.gz
+	md5sums = 79f62f20dc5ccb68d9a130e17798bb7f
 
-pkgname = cmdpack
+pkgname = cmdpack-bin2iso
+	pkgdesc = Convert CD .BIN to .ISO
+	provides = cmdpack-bin2iso
+	conflicts = bin2iso
+
+pkgname = cmdpack-bincomp
+	pkgdesc = Compare binary files
+	provides = bincomp
+
+pkgname = cmdpack-brrrip
+	pkgdesc = Rip SNES BRR sound samples
+	provides = brrrip
+
+pkgname = cmdpack-byteshuf
+	pkgdesc = Shuffle or unshuffle bytes in a file
+	provides = byteshuf
+
+pkgname = cmdpack-byteswap
+	pkgdesc = Swap byte order of files
+	provides = byteswap
+
+pkgname = cmdpack-cdpatch
+	pkgdesc = CD-XA image insert/extract utility
+	provides = cdpatch
+
+pkgname = cmdpack-ecm
+	pkgdesc = Encoder/decoder for Error Code Modeler format
+	provides = ecm-tools
+	conflicts = ecm-tools
+	replaces = ecm-tools
+
+pkgname = cmdpack-fakecrc
+	pkgdesc = Fake the CRC32 of a file
+	provides = fakecrc
+
+pkgname = cmdpack-hax65816
+	pkgdesc = Simple 65816 disassembler
+	provides = hax65816
+
+pkgname = cmdpack-id3point
+	pkgdesc = Pointless ID3v1 Tagger
+	provides = id3point
+
+pkgname = cmdpack-pecompat
+	pkgdesc = Maximize compatibility of a Win32 PE file
+	provides = pecompat
+
+pkgname = cmdpack-rels
+	pkgdesc = Relative Searcher
+	provides = rels
+
+pkgname = cmdpack-screamf
+	pkgdesc = .AMF to .S3M converter
+	provides = screamf
+
+pkgname = cmdpack-subfile
+	pkgdesc = Extract a portion of a file
+	provides = subfile
+
+pkgname = cmdpack-uips
+	pkgdesc = Universal IPS patch create/apply utility
+	provides = uips
+
+pkgname = cmdpack-usfv
+	pkgdesc = Universal SFV create/verify utility
+	provides = usfv
+
+pkgname = cmdpack-vb2rip
+	pkgdesc = VB2 sound format ripping utility
+	provides = vb2rip
+
+pkgname = cmdpack-wordadd
+	pkgdesc = Addition word puzzle solver
+	provides = wordadd
+
+pkgname = cmdpack-zerofill
+	pkgdesc = Create a large, empty file
+	provides = zerofill
+	conflicts = ucommon
+
+pkgname = cmdpack-docs
+	pkgdesc = cmdpack documents
 
diff --git a/PKGBUILD b/PKGBUILD
index 251f100f9050..e54db42cf290 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,97 @@
 # Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
+# Contributor: Özgür Sarıer <echo b3pndXJzYXJpZXIxMDExNjAxMTE1QGdtYWlsLmNvbQo= | base64 -d>
 
-# The pkgdesc is really long and not particularly pleasing as a
-# result.  These utilties aren't entirely related to each other, but
-# are distributed together.  Suggestions are welcome to making the
-# pkgdesc suitably fit in 80 characters (the names of all the
-# utilities in it are primarily to aide in searching the AUR for
-# them.).
+# Please comment unwanted cmdpack tools in "_utils" section.
 
-pkgname=cmdpack
+pkgbase='cmdpack'
+groups="$pkgbase"
+_utils=(
+# Like below, add # at the beginning of unwanted tools' line.
+#	'unwantedtool'
+	'bin2iso'
+	'bincomp'
+	'brrrip'
+	'byteshuf'
+	'byteswap'
+	'cdpatch'
+	'ecm'
+	'fakecrc'
+	'hax65816'
+	'id3point'
+	'pecompat'
+	'rels'
+	'screamf'
+	'subfile'
+	'uips'
+	'usfv'
+	'vb2rip'
+	'wordadd'
+	'zerofill'
+	'docs' # This is not a utility, it just adds docs and licenses.
+	)
+for _tool in ${_utils[@]}; do
+	pkgname+=("$pkgbase-$_tool")
+done
 pkgver=1.03
-pkgrel=3
-pkgdesc="Collection of command line utilities, most for emulation or disk images (bin2iso, bincomp, brrrip, byteshuf, byteswap, cdpatch, ecm, fakecrc, hax65816, id3point, pecompat, rels, screamf, subfile, uips, usfv, vb2rip, wordadd, zerofill)"
+pkgrel=4
+pkgdesc="Collection of command line utilities, most for emulation or disk images.
+	(${_utils[*]})"
 arch=('i686' 'x86_64')
-url="http://www.neillcorlett.com/cmdpack/"
+url="http://www.neillcorlett.com/$pkgbase/"
 license=('GPL3')
-provides=('ecm' 'unecm')
-install=cmdpack.install
-source=("http://www6.frugalware.org/mirrors/linux/frugalware/frugalware-current/source/apps-extra/${pkgname}/${pkgname}-${pkgver}-src.tar.gz")
-sha256sums=('56a806f075dded183e29e85c9cda2c4662644a310e6916aea688a7b26f4e0a6c')
-
-_utilties=('bin2iso' 'bincomp' 'brrrip' 'byteshuf' 'byteswap'
-  'cdpatch' 'ecm' 'fakecrc' 'hax65816' 'id3point' 'pecompat' 'rels'
-  'screamf' 'subfile' 'uips' 'usfv' 'vb2rip' 'wordadd' 'zerofill')
+source=(dummy://"${pkgbase}-${pkgver}-src.tar.gz")
+md5sums=('79f62f20dc5ccb68d9a130e17798bb7f')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}-src/src/
-
-  for elem in ${_utilties[@]}
-  do
-    make $elem
-  done
+	cd $srcdir/$pkgbase-$pkgver-src/src/
+	for _tool in "${_utils[@]}"; do
+		if [[ "$_tool" == "ecm" ]]; then
+			gcc $CFLAGS -Wall "$_tool.c" -s -o "bin2ecm"
+		elif ! [[ "$_tool" == "docs" ]]; then
+			gcc $CFLAGS -Wall "$_tool.c" -s -o "$_tool"
+		fi
+	done
 }
 
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}-src/src/
-
-  for elem in ${_utilties[@]}
-  do
-    install -Dm755 $elem ${pkgdir}/usr/bin/cmdpack/$elem
-  done
-
-  ln ${pkgdir}/usr/bin/cmdpack/ecm ${pkgdir}/usr/bin/cmdpack/unecm
-
-  install -Dm644 ../doc/cmdpack.txt ${pkgdir}/usr/share/doc/cmdpack/cmdpack.txt
-}
+for _tool in "${_utils[@]}"; do
+	src_mkdir_eval='mkdir -p ./src/ > /dev/null 2>&1'
+	src_ext_ctr_eval='if ! [[ -d "./src/$pkgbase-$pkgver-src/src/" ]]; then bsdtar -xf "'$source'" -C ./src/; fi > /dev/null 2>&1'
+	pkg_des_c_eval="sed -n 's/\"$//g;s/^#define TITLE \"$_tool - //p' ./src/\$pkgbase-\$pkgver-src/src/$_tool.c"
+	add_pkg_func="package_$pkgbase-$_tool() {
+		cd \${srcdir%/*}/
+		provides=('$_tool')
+		pkgdesc="\`$src_mkdir_eval\`\`$src_ext_ctr_eval\`\`$pkg_des_c_eval\`"
+		cd  \$srcdir/\${pkgbase}-\${pkgver}-src/
+	"
+	if [[ "$_tool" == "bin2iso" ]]; then
+		eval "$add_pkg_func
+		conflicts=('bin2iso')
+		provides=('$pkgbase-$_tool')
+		install -Dm0755 ./src/$_tool \${pkgdir}/usr/bin/$_tool
+		}"
+	elif [[ "$_tool" == "ecm" ]]; then
+		eval "$add_pkg_func
+		conflicts=('ecm-tools')
+		provides=('ecm-tools')
+		replaces=('ecm-tools')
+		install -Dm0755 ./src/bin2ecm \${pkgdir}/usr/bin/bin2ecm
+		ln \${pkgdir}/usr/bin/bin2ecm \${pkgdir}/usr/bin/ecm2bin
+		}"
+	elif [[ "$_tool" == "zerofill" ]]; then
+		eval "$add_pkg_func
+		conflicts=('ucommon')
+		install -Dm0755 ./src/$_tool \${pkgdir}/usr/bin/$_tool
+		}"
+	elif [[ "$_tool" == "docs" ]]; then
+		eval "package_$pkgbase-$_tool() {
+			cd  \$srcdir/\${pkgbase}-\${pkgver}-src/
+			pkgdesc='$pkgbase documents'
+			install -Dm0644 ./doc/cmdpack.txt \${pkgdir}/usr/share/doc/\${pkgbase}/cmdpack.txt
+			install -Dm0644 ./doc/gpl.txt \${pkgdir}/usr/share/licenses/\${pkgbase}/LICENSE
+		}"
+	else
+		eval "$add_pkg_func
+		install -Dm0755 ./src/$_tool \${pkgdir}/usr/bin/$_tool
+		}"
+	fi
+done
diff --git a/cmdpack.install b/cmdpack.install
deleted file mode 100644
index 35099911e73d..000000000000
--- a/cmdpack.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    cat <<EOF
-Due to conflicts with some of the generic-ish binary names in this
-package with core, extra, and community repository packages, they have
-now been all placed under /usr/bin/cmdpack, which you may add to your
-\$PATH for convenience.
-EOF
-}
-
-post_upgrade() {
-    post_install $1
-}