CVS commit: pkgsrc/devel

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Tue Aug 12 16:25:41 UTC 2025

Modified Files:
        pkgsrc/devel/asl: Makefile
        pkgsrc/devel/asl-doc: Makefile
Added Files:
        pkgsrc/devel/asl: Makefile.common
Removed Files:
        pkgsrc/devel/asl-doc/files: Makefile.def.pkgsrc

Log Message:
Use a common Makefile for devel/asl and devel/asl-doc..

Should satisfy PR pkg/59582


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/asl/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/asl/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/asl-doc/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/asl-doc/files/Makefile.def.pkgsrc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/asl/Makefile
diff -u pkgsrc/devel/asl/Makefile:1.1 pkgsrc/devel/asl/Makefile:1.2
--- pkgsrc/devel/asl/Makefile:1.1       Sat Jul  5 12:12:13 2025
+++ pkgsrc/devel/asl/Makefile   Tue Aug 12 16:25:41 2025
@@ -1,25 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2025/07/05 12:12:13 hauke Exp $
+# $NetBSD: Makefile,v 1.2 2025/08/12 16:25:41 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/
-
-MAINTAINER=    hauke%NetBSD.org@localhost
-HOMEPAGE=      http://john.ccac.rwth-aachen.de:8000/as
+PKGNAME=       asl-${PKGVER}
 COMMENT=       Portable macro cross assembler for a variety of microprocessors
-LICENSE=       gnu-gpl-v2
-
-WRKSRC=                ${WRKDIR}/asl-current
 
-USE_LANGUAGES= c
-
-USE_TOOLS=     gmake
+.include "../../devel/asl/Makefile.common"
 
 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"

Index: pkgsrc/devel/asl-doc/Makefile
diff -u pkgsrc/devel/asl-doc/Makefile:1.1 pkgsrc/devel/asl-doc/Makefile:1.2
--- pkgsrc/devel/asl-doc/Makefile:1.1   Sat Jul  5 12:12:14 2025
+++ pkgsrc/devel/asl-doc/Makefile       Tue Aug 12 16:25:41 2025
@@ -1,22 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2025/07/05 12:12:14 hauke Exp $
+# $NetBSD: Makefile,v 1.2 2025/08/12 16:25:41 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/
-
-MAINTAINER=    hauke%NetBSD.org@localhost
-HOMEPAGE=      http://john.ccac.rwth-aachen.de:8000/as
+PKGNAME=       asl-doc-${PKGVER}
 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
@@ -31,8 +16,6 @@ DOCDIR=               share/doc/asl
 
 INSTALLATION_DIRS+=    ${DOCDIR}
 
-pre-configure:
-       ${CP} ${FILESDIR}/Makefile.def.pkgsrc ${WRKSRC}/Makefile.def
-       mkdir ${WRKSRC}/objects
+.include "../../devel/asl/Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/devel/asl/Makefile.common
diff -u /dev/null pkgsrc/devel/asl/Makefile.common:1.1
--- /dev/null   Tue Aug 12 16:25:41 2025
+++ pkgsrc/devel/asl/Makefile.common    Tue Aug 12 16:25:41 2025
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile.common,v 1.1 2025/08/12 16:25:41 hauke Exp $
+#
+# used by devel/asl/Makefile
+# used by devel/asl-doc/Makefile
+
+DISTNAME=      asl-current-142-bld290
+PKGVER=                1.42.290
+CATEGORIES=    devel
+MASTER_SITES=  ftp://john.ccac.rwth-aachen.de/pub/as/source/c_version/
+MASTER_SITES+= http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/
+
+MAINTAINER=    hauke%NetBSD.org@localhost
+HOMEPAGE=      http://john.ccac.rwth-aachen.de:8000/as
+LICENSE=       gnu-gpl-v2
+
+FILESDIR=      ${.CURDIR}/../../devel/asl/files
+
+WRKSRC=                ${WRKDIR}/asl-current
+
+USE_LANGUAGES= c
+
+USE_TOOLS=     gmake
+
+pre-configure:
+       ${CP} ${FILESDIR}/Makefile.def.pkgsrc ${WRKSRC}/Makefile.def
+       mkdir ${WRKSRC}/objects