pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/59582: devel/asl and devel/asl-doc should use Makefile.common



>Number:         59582
>Category:       pkg
>Synopsis:       devel/asl and devel/asl-doc should use Makefile.common
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Aug 10 02:30:00 +0000 2025
>Originator:     Izumi Tsutsui
>Release:        NetBSD 10.1 + pkgsrc-current
>Organization:
>Environment:
System: NetBSD mirage 10.1 NetBSD 10.1 (GENERIC) #0: Mon Dec 16 13:08:11 UTC 2024 mkrepro%mkrepro.NetBSD.org@localhost:/usr/src/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
pkgsrc/devel/asl and pkgsrc/devel/asl-doc have duplicated
definitions, especially DISTNAME including asl-current version
that should be sync'ed.

>How-To-Repeat:
Code inspection.

>Fix:
diff --git a/devel/asl-doc/Makefile b/devel/asl-doc/Makefile
index 9af13f03e2ac..f3ac03ff6a65 100644
--- a/devel/asl-doc/Makefile
+++ b/devel/asl-doc/Makefile
@@ -1,23 +1,16 @@
 # $NetBSD: Makefile,v 1.1 2025/07/05 12:12:14 hauke Exp $
 
-DISTNAME=	asl-current-142-bld290
-PKGNAME=	asl-doc-1.42.290
-CATEGORIES=	devel
-MASTER_SITES=	http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/
+.include "../../devel/asl/Makefile.common"
+
+PKGNAME=	asl-doc-${ASL_VER}
 
 MAINTAINER=	hauke%NetBSD.org@localhost
-HOMEPAGE=	http://john.ccac.rwth-aachen.de:8000/as
 COMMENT=	Portable macro cross assembler documentation
-LICENSE=	gnu-gpl-v2
-
-WRKSRC=		${WRKDIR}/asl-current
 
 # The docs build is entangled with making some objects, which we end
 # up not using
 USE_LANGUAGES=	c
 
-USE_TOOLS=	gmake
-
 DEPENDS+=	tex-latex-[0-9]*:../../print/tex-latex
 DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 DEPENDS+=	tex-pdftex-[0-9]*:../../print/tex-pdftex
@@ -31,8 +24,4 @@ DOCDIR=		share/doc/asl
 
 INSTALLATION_DIRS+=	${DOCDIR}
 
-pre-configure:
-	${CP} ${FILESDIR}/Makefile.def.pkgsrc ${WRKSRC}/Makefile.def
-	mkdir ${WRKSRC}/objects
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/asl/Makefile b/devel/asl/Makefile
index 8a5e803e7bb7..ab5164435909 100644
--- a/devel/asl/Makefile
+++ b/devel/asl/Makefile
@@ -1,25 +1,14 @@
 # $NetBSD: Makefile,v 1.1 2025/07/05 12:12:13 hauke Exp $
 
-DISTNAME=	asl-current-142-bld290
-PKGNAME=	asl-1.42.290
-CATEGORIES=	devel
-MASTER_SITES=	http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/
+.include "Makefile.common"
+
+PKGNAME=	asl-${ASL_VER}
 
 MAINTAINER=	hauke%NetBSD.org@localhost
-HOMEPAGE=	http://john.ccac.rwth-aachen.de:8000/as
 COMMENT=	Portable macro cross assembler for a variety of microprocessors
-LICENSE=	gnu-gpl-v2
-
-WRKSRC=		${WRKDIR}/asl-current
 
 USE_LANGUAGES=	c
 
-USE_TOOLS=	gmake
-
 INSTALLATION_DIRS+=	bin lib include/asl ${PKGMANDIR}/man1
 
-pre-configure:
-	${CP} ${FILESDIR}/Makefile.def.pkgsrc ${WRKSRC}/Makefile.def
-	mkdir ${WRKSRC}/objects
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/asl/Makefile.common b/devel/asl/Makefile.common
new file mode 100644
index 000000000000..740b3d46a25d
--- /dev/null
+++ b/devel/asl/Makefile.common
@@ -0,0 +1,21 @@
+# $NetBSD$
+# used by devel/asl/Makefile
+# used by devel/asl-doc/Makefile
+
+DISTNAME=	asl-current-142-bld290
+ASL_VER=	${DISTNAME:S/asl-current-//:S/-bld/./}
+CATEGORIES=	devel
+MASTER_SITES=	http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/
+
+HOMEPAGE=	http://john.ccac.rwth-aachen.de:8000/as
+LICENSE=	gnu-gpl-v2
+
+WRKSRC=		${WRKDIR}/asl-current
+
+FILESDIR=	${.CURDIR}/../../devel/asl/files
+
+USE_TOOLS=	gmake
+
+pre-configure:
+	${CP} ${FILESDIR}/Makefile.def.pkgsrc ${WRKSRC}/Makefile.def
+	mkdir ${WRKSRC}/objects



Home | Main Index | Thread Index | Old Index