galeb-mkfiles

Извори пакета за Галеб
Дневник | Датотеке | Референце | ПРОЧИТАЈМЕ | ЛИЦЕНЦА
чување 6dd82d59e5b585bd09c3a3ed55d26d0e5c797503
родитељ fc849b9b619f8ec51b142cda979a7f7c5717ea59
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Fri, 26 Aug 2022 13:45:44 +0200

Make package (name and version) variable names and locations more consistent

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:

Mdocbook-xml/config.mk | 5+++--


Mdocbook-xml/mkfile | 7+++----


Mdocbook-xsl-nons/config.mk | 1+


Mdocbook-xsl-nons/mkfile | 1-


Mgaleb-howtos/config.mk | 3++-


Mgaleb-howtos/mkfile | 3+--


Mlinux-headers/config.mk | 8+++++---


Mlinux-headers/mkfile | 4+---


Mmkpk/mkfile | 3+--


Mmkpk/mkpk-config.mk | 13+++++++------


Mnoice/config.mk | 3++-


Mnoice/mkfile | 3+--


Msacc/mkfile | 2+-


Msacc/mkpk-config.mk | 2+-


Msled/config.mk | 3++-


Msled/mkfile | 3+--


Mtable/config.mk | 3++-


Mtable/mkfile | 3+--


Munzip/config.mk | 1+


Munzip/mkfile | 1-


Mxmlto/config.mk | 1+


Mxmlto/mkfile | 1-


измењених датотека: 22, додавања: 37(+), брисања: 37(-)

diff --git a/docbook-xml/config.mk b/docbook-xml/config.mk
@@ -1,4 +1,5 @@
+PKGBASE=	docbook-xml
 PKGVER=		4.5
 PREFIX=		/
-SRCTARBALLS=	https://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
-SRCCRDIRS=	docbook-xml-4.5
+SRCTARBALLS=	https://www.docbook.org/xml/4.5/docbook-xml-$PKGVER.zip
+SRCCRDIRS=	docbook-xml-$PKGVER
diff --git a/docbook-xml/mkfile b/docbook-xml/mkfile
@@ -4,7 +4,6 @@ mkpklib=/lib/mkpk
 <$mkpklib/derivatives.mk
 
 NOBINDDIRS=	1
-PKGBASE=	docbook-xml
 PKG=		$PKGBASE-$PKGVER
 
 #install_sources=	$install_sources install-symlinks
@@ -12,13 +11,13 @@ PKG=		$PKGBASE-$PKGVER
 <$mkpklib/package.mk
 
 install:QV:
-	printf "  INST\t%s\n" "xml-dtd-4.5"
-	$INSTALL -dm0755 $DESTDIR/share/xml/docbook/xml-dtd-4.5
+	printf "  INST\t%s\n" "xml-dtd-$PKGVER"
+	$INSTALL -dm0755 $DESTDIR/share/xml/docbook/xml-dtd-$PKGVER
 	printf "  INST\t%s\n" "/etc/xml"
 	$INSTALL -dm0755 $DESTDIR/etc/xml
 	printf "  CP\t%s\n" "docbook.cat *.dtd ent/ *.mod"
 	cp -af docbook.cat *.dtd ent/ *.mod \
-		$DESTDIR/share/xml/docbook/xml-dtd-4.5
+		$DESTDIR/share/xml/docbook/xml-dtd-$PKGVER
 	printf "  MKCAT\t%s\n" "/etc/xml"
 	./mkcat.sh $DESTDIR/etc/xml /etc/xml
 
diff --git a/docbook-xsl-nons/config.mk b/docbook-xsl-nons/config.mk
@@ -1,3 +1,4 @@
+PKGBASE=	docbook-xsl-nons
 PKGVER=		1.79.2
 PREFIX=		/
 SRCTARBALLS=	https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F1.79.2/docbook-xsl-nons-1.79.2.zip
diff --git a/docbook-xsl-nons/mkfile b/docbook-xsl-nons/mkfile
@@ -8,7 +8,6 @@ SRC=		VERSION assembly common eclipse epub epub3 extensions fo \
 		profiling roundtrip slides template tests tools webhelp \
 		website xhtml xhtml-1_1 xhtml5
 NOBINDDIRS=	1
-PKGBASE=	docbook-xsl-nons
 PKG=		$PKGBASE-$PKGVER
 XMLDIRBASE=	/share/xml/docbook/xsl-stylesheets-nons-$PKGVER
 XMLDIR=		$DESTDIR/$XMLDIRBASE
diff --git a/galeb-howtos/config.mk b/galeb-howtos/config.mk
@@ -1,5 +1,6 @@
+PKGBASE=	galeb-howtos
 DOCS=		LICENSE `{ find . -name '*.howto' }
-FALLBACKVER=	0.1
+PKGVER=		0.1
 LEGALFILES=	LICENSE
 PREFIX=		/
 SRCREPOS=	https://git.sr.ht/~strahinja/galeb-howtos
diff --git a/galeb-howtos/mkfile b/galeb-howtos/mkfile
@@ -3,9 +3,8 @@ mkpklib=/lib/mkpk
 <config.mk
 <$mkpklib/derivatives.mk
 
-PKGBASE=	galeb-howtos
 PKG=		`{ if [ -z "$version" ]; then \
-		   	echo $PKGBASE-$FALLBACKVER; \
+		   	echo $PKGBASE-$PKGVER; \
 		   else \
 			echo $PKGBASE-$version; \
 		   fi}
diff --git a/linux-headers/config.mk b/linux-headers/config.mk
@@ -1,6 +1,8 @@
+PKGBASE=	linux-headers
+PKGVER=		5.17.13
 LEGALFILES=	COPYING
 PREFIX=		/
-SRCTARBALLS=	https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.13.tar.xz
+SRCTARBALLS=	https://www.kernel.org/pub/linux/kernel/v5.x/linux-$PKGVER.tar.xz
 SHA512SUMS=	ea54a3cbf874bc9fa0974327082ceb4c54f9f044d90a2c4c75f57691328815d19c082a776da4ea40f66e3f18e83c2f7f3d6e479dca1b4eb195b88f59e0426858
-SRCDIRS=	linux-5.17.13
-SRCTODIRS=	linux-headers-5.17.13
+SRCDIRS=	linux-$PKGVER
+SRCTODIRS=	linux-headers-$PKGVER
diff --git a/linux-headers/mkfile b/linux-headers/mkfile
@@ -3,9 +3,7 @@ mkpklib=/lib/mkpk
 <config.mk
 <$mkpklib/derivatives.mk
 
-version=	5.17.13
-PKGBASE=	linux-headers
-PKG=		$PKGBASE-$version
+PKG=		$PKGBASE-$PKGVER
 
 install_sources=$install_sources install-legal install-headers
 
diff --git a/mkpk/mkfile b/mkpk/mkfile
@@ -2,9 +2,8 @@
 <mkpk-config.mk
 <$mkpklib/derivatives.mk
 
-PKGBASE=	mkpk
 PKG=		`{ if [ -z "$version" ]; then \
-		   	echo $PKGBASE-$FALLBACKVER; \
+		   	echo $PKGBASE-$PKGVER; \
 		   else \
 		   	echo $PKGBASE-$version; \
 		   fi }
diff --git a/mkpk/mkpk-config.mk b/mkpk/mkpk-config.mk
@@ -1,6 +1,7 @@
-FALLBACKVER=0.1.4
-PREFIX=/
-BINDIR=$DESTDIR/bin
-LIBDIR=$DESTDIR/lib/mkpk
-GZARGS=-9kf
-SRCREPOS=https://git.sr.ht/~strahinja/mkpk
+PKGBASE=	mkpk
+PKGVER=		0.1.4
+PREFIX=		/
+BINDIR=		$DESTDIR/bin
+LIBDIR=		$DESTDIR/lib/mkpk
+GZARGS=		-9kf
+SRCREPOS=	https://git.sr.ht/~strahinja/mkpk
diff --git a/noice/config.mk b/noice/config.mk
@@ -1,6 +1,7 @@
+PKGBASE=	noice
 BIN=		noice nopen
 DOCS=		README
-FALLBACKVER=	0.8
+PKGVER=		0.8
 LDFLAGS=	$LDFLAGS -fcommon -zmuldefs
 LEGALFILES=	LICENSE
 LIBS=		-lcurses -lterminfo
diff --git a/noice/mkfile b/noice/mkfile
@@ -4,9 +4,8 @@ mkpklib=/lib/mkpk
 <config.mk
 <$mkpklib/derivatives.mk
 
-PKGBASE=	noice
 PKG=		`{ if [ -z "$version" ]; then \
-		   	echo $PKGBASE-$FALLBACKVER; \
+		   	echo $PKGBASE-$PKGVER; \
 		   else \
 			echo $PKGBASE-$version; \
 		   fi}
diff --git a/sacc/mkfile b/sacc/mkfile
@@ -5,7 +5,7 @@ mkpklib=/lib/mkpk
 <$mkpklib/derivatives.mk
 
 GETVER=		`{ $GIT rev-parse --is-inside-work-tree >/dev/null 2>&1 \
-			&& $GIT describe --tags || echo $DEFVERSION }
+			&& $GIT describe --tags || echo $PKGVER }
 
 PKG=		$PKGBASE-$GETVER
 OBJ=		${SRC:%.c=%.o}
diff --git a/sacc/mkpk-config.mk b/sacc/mkpk-config.mk
@@ -1,6 +1,6 @@
 BIN=		sacc
 CFLAGS=		$CFLAGS -DUSE_TLS
-DEFVERSION=	1.06
+PKGVER=		1.06
 LDFLAGS=	$LDFLAGS -zmuldefs
 LIBS=		-lcurses -ltermcap -ltls
 LEGALFILES=	LICENSE
diff --git a/sled/config.mk b/sled/config.mk
@@ -1,7 +1,8 @@
+PKGBASE=	sled
 BIN=		sled
 DATEARGS=	"+%d %b %Y"
 DOCS=		README HACKING
-FALLBACKVER=	0.10.8
+PKGVER=		0.10.8
 GZARGS=		-9ckf
 LEGALFILES=	LICENSE LICENSE.termbox
 MAN1U=		sled.1
diff --git a/sled/mkfile b/sled/mkfile
@@ -6,9 +6,8 @@ mkpklib=/lib/mkpk
 
 date=		`{$DATE "$DATEARGS"}
 version=	`{$GIT describe 2>/dev/null | $SED 's,^v,,'}
-PKGBASE=	sled
 PKG=		`{ if [ -z "$version" ]; then \
-		   	echo $PKGBASE-$FALLBACKVER; \
+		   	echo $PKGBASE-$PKGVER; \
 		   else \
 			echo $PKGBASE-$version; \
 		   fi}
diff --git a/table/config.mk b/table/config.mk
@@ -1,7 +1,8 @@
+PKGBASE=	table
 BIN=		table
 DATEARGS=	"+%d %b %Y"
 DOCS=		README THANKS
-FALLBACKVER=	0.6.4
+PKGVER=		0.6.4
 GZARGS=		-9ckf
 LEGALFILES=	LICENSE
 MAN1U=		table.1
diff --git a/table/mkfile b/table/mkfile
@@ -6,9 +6,8 @@ mkpklib=/lib/mkpk
 
 date=		`{$DATE "$DATEARGS"}
 version=	`{$GIT describe 2>/dev/null | $SED 's,^v,,'}
-PKGBASE=	table
 PKG=		`{ if [ -z "$version" ]; then \
-		   	echo $PKGBASE-$FALLBACKVER; \
+		   	echo $PKGBASE-$PKGVER; \
 		   else \
 			echo $PKGBASE-$version; \
 		   fi}
diff --git a/unzip/config.mk b/unzip/config.mk
@@ -1,3 +1,4 @@
+PKGBASE=	unzip
 PKGVER=		6.0
 LEGALFILES=	LICENSE
 PREFIX=		/
diff --git a/unzip/mkfile b/unzip/mkfile
@@ -3,7 +3,6 @@ mkpklib=/lib/mkpk
 <config.mk
 <$mkpklib/derivatives.mk
 
-PKGBASE=	unzip
 PKG=		$PKGBASE-$PKGVER	
 CFLAGS=		-D_FILE_OFFSET_BITS=64 -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT \
 		-DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE \
diff --git a/xmlto/config.mk b/xmlto/config.mk
@@ -1,3 +1,4 @@
+PKGBASE=	xmlto
 PKGVER=		0.0.28
 PREFIX=		/
 SRCTARBALLS=	https://releases.pagure.org/xmlto/xmlto-$PKGVER.tar.gz
diff --git a/xmlto/mkfile b/xmlto/mkfile
@@ -3,7 +3,6 @@ mkpklib=/lib/mkpk
 <config.mk
 <$mkpklib/derivatives.mk
 
-PKGBASE=	xmlto
 PKG=		$PKGBASE-$PKGVER
 MANDIR=		/share/man