Cleanup

haikuports · Oct 23, 2024 · 6e654bb · 6e654bb
1 parent 8b3d7c7
commit 6e654bb
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 56 deletions.
diff --git a/generic/additional-files/projectx.rdef.in b/generic/additional-files/projectx.rdef.in
@@ -9,7 +9,7 @@ resource app_version {
 	variety = B_APPV_FINAL,
 	internal = 0,
 
-	short_info = "Audacious",
+	short_info = "Project X",
 	long_info = "@LONG_INFO@"
 };
 

diff --git a/generic/generic_cmd-1.2.3.recipe b/generic/generic_cmd-1.2.3.recipe
@@ -15,9 +15,12 @@ SOURCE_URI="https://github.com/HaikuArchives/ProjectX/archive/projectx-$portVers
 CHECKSUM_SHA256="000000000000000000000000000000000"
 SOURCE_DIR="$portVersionedName"
 PATCHES="projectx-$portVersion.patchset"
-ADDITIONAL_FILES="projectx.rdef"
 
-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all"
+
+GLOBAL_WRITABLE_FILES="
+	settings/projectx.conf keep-old
+	"
 
 PROVIDES="
 	projectx = $portVersion
@@ -35,12 +38,8 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/projectx.conf keep-old
-	"
-
 defineDebugInfoPackage projectx \
-	"$commandBinDir"/projectx
+	"$binDir"/projectx
 
 BUILD()
 {

diff --git a/generic/generic_cmd_secondary_arch-1.2.3.recipe b/generic/generic_cmd_secondary_arch-1.2.3.recipe
@@ -15,9 +15,8 @@ SOURCE_URI="https://github.com/HaikuArchives/ProjectX/archive/projectx-$portVers
 CHECKSUM_SHA256="000000000000000000000000000000000"
 SOURCE_DIR="$portVersionedName"
 PATCHES="projectx-$portVersion.patchset"
-ADDITIONAL_FILES="projectx.rdef"
 
-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
@@ -28,24 +27,24 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
+GLOBAL_WRITABLE_FILES="
+	settings/projectx.conf keep-old
+	"
+
 PROVIDES="
-	projectx = $portVersion
+	projectx$secondaryArchSuffix = $portVersion
 	cmd:projectx$commandSuffix = $portVersion
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:make
-	cmd:gcc
-	"
-
-GLOBAL_WRITABLE_FILES="
-	settings/projectx.conf keep-old
+	cmd:gcc$secondaryArchSuffix
 	"
 
 defineDebugInfoPackage projectx \

diff --git a/generic/generic_font-1.2.3.recipe b/generic/generic_font-1.2.3.recipe
@@ -19,24 +19,14 @@ DISABLE_SOURCE_PACKAGE=yes
 PROVIDES="
 	generic_font = $portVersion
 	"
-REQUIRES="
-	"
-
-BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
-	"
+REQUIRES=""
 
-BUILD()
-{
-	: # means nothing.
-}
+BUILD_REQUIRES=""
+BUILD_PREREQUIRES=""
 
 INSTALL()
 {
 	FONTDIR=$fontsDir/ttfonts
-	install -d ${FONTDIR}
-	install -t ${FONTDIR} generic-font1.ttf
-	install -t ${FONTDIR} generic-font2.ttf
-	install -t ${FONTDIR} generic-font-bold.ttf
+	mkdir -p ${FONTDIR}
+	cp -a *.ttf ${FONTDIR}
 }
diff --git a/generic/generic_haiku_app-1.2.3.recipe b/generic/generic_haiku_app-1.2.3.recipe
@@ -17,7 +17,11 @@ SOURCE_DIR="$portVersionedName"
 PATCHES="projectx-$portVersion.patchset"
 ADDITIONAL_FILES="projectx.rdef"
 
-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all"
+
+GLOBAL_WRITABLE_FILES="
+	settings/projectx.rc keep-old # If there is any
+	"
 
 PROVIDES="
 	projectx = $portVersion
@@ -37,11 +41,7 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage projectx \
-	"$appsDir"/ProjectX
-
-GLOBAL_WRITABLE_FILES="
-	settings/projectx.rc keep-old # If there is any
-	"
+	$appsDir/ProjectX
 
 BUILD()
 {
@@ -50,8 +50,8 @@ BUILD()
 
 INSTALL()
 {
-	install -d "$appsDir"
-	install -t "$appsDir" objects/ProjectX
+	install -d $appsDir
+	install -t $appsDir objects/ProjectX
 
 	# Create the extra attributes
 	local APP_SIGNATURE="application/x-vnd.ProjectX"
@@ -71,13 +71,13 @@ INSTALL()
 		$portDir/additional-files/projectx.rdef.in > projectx.rdef
 
 	# Add the resources to the application
-	addResourcesToBinaries projectx.rdef "$appsDir"/ProjectX
+	addResourcesToBinaries projectx.rdef $appsDir/ProjectX
 
 	# Set the acceptable mimetypes
-	mimeset -f "$appsDir"/ProjectX
+	mimeset -f $appsDir/ProjectX
 
 	# Create a Deskbar icon
-	addAppDeskbarSymlink "$appsDir"/ProjectX
+	addAppDeskbarSymlink $appsDir/ProjectX
 }
 
 TEST()

diff --git a/generic/generic_haiku_app_secondary_arch-1.2.3.recipe b/generic/generic_haiku_app_secondary_arch-1.2.3.recipe
@@ -17,32 +17,33 @@ SOURCE_DIR="$portVersionedName"
 PATCHES="projectx-$portVersion.patchset"
 ADDITIONAL_FILES="projectx.rdef"
 
-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all !x86_gcc2"
+SECONDARY_ARCHITECTURES="?x86"
+
+GLOBAL_WRITABLE_FILES="
+	settings/projectx.rc keep-old # If there is any
+	"
 
 PROVIDES="
-	projectx = $portVersion
+	projectx$secondaryArchSuffix = $portVersion
 	app:projectx = $portVersion
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:make
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	"
 
 defineDebugInfoPackage projectx$secondaryArchSuffix \
 	"$appsDir"/ProjectX
 
-GLOBAL_WRITABLE_FILES="
-	settings/projectx.rc keep-old # If there is any
-	"
-
 BUILD()
 {
 	make $jobArgs OBJ_DIR=objects

diff --git a/generic/generic_lib-1.2.3.recipe b/generic/generic_lib-1.2.3.recipe
@@ -17,7 +17,7 @@ SOURCE_DIR="$portVersionedName"
 PATCHES="projectx-$portVersion.patchset"
 ADDITIONAL_FILES="projectx.rdef"
 
-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all ?x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"
 
 libVersion="$portVersion"
@@ -26,6 +26,7 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 PROVIDES="
 	projectx$secondaryArchSuffix = $portVersion
 	lib:libprojectx$secondaryArchSuffix = $libVersionCompat
+	lib:libprojectx_1$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -34,6 +35,7 @@ REQUIRES="
 PROVIDES_devel="
 	projectx${secondaryArchSuffix}_devel = $portVersion
 	devel:libprojectx$secondaryArchSuffix = $libVersionCompat
+	devel:libprojectx_1$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	projectx$secondaryArchSuffix == $portVersion base
@@ -48,7 +50,8 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage projectx$secondaryArchSuffix \
-	"$libDir"/libprojectx.so.$libVersion
+	"$libDir"/libprojectx.so.$libVersion \
+	"$libDir"/libprojectx_1.so.$libVersion
 
 BUILD()
 {
@@ -61,7 +64,10 @@ INSTALL()
 	make install
 
 	prepareInstalledDevelLibs \
-		libprojectx
+		libprojectx \
+		libprojectx_1
+	fixPkgconfig
+
 	packageEntries devel \
 		"$developDir"
 }