graphics/birdfont: Fix install location.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 2 insertions, 72 deletions

diff --git a/graphics/birdfont/birdfont.SlackBuild b/graphics/birdfont/birdfont.SlackBuild
index d6b3b1c5ccc6..910d414830e5 100644
--- a/graphics/birdfont/birdfont.SlackBuild
+++ b/graphics/birdfont/birdfont.SlackBuild
@@ -70,8 +70,6 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 
-patch -p1 < $CWD/install-path.patch
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -79,11 +77,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr --dest=/
+./configure --prefix=/usr --cflags="$CFLAGS" --ldflags="$LDFLAGS"
 ./build.py
-./install.py
+./install.py --dest="$PKG" --libdir=/lib${LIBDIRSUFFIX} --manpages-directory=/man/man1
 
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
diff --git a/graphics/birdfont/install-path.patch b/graphics/birdfont/install-path.patch
deleted file mode 100644
index db13ae6077c6..000000000000
--- a/graphics/birdfont/install-path.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-This patch does not fix any bug. It solves some issues given by the build from sources
-using the packaging standard in Slackbuilds.org that sets '/tmp/SBo/package-application'
-as directory of installation ($PKG variable)
-Do not apply if you install birdfont with a slackbuild modified using another path
-for $PKG
-
---- ./install.py	2023-08-07 21:01:22.000000000 +0200
-+++ ./install.py	2023-09-05 18:30:08.552843554 +0200
-@@ -47,6 +47,6 @@
- 	f = getDest (file, dir)
- 	print ("install: " + f)
--	run ('install -d ' + dest + prefix + dir)
--	run ('install -m ' + str(mode) + ' ' + file + ' ' + dest + prefix + dir + '/')
-+	run ('install -d ' + '/tmp/SBo/package-birdfont/' + dest + prefix + dir)
-+	run ('install -m ' + str(mode) + ' ' + file + ' ' + '/tmp/SBo/package-birdfont/' + dest + prefix + dir + '/')
- 	installed.write (f + "\n")
- 
-@@ -54,11 +54,11 @@
- 	f = getDestRoot (file, dir)
- 	print ("install: " + f)
--	run ('install -d ' + dest + dir)
--	run ('install -m ' + str(mode) + ' ' + file + ' ' + dest + dir + '/')
-+	run ('install -d ' + '/tmp/SBo/package-birdfont/' + dest + dir)
-+	run ('install -m ' + str(mode) + ' ' + file + ' ' + '/tmp/SBo/package-birdfont/' + dest + dir + '/')
- 
- def link (dir, file, linkname):
- 	f = getDest (linkname, dir)
- 	print ("install link: " + f)
--	run ('cd ' + dest + prefix + dir + ' && ln -sf ' + file + ' ' + linkname)
-+	run ('cd ' + '/tmp/SBo/package-birdfont/' + dest + prefix + dir + ' && ln -sf ' + file + ' ' + linkname)
- 	installed.write (f + "\n")
- 	
-@@ -162,13 +162,13 @@
-         install ('build/bin/libbirdfont.so.' + '${LIBbirdfont_VERSION}', '/lib', 644)
- elif os.path.isfile ('build/bin/libbirdfont.so.' + version.SO_VERSION):
--	install ('build/bin/libbirdfont.so.' + version.SO_VERSION, libdir, 644)
-+	install ('build/bin/libbirdfont.so.' + version.SO_VERSION, libdir, 755)
- 	link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so.' + version.SO_VERSION_MAJOR)
- 	link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so')
- elif os.path.isfile ('build/libbirdfont.so.' + version.SO_VERSION):
--	install ('build/libbirdfont.so.' + version.SO_VERSION, libdir, 644)
-+	install ('build/libbirdfont.so.' + version.SO_VERSION, libdir, 755)
- 	link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so.' + version.SO_VERSION_MAJOR)
- 	link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so')
- elif os.path.isfile ('build/bin/libbirdfont.' + version.SO_VERSION + '.dylib'):
--	install ('build/bin/libbirdfont.' + version.SO_VERSION + '.dylib', libdir, 644)
-+	install ('build/bin/libbirdfont.' + version.SO_VERSION + '.dylib', libdir, 755)
- 	link (libdir, 'libbirdfont.' + version.SO_VERSION + '.dylib', ' libbirdfont.dylib.' + version.SO_VERSION_MAJOR)
- 	link (libdir, 'libbirdfont.' + version.SO_VERSION + '.dylib', ' libbirdfont.dylib')
-@@ -180,13 +180,13 @@
-         install ('build/bin/libbirdgems.so.' + '${LIBbirdgems_VERSION}', '/lib', 644)
- elif os.path.isfile ('build/bin/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION):
--        install ('build/bin/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, libdir, 644)
-+        install ('build/bin/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, libdir, 755)
-         link (libdir, 'libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, ' libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION_MAJOR)
-         link (libdir, 'libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, ' libbirdgems.so')
- elif os.path.isfile ('build/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION):
--        install ('build/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, libdir, 644)
-+        install ('build/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, libdir, 755)
-         link (libdir, 'libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, ' libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION_MAJOR)
-         link (libdir, 'libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, ' libbirdgems.so')
- elif os.path.isfile ('build/bin/libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION + '.dylib'):
--        install ('build/bin/libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION + '.dylib', libdir, 644)
-+        install ('build/bin/libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION + '.dylib', libdir, 755)
-         link (libdir, 'libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION + '.dylib', ' libbirdgems.dylib.' + version.LIBBIRDGEMS_SO_VERSION_MAJOR)
-         link (libdir, 'libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION + '.dylib', ' libbirdgems.dylib')