diff options
| author | jlam <jlam> | 2002-08-26 19:38:05 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-26 19:38:05 +0000 |
| commit | b11dec93a677a741be3af8cb3b71722b11e00ff1 (patch) | |
| tree | 317cbf27d478b8fad12edd846176df917ee51061 /graphics/aalib | |
| parent | 5e628f916030475af402ff6c6b9031e1524eca56 (diff) | |
| download | pkgsrc-b11dec93a677a741be3af8cb3b71722b11e00ff1.tar.gz | |
Share common pkgsrc bits between the aalib and aalib-x11 packages. Shrink
the aalib-x11 package to installing just the libraries and headers and to
install them with new names so that aalib-x11 and aalib no longer conflict.
Also, remove the aalib-x11/buildlink.mk file as it will be no longer used.
This solves part of pkg/16354.
Diffstat (limited to 'graphics/aalib')
| -rw-r--r-- | graphics/aalib/Makefile | 30 | ||||
| -rw-r--r-- | graphics/aalib/Makefile.common | 30 |
2 files changed, 34 insertions, 26 deletions
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile index 0d4106320fd..4768ab754a1 100644 --- a/graphics/aalib/Makefile +++ b/graphics/aalib/Makefile @@ -1,34 +1,12 @@ -# $NetBSD: Makefile,v 1.8 2002/08/26 06:59:47 jlam Exp $ -# +# $NetBSD: Makefile,v 1.9 2002/08/26 19:38:05 jlam Exp $ -DISTNAME= aalib-1.4rc4 -PKGNAME= aalib-1.4.0.4 +PKGNAME= aalib-${BASE_VERS} PKGREVISION= 1 -CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aa-project/} +CONFLICTS+= aalib-x11<=1.4.0.4 -MAINTAINER= manu@netbsd.org -HOMEPAGE= http://aa-project.sourceforge.net/aalib/ COMMENT= ASCII Art library -CONFLICTS+= aalib-x11<=1.4.0.4 - -WRKSRC= ${WRKDIR}/aalib-1.4.0 USE_BUILDLINK2= YES -GNU_CONFIGURE= YES -USE_LIBTOOL= YES -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig - CONFIGURE_ARGS+= --with-x11-driver=no -.if (${MACHINE_ARCH} == arm32) - GCC_VERSION!= gcc --version - -. if (${GCC_VERSION:C/-.*$$//} == egcs) -. include "../../lang/gcc/Makefile.gcc" -. endif - -.endif - -.include "../../mk/texinfo.mk" -.include "../../mk/bsd.pkg.mk" +.include "Makefile.common" diff --git a/graphics/aalib/Makefile.common b/graphics/aalib/Makefile.common new file mode 100644 index 00000000000..a3097784201 --- /dev/null +++ b/graphics/aalib/Makefile.common @@ -0,0 +1,30 @@ +# $NetBSD: Makefile.common,v 1.1 2002/08/26 19:38:05 jlam Exp $ + +DISTNAME= aalib-${DIST_VERS} +CATEGORIES+= graphics +MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=aa-project/} + +DIST_VERS= 1.4rc4 +BASE_VERS= 1.4.0.4 + +MAINTAINER?= manu@netbsd.org +HOMEPAGE= http://aa-project.sourceforge.net/aalib/ + +DISTINFO_FILE= ${.CURDIR}/../../graphics/aalib/distinfo +PATCHDIR= ${.CURDIR}/../../graphics/aalib/patches + +WRKSRC= ${WRKDIR}/aalib-1.4.0 + +GNU_CONFIGURE= YES +USE_LIBTOOL= YES +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig + +.if (${MACHINE_ARCH} == arm32) +GCC_VERSION!= gcc --version +. if (${GCC_VERSION:C/-.*$$//} == egcs) +. include "../../lang/gcc/Makefile.gcc" +. endif +.endif + +.include "../../mk/texinfo.mk" +.include "../../mk/bsd.pkg.mk" |