Rewrite from scratch

7 files changed, 37 insertions, 147 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54ce5525485f..e26b0053c31b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,20 @@
 pkgbase = narcissu2-en
 	pkgdesc = A free japanese visual novel game, translated into English. This package includes both Narcissu and Narcissu: Side 2nd.
 	pkgver = 1.1
-	pkgrel = 8
-	url = http://www.neechin.net/narcissu/
-	install = narcissu2-en.install
+	pkgrel = 9
+	url = https://www.neechin.net/narcissu/
 	arch = any
 	license = custom:freeware
 	depends = ponscripter
-	depends = sh
-	source = [Denpa]_Narcissu_2_Eng_[unix].tar.bz2::http://www.neechin.net/file_download/22/
-	source = Narcissu_2_Eng_v1.1_script_[All_platforms].zip::http://www.neechin.net/file_download/27/Narcissu_2_Eng_v1.1_script_%5BAll_platforms%5D.zip
-	source = narcissu2-en.sh
-	source = narcissu2-en.6.gz
+	source = https://www.neechin.net/file_download/22/[Denpa]_Narcissu_2_Eng_[unix].tar.bz2
+	source = https://www.neechin.net/file_download/27/Narcissu_2_Eng_v1.1_script_[All_platforms].zip
+	source = https://github.com/07th-mod/ponscripter-fork/raw/mod/src/resources/narci2.ico
+	source = https://github.com/07th-mod/ponscripter-fork/raw/mod/src/resources/narci2.png
 	source = narcissu2-en.desktop
-	source = narcissu2-en.png
 	md5sums = e785f7bb8735867b130c78dd17da3a5f
 	md5sums = cbbdf90489e0b937454e4ed94d63824a
-	md5sums = ba48169116ead98b2a2b121adeb239e5
-	md5sums = 791f635920d6f3a08f955e96becc4065
-	md5sums = ab0d31fd74a0dd4fec3141ffc41bc7bd
-	md5sums = caeca7f043c9384c89d95c0e8455d41c
+	md5sums = 571d83dfa4b39c0ba95f825810104243
+	md5sums = 50dbdaba66b5ad8837fd364610e72822
+	md5sums = 28740061cebcef220e37bd2f384299e4
 
 pkgname = narcissu2-en
-
diff --git a/PKGBUILD b/PKGBUILD
index 810ff968e08b..3b7ef1eb68d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,26 @@
-# Maintainer: Anton Larionov <diffident dot cat at gmail dot com>
-
 pkgname=narcissu2-en
 pkgver=1.1
-pkgrel=8
-pkgdesc='A free japanese visual novel game, translated into English. This package includes both Narcissu and Narcissu: Side 2nd.'
-arch=('any')
-url='http://www.neechin.net/narcissu/'
-license=('custom:freeware')
-depends=('ponscripter' 'sh')
-install=${pkgname}.install
-
-source=('[Denpa]_Narcissu_2_Eng_[unix].tar.bz2::http://www.neechin.net/file_download/22/'
-	'Narcissu_2_Eng_v1.1_script_[All_platforms].zip::http://www.neechin.net/file_download/27/Narcissu_2_Eng_v1.1_script_%5BAll_platforms%5D.zip'
-	"${pkgname}.sh"
-	"${pkgname}.6.gz"
-        "${pkgname}.desktop"
-        "${pkgname}.png")
-
-md5sums=('e785f7bb8735867b130c78dd17da3a5f'
-         'cbbdf90489e0b937454e4ed94d63824a'
-         'ba48169116ead98b2a2b121adeb239e5'
-         '791f635920d6f3a08f955e96becc4065'
-         'ab0d31fd74a0dd4fec3141ffc41bc7bd'
-         'caeca7f043c9384c89d95c0e8455d41c')
-
-package() {
-
-  # copy main files
-  install -dm755 "${pkgdir}/usr/share/${pkgname}"
-  cd "${srcdir}/narcissu2-installer/data"
-  install -m644 arc1.nsa arc.nsa cursor0.bmp nar01.mpg "${pkgdir}/usr/share/${pkgname}"
-  install -m644 "${srcdir}/0.utf" "${pkgdir}/usr/share/${pkgname}"
-  install -m644 "${srcdir}/${pkgname}.png" "${pkgdir}/usr/share/${pkgname}/icon.png"
-
-  # copy bash script
-  install -D -m755 "${srcdir}/narcissu2-en.sh" "${pkgdir}/usr/bin/${pkgname}"
-
-  # copy man
-  install -D -m644 "${srcdir}/narcissu2-en.6.gz" "${pkgdir}/usr/share/man/man6/narcissu2-en.6.gz"
-
-  # copy documentation
-  install -dm755 "${pkgdir}/usr/share/doc/${pkgname}"
-  cd "${srcdir}/narcissu2-installer/"
-  install -m644 INSTALL README "${pkgdir}/usr/share/doc/${pkgname}"
-  install -m644 "${srcdir}/README.txt" "${pkgdir}/usr/share/doc/${pkgname}/README_v1.1"
-
-  # install desktop entry file
-  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -D -m644 "${srcdir}/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-  install -D -m755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+pkgrel=9
+pkgdesc="A free japanese visual novel game, translated into English. This package includes both Narcissu and Narcissu: Side 2nd."
+arch=(any)
+url=https://www.neechin.net/narcissu/
+license=(custom:freeware)
+depends=(ponscripter)
+source=(
+	https://www.neechin.net/file_download/2{2/[Denpa]_Narcissu_2_Eng_[unix].tar.bz2,7/Narcissu_2_Eng_v1.1_script_[All_platforms].zip}
+	https://github.com/07th-mod/ponscripter-fork/raw/mod/src/resources/narci2.{ico,png}
+	$pkgname.desktop)
+md5sums=(
+	e785f7bb8735867b130c78dd17da3a5f
+	cbbdf90489e0b937454e4ed94d63824a
+	571d83dfa4b39c0ba95f825810104243
+	50dbdaba66b5ad8837fd364610e72822
+	28740061cebcef220e37bd2f384299e4)
+package(){
+	install narcissu2-installer/data/*.{nsa,bmp,mpg} 0.utf -Dt "$pkgdir"/usr/share/$pkgname
+	cp {narci2,"$pkgdir"/usr/share/$pkgname/icon}.png
+	install narcissu2-installer/README -Dt "$pkgdir"/usr/share/doc/$pkgname
+	cp README.txt "$pkgdir"/usr/share/doc/$pkgname/README_v1.1
+	install narci2.ico -Dt "$pkgdir"/usr/share/pixmaps
+	install $pkgname.desktop -Dt "$pkgdir"/usr/share/applications
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/narcissu2-en.6.gz b/narcissu2-en.6.gz
deleted file mode 100644
index 5bc0ff402377..000000000000
--- a/narcissu2-en.6.gz
+++ /dev/null
@@ -1,60 +0,0 @@
-.TH narcissu2-en 6 2009-01-17 "Narcissu Side 2nd" "Narcissu Side 2nd manual"
-.
-.SH NAME
-narcissu2-en \- Narcissu Side 2nd launcher
-.
-.SH SYNOPSIS
-.B narcissu2-en
-.RI [ OPTIONS ]
-.
-.SH DESCRIPTION
-.
-The command "narcissu2-en" launches the visual novel
-.IR "Narcissu Side 2nd" .
-.
-.PP
-This manpage documents only the launcher command.
-.
-Documentation for the game itself, including in-game controls, is
-provided separately in the README file.
-.
-.SH OPTIONS
-.
-The following named options are recognised by
-.BR narcissu2-en ,
-in additional to the standard
-.BR \-\-help " and " \-\-version
-flags which should need no further introduction:
-.
-.TP
-.BR \-\-window ", " \-\-fullscreen
-Sets the initial screen mode (windowed or fullscreen).
-.IP
-If neither option is specified, the game will default to whichever
-mode it was in most recently, or, on the first run, to windowed mode.
-.
-.TP
-.BR \-\-debug ",\fP " \-d
-Enables debugging mode.
-.IP
-This turns on Ponscripter's internal debugging feature.
-.
-It's rather verbose, but may be useful for tracking down problems in
-the (hopefully unlikely) case where you have any.
-.
-.TP
-.BI \-\-save \ path
-Sets the path to use for saved data.
-.IP
-You should not normally need to use this option; the default,
-.IR ~/.Narcissu_Side_2nd ,
-should be suitable for most users.
-.
-.SH BUGS
-.
-We were not aware of any bugs at the time of shipping.
-.
-We were probably mistaken, and the entire game is probably ridden with
-the darn things.
-.
-If you must disillusion us, please do so gently.
diff --git a/narcissu2-en.desktop b/narcissu2-en.desktop
index 6bafa01ddcd6..3776a56fc117 100644
--- a/narcissu2-en.desktop
+++ b/narcissu2-en.desktop
@@ -1,9 +1,7 @@
 [Desktop Entry]
 Type=Application
-Version=1.1
-Name=Narcissu2-en
-Comment=Free japanese visual novel game, translated into English
-Icon=narcissu2-en.png
-Exec=/usr/bin/narcissu2-en
-Terminal=false
-Categories=Application;Game;
+Name=Narcissu Side 2nd
+Exec=ponscr
+Icon=/usr/share/pixmaps/narci2
+Path=/usr/share/narcissu2-en
+Categories=Game
diff --git a/narcissu2-en.install b/narcissu2-en.install
deleted file mode 100644
index f33dc211afac..000000000000
--- a/narcissu2-en.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  echo
-  echo "==> To launch game type:"
-  echo "==> narcissu2-en"
-  echo "==> To view man type:"
-  echo "==> man narcissu2-en"
-  echo
-}
-
-post_upgrade() {
-  post_install $1
-}
diff --git a/narcissu2-en.png b/narcissu2-en.png
deleted file mode 100644
index 9dd4436475f3..000000000000
--- a/narcissu2-en.png
+++ /dev/null
diff --git a/narcissu2-en.sh b/narcissu2-en.sh
deleted file mode 100644
index 26bec5fbaaf9..000000000000
--- a/narcissu2-en.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /usr/bin/env sh
-
-exec /usr/bin/ponscripter --root /usr/share/narcissu2-en "$@"