diff options
author | jlam <jlam@pkgsrc.org> | 2002-08-26 19:38:05 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2002-08-26 19:38:05 +0000 |
commit | beaaa4d9a4565ba9aa15f4a8fbe317191ac216a5 (patch) | |
tree | 317cbf27d478b8fad12edd846176df917ee51061 | |
parent | 19b0b8e12ae85798a6a3e4fada663fcdc8aa162c (diff) | |
download | pkgsrc-beaaa4d9a4565ba9aa15f4a8fbe317191ac216a5.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.
-rw-r--r-- | graphics/aalib-x11/Makefile | 46 | ||||
-rw-r--r-- | graphics/aalib-x11/PLIST | 91 | ||||
-rw-r--r-- | graphics/aalib-x11/buildlink.mk | 47 | ||||
-rw-r--r-- | graphics/aalib-x11/buildlink2.mk | 14 | ||||
-rw-r--r-- | graphics/aalib-x11/distinfo | 5 | ||||
-rw-r--r-- | graphics/aalib-x11/patches/patch-aa | 15 | ||||
-rw-r--r-- | graphics/aalib/Makefile | 30 | ||||
-rw-r--r-- | graphics/aalib/Makefile.common | 30 |
8 files changed, 76 insertions, 202 deletions
diff --git a/graphics/aalib-x11/Makefile b/graphics/aalib-x11/Makefile index 7546362ef16..80062ac0560 100644 --- a/graphics/aalib-x11/Makefile +++ b/graphics/aalib-x11/Makefile @@ -1,31 +1,33 @@ -# $NetBSD: Makefile,v 1.2 2002/03/25 14:45:25 cjep Exp $ -# +# $NetBSD: Makefile,v 1.3 2002/08/26 19:38:05 jlam Exp $ -DISTNAME= aalib-1.4rc4 -PKGNAME= aalib-x11-1.4.0.4 -CATEGORIES= graphics x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aa-project/} +PKGNAME= aalib-x11-${BASE_VERS} +CATEGORIES+= x11 +PKGREVISION= 1 -MAINTAINER= manu@netbsd.org -HOMEPAGE= http://aa-project.sourceforge.net/aalib/ COMMENT= ASCII Art library with X11 support -CONFLICTS+= aalib-[0-9]* +USE_BUILDLINK2= # defined +USE_X11= # defined -WRKSRC= ${WRKDIR}/aalib-1.4.0 -GNU_CONFIGURE= YES -USE_LIBTOOL= yes -USE_BUILDLINK_ONLY= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +ALL_TARGET= libaa-x11.la +INSTALL_TARGET= install-libLTLIBRARIES -.if (${MACHINE_ARCH} == arm32) - GCC_VERSION!= gcc --version +post-patch: + for file in ${WRKSRC}/src/Makefile.in; do \ + ${SED} -e "s,libaa\.la,libaa-x11.la,g" \ + -e "s,libaa_la,libaa_x11_la,g" \ + $${file} > $${file}.fixed; \ + ${MV} -f $${file}.fixed $${file}; \ + done -. if (${GCC_VERSION:C/-.*$$//} == egcs) -. include "../../lang/gcc/Makefile.gcc" -. endif +do-build: + cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} \ + ${MAKE_PROGRAM} -f ${MAKEFILE} ${ALL_TARGET} -.endif +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/aalib-config ${PREFIX}/bin/aalib-x11-config + ${INSTALL_DATA} ${WRKSRC}/src/aalib.h ${PREFIX}/include/aalib-x11.h + cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} \ + ${MAKE_PROGRAM} -f ${MAKEFILE} ${INSTALL_TARGET} -.include "../../mk/x11.buildlink.mk" -.include "../../mk/bsd.pkg.mk" +.include "../../graphics/aalib/Makefile.common" diff --git a/graphics/aalib-x11/PLIST b/graphics/aalib-x11/PLIST index 97d680f847c..1c88b99add7 100644 --- a/graphics/aalib-x11/PLIST +++ b/graphics/aalib-x11/PLIST @@ -1,83 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/30 11:31:42 agc Exp $ -bin/aafire -bin/aainfo -bin/aalib-config -bin/aasavefont -bin/aatest -include/aalib.h -@unexec install-info --delete --info-dir=%D/info %D/info/aalib.info -info/aalib.info -info/aalib.info-1 -info/aalib.info-2 -info/aalib.info-3 -@exec install-info --info-dir=%D/info %D/info/aalib.info -lib/libaa.a -lib/libaa.la -lib/libaa.so -lib/libaa.so.1 -lib/libaa.so.1.4 -man/man1/aafire.1 -man/man3/aa_attrs.3 -man/man3/aa_autoinit.3 -man/man3/aa_autoinitkbd.3 -man/man3/aa_autoinitmouse.3 -man/man3/aa_close.3 -man/man3/aa_createedit.3 -man/man3/aa_currentfont.3 -man/man3/aa_defparams.3 -man/man3/aa_defrenderparams.3 -man/man3/aa_displayrecommended.3 -man/man3/aa_dithernames.3 -man/man3/aa_drivers.3 -man/man3/aa_edit.3 -man/man3/aa_editkey.3 -man/man3/aa_fastrender.3 -man/man3/aa_fonts.3 -man/man3/aa_formats.3 -man/man3/aa_getevent.3 -man/man3/aa_getkey.3 -man/man3/aa_getmouse.3 -man/man3/aa_gotoxy.3 -man/man3/aa_help.3 -man/man3/aa_hidecursor.3 -man/man3/aa_hidemouse.3 -man/man3/aa_image.3 -man/man3/aa_imgheight.3 -man/man3/aa_imgwidth.3 -man/man3/aa_init.3 -man/man3/aa_initkbd.3 -man/man3/aa_initmouse.3 -man/man3/aa_kbddrivers.3 -man/man3/aa_kbdrecommended.3 -man/man3/aa_mmheight.3 -man/man3/aa_mmwidth.3 -man/man3/aa_mousedrivers.3 -man/man3/aa_mouserecommended.3 -man/man3/aa_parseoptions.3 -man/man3/aa_printf.3 -man/man3/aa_putpixel.3 -man/man3/aa_puts.3 -man/man3/aa_recommendhi.3 -man/man3/aa_recommendhidisplay.3 -man/man3/aa_recommendhikbd.3 -man/man3/aa_recommendhimouse.3 -man/man3/aa_recommendlow.3 -man/man3/aa_recommendlowdisplay.3 -man/man3/aa_recommendlowkbd.3 -man/man3/aa_recommendlowmouse.3 -man/man3/aa_registerfont.3 -man/man3/aa_render.3 -man/man3/aa_resize.3 -man/man3/aa_resizehandler.3 -man/man3/aa_scrheight.3 -man/man3/aa_scrwidth.3 -man/man3/aa_setfont.3 -man/man3/aa_setsupported.3 -man/man3/aa_showcursor.3 -man/man3/aa_showmouse.3 -man/man3/aa_text.3 -man/man3/aa_uninitkbd.3 -man/man3/aa_uninitmouse.3 -man/man3/mem_d.3 -man/man3/save_d.3 -share/aclocal/aalib.m4 +@comment $NetBSD: PLIST,v 1.2 2002/08/26 19:38:05 jlam Exp $ +bin/aalib-x11-config +include/aalib-x11.h +lib/libaa-x11.a +lib/libaa-x11.la +lib/libaa-x11.so +lib/libaa-x11.so.1 +lib/libaa-x11.so.1.4 diff --git a/graphics/aalib-x11/buildlink.mk b/graphics/aalib-x11/buildlink.mk deleted file mode 100644 index 91392beb5fc..00000000000 --- a/graphics/aalib-x11/buildlink.mk +++ /dev/null @@ -1,47 +0,0 @@ -# $NetBSD: buildlink.mk,v 1.1.1.1 2002/01/30 11:31:42 agc Exp $ -# -# This Makefile fragment is included by packages that use aalib-x11. -# -# To use this Makefile fragment, simply: -# -# (1) Optionally define BUILDLINK_DEPENDS.aalib-x11 to the dependency pattern -# for the version of aalib-x11 desired. -# (2) Include this Makefile fragment in the package Makefile, -# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header -# search path, and -# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search -# path. - -.if !defined(AALIB-X11_BUILDLINK_MK) -aalib-x11_BUILDLINK_MK= # defined - -.include "../../mk/bsd.buildlink.mk" - -BUILDLINK_DEPENDS.aalib-x11?= aalib-x11>=1.4.0.4 -DEPENDS+= ${BUILDLINK_DEPENDS.aalib-x11}:../../graphics/aalib-x11 - -EVAL_PREFIX+= BUILDLINK_PREFIX.aalib-x11=aalib-x11 -BUILDLINK_PREFIX.aalib-x11_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.aalib-x11= include/aalib.h -BUILDLINK_FILES.aalib-x11+= lib/libaa.* - -BUILDLINK_TARGETS.aalib-x11= aalib-x11-buildlink -BUILDLINK_TARGETS.aalib-x11+= aalib-x11-buildlink-config-wrapper -BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.aalib-x11} - -BUILDLINK_CONFIG.aalib-x11= ${BUILDLINK_PREFIX.aalib-x11}/bin/aalib-config -BUILDLINK_CONFIG_WRAPPER.aalib-x11= ${BUILDLINK_DIR}/bin/aalib-config -REPLACE_BUILDLINK_SED+= \ - -e "s|${BUILDLINK_CONFIG_WRAPPER.aalib-x11}|${BUILDLINK_CONFIG.aalib-x11}|g" - -.if defined(USE_CONFIG_WRAPPER) -AALIB-X11_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.aalib-x11} -CONFIGURE_ENV+= AALIB-X11_CONFIG="${AALIB-X11_CONFIG}" -MAKE_ENV+= AALIB-X11_CONFIG="${AALIB-X11_CONFIG}" -.endif - -pre-configure: ${BUILDLINK_TARGETS.aalib-x11} -aalib-x11-buildlink: _BUILDLINK_USE -aalib-x11-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE - -.endif # aalib-x11_BUILDLINK_MK diff --git a/graphics/aalib-x11/buildlink2.mk b/graphics/aalib-x11/buildlink2.mk index 223f28b3c79..c018f374915 100644 --- a/graphics/aalib-x11/buildlink2.mk +++ b/graphics/aalib-x11/buildlink2.mk @@ -1,16 +1,22 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:45 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2002/08/26 19:38:06 jlam Exp $ .if !defined(AALIB_X11_BUILDLINK2_MK) AALIB_X11_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= aalib-x11 -BUILDLINK_DEPENDS.aalib-x11?= aalib-x11>=1.4.0.4 +BUILDLINK_DEPENDS.aalib-x11?= aalib-x11>=1.4.0.4nb1 BUILDLINK_PKGSRCDIR.aalib-x11?= ../../graphics/aalib-x11 EVAL_PREFIX+= BUILDLINK_PREFIX.aalib-x11=aalib-x11 BUILDLINK_PREFIX.aalib-x11_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.aalib-x11= include/aalib.h -BUILDLINK_FILES.aalib-x11+= lib/libaa.* +BUILDLINK_FILES.aalib-x11= include/aalib-x11.h +BUILDLINK_FILES.aalib-x11+= lib/libaa-x11.* +BUILDLINK_TRANSFORM.aalib-x11+= -e "s|/aalib-x11.h|/aalib.h|g" +BUILDLINK_TRANSFORM+= l:aa:aa-x11 + +AALIB_CONFIG= ${BUILDLINK_PREFIX.aalib-x11}/bin/aalib-x11-config +CONFIGURE_ENV+= AALIB_CONFIG="${AALIB_CONFIG}" +MAKE_ENV+= AALIB_CONFIG="${AALIB_CONFIG}" BUILDLINK_TARGETS+= aalib-x11-buildlink diff --git a/graphics/aalib-x11/distinfo b/graphics/aalib-x11/distinfo deleted file mode 100644 index e42f6c083f2..00000000000 --- a/graphics/aalib-x11/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/01/30 11:31:42 agc Exp $ - -SHA1 (aalib-1.4rc4.tar.gz) = a11c16b258bf9b64b135858afabc7f3a45222a4a -Size (aalib-1.4rc4.tar.gz) = 390812 bytes -SHA1 (patch-aa) = 927d69a8f499b99f0bd5f13cf220ce8cbb7ea591 diff --git a/graphics/aalib-x11/patches/patch-aa b/graphics/aalib-x11/patches/patch-aa deleted file mode 100644 index 9141e704100..00000000000 --- a/graphics/aalib-x11/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/01/30 11:31:42 agc Exp $ - ---- src/aacurses.c.orig Thu Aug 23 14:55:25 2001 -+++ src/aacurses.c Thu Aug 23 14:56:16 2001 -@@ -71,8 +71,8 @@ - { - if (__resized_curses) - curses_uninit(c), curses_init(&c->params, NULL,&c->driverparams, NULL), __resized_curses = 0; -- *width = stdscr->_maxx + 1; -- *height = stdscr->_maxy + 1; -+ *width = getmaxx(stdscr) + 1; -+ *height = getmaxy(stdscr) + 1; - #ifdef GPM_MOUSEDRIVER - gpm_mx = *width; - gpm_my = *height; 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" |