opensonic: s/-Wl,--no-as-needed//, merge -data back

srcpkgs/opensonic-data

@@ -1 +0,0 @@
-opensonic

srcpkgs/opensonic/template

@@ -1,12 +1,13 @@
 # Template file for 'opensonic'
 pkgname=opensonic
 version=0.1.4
-revision=9
+revision=10
 wrksrc="opensnc-src-${version}"
 build_style=cmake
+configure_args="-DCMAKE_C_STANDARD_LIBRARIES=-lalleg"
 hostmakedepends="allegro4-devel cmake"
 makedepends="allegro4-devel libpng-devel libvorbis-devel"
-depends="${pkgname}-data desktop-file-utils"
+depends="desktop-file-utils"
 short_desc="Open-source game based on the Sonic the Hedgehog universe"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -17,14 +18,15 @@ distfiles="${SOURCEFORGE_SITE}/opensnc/opensnc-src-${version}.tar.gz
 checksum="3a4c3fa9538ee27c04b5ea848c9ad0a83f335471936d4617a18d3648c42588e9
  481fe569959eefa92d0babeca27709b2efcf7a815cd5c49596b6c0403db76a4e"
 
+replaces="opensonic-data>=0"
+CFLAGS="-I./../loggcompat-${_loggcompat_ver}"
+
 post_extract() {
 	mv ${XBPS_BUILDDIR}/loggcompat-${_loggcompat_ver} .
 }
-CFLAGS="-I./../loggcompat-${_loggcompat_ver}"
-LDFLAGS="-Wl,--no-as-needed"
 
 pre_configure() {
-	# mimic what `./configure` would do
+	# mimic what ./configure would do
 	export _ALLEGRO_LIBS="$(allegro-config --libs)"
 	export _ALLEGRO_VERSION="$(allegro-config --version)"
 }
@@ -35,25 +37,3 @@ post_install() {
 	vinstall icon.png 644 usr/share/${pkgname}
 	vinstall ${FILESDIR}/opensonic.desktop 644 usr/share/applications
 }
-
-opensonic-data_package() {
-	short_desc+=" - data files"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share/opensonic/config
-		vmove usr/share/opensonic/images
-		vmove usr/share/opensonic/languages
-		vmove usr/share/opensonic/levels
-		vmove usr/share/opensonic/licenses
-		vmove usr/share/opensonic/musics
-		vmove usr/share/opensonic/objects
-		vmove usr/share/opensonic/quests
-		vmove usr/share/opensonic/samples
-		vmove usr/share/opensonic/screenshots
-		vmove usr/share/opensonic/sprites
-		vmove usr/share/opensonic/themes
-		vmove usr/share/opensonic/icon.png
-		vmove usr/share/opensonic/license.txt
-		vmove usr/share/opensonic/readme.html
-	}
-}