Cleanup

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@"
 };
 

generic/generic_cmd-1.2.3.recipe

@@ -3,8 +3,8 @@ DESCRIPTION="Long ProjectX description.
 Spanning several paragraphs, maybe
  - containing
  - bullet points etc.
-You can also have really long lines that do not fit in 80 characters and use \
-a backslash to wrap the line."
+You can also have really long lines that do not fit in 100 characters and use a backslash to \
+wrap the line."
 HOMEPAGE="https://homepage/of/projectx.org"
 COPYRIGHT="2014 Developer name
 	2016 Another developer's name"
@@ -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
@@ -31,16 +34,12 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc
-	"
-
-GLOBAL_WRITABLE_FILES="
-	settings/projectx.conf keep-old
+	cmd:make
 	"
 
 defineDebugInfoPackage projectx \
-	"$commandBinDir"/projectx
+	$binDir/projectx
 
 BUILD()
 {

generic/generic_cmd_secondary_arch-1.2.3.recipe

@@ -3,8 +3,8 @@ DESCRIPTION="Long ProjectX description.
 Spanning several paragraphs, maybe
  - containing
  - bullet points etc.
-You can also have really long lines that do not fit in 80 characters and use \
-a backslash to wrap the line."
+You can also have really long lines that do not fit in 100 characters and use a backslash to \
+wrap the line."
 HOMEPAGE="https://homepage/of/projectx.org"
 COPYRIGHT="2014 Developer name
 	2016 Another developer's name"
@@ -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,34 +27,34 @@ 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:gcc$secondaryArchSuffix
 	cmd:make
-	cmd:gcc
-	"
-
-GLOBAL_WRITABLE_FILES="
-	settings/projectx.conf keep-old
 	"
 
 defineDebugInfoPackage projectx \
-	"$commandBinDir"/projectx
+	$commandBinDir/projectx
 
 BUILD()
 {
 	runConfigure --omit-dirs "binDir sbinDir" ./configure \
-		--bindir="$commandBinDir" \
-		--sbindir="$commandBinDir"
+		--bindir=$commandBinDir \
+		--sbindir=$commandBinDir
 	make $jobArgs
 }
 

generic/generic_font-1.2.3.recipe

@@ -3,8 +3,8 @@ DESCRIPTION="Long FontX description.
 Spanning several paragraphs, maybe
  - containing
  - bullet points etc.
-You can also have really long lines that do not fit in 80 characters and use \
-a backslash to wrap the line."
+You can also have really long lines that do not fit in 100 characters and use a backslash to \
+wrap the line."
 HOMEPAGE="https://homepage/of/fontx.org"
 COPYRIGHT="2015 Haikutype"
 LICENSE="SIL Open Font License v1.1"
@@ -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}
 }

generic/generic_haiku_app-1.2.3.recipe

@@ -3,8 +3,8 @@ DESCRIPTION="Long ProjectX description.
 Spanning several paragraphs, maybe
  - containing
  - bullet points etc.
-You can also have really long lines that do not fit in 80 characters and use \
-a backslash to wrap the line."
+You can also have really long lines that do not fit in 100 characters and use a backslash to \
+wrap the line."
 HOMEPAGE="https://homepage/of/projectx.org"
 COPYRIGHT="2014 Developer name
 	2016 Another developer's name"
@@ -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
@@ -32,16 +36,12 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:make
 	cmd:gcc
+	cmd:make
 	"
 
 defineDebugInfoPackage projectx \
-	"$appsDir"/ProjectX
-
-GLOBAL_WRITABLE_FILES="
-	settings/projectx.rc keep-old # If there is any
-	"
+	$appsDir/ProjectX
 
 BUILD()
 {
@@ -50,14 +50,14 @@ 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"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-#	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
 	local MINOR="0"
 	local LONG_INFO="$SUMMARY"
 
@@ -71,16 +71,11 @@ 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
-}
-
-TEST()
-{
-	make check
+	addAppDeskbarSymlink $appsDir/ProjectX
 }

generic/generic_haiku_app_secondary_arch-1.2.3.recipe

@@ -3,8 +3,8 @@ DESCRIPTION="Long ProjectX description.
 Spanning several paragraphs, maybe
  - containing
  - bullet points etc.
-You can also have really long lines that do not fit in 80 characters and use \
-a backslash to wrap the line."
+You can also have really long lines that do not fit in 100 characters and use a backslash to \
+wrap the line."
 HOMEPAGE="https://homepage/of/projectx.org"
 COPYRIGHT="2014 Developer name
 	2016 Another developer's name"
@@ -17,31 +17,32 @@ 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
+	"
 
 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:gcc$secondaryArchSuffix
 	cmd:make
-	cmd:gcc
 	"
 
 defineDebugInfoPackage projectx$secondaryArchSuffix \
-	"$appsDir"/ProjectX
-
-GLOBAL_WRITABLE_FILES="
-	settings/projectx.rc keep-old # If there is any
-	"
+	$appsDir/ProjectX
 
 BUILD()
 {
@@ -50,14 +51,14 @@ 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"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-#	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
 	local MINOR="0"
 	local LONG_INFO="$SUMMARY"
 
@@ -71,16 +72,11 @@ 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
-}
-
-TEST()
-{
-	make check
+	addAppDeskbarSymlink $appsDir/ProjectX
 }