Date: Tue, 02 Jul 2013 15:18:33 +0200 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@freebsd.org Cc: jpaetzel@FreeBSD.org Subject: ports/180199: [PATCH] devel/allegro: Cleanup Makefile, diverse fix Message-ID: <20130702131838.07678A70@hub.freebsd.org> Resent-Message-ID: <201307021320.r62DK3cx021770@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180199 >Category: ports >Synopsis: [PATCH] devel/allegro: Cleanup Makefile, diverse fix >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jul 02 13:20:02 UTC 2013 >Closed-Date: >Last-Modified: >Originator: nemysis >Release: FreeBSD 9.1-RELEASE-p8 amd64 >Organization: >Environment: System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p8 FreeBSD 9.1-RELEASE-p8 #0: Tue Jun 18 15:25:28 UTC 2013 >Description: - Remove leading article from COMMENT - Add DOCS EXAMPLES Option - Trim docs and examples - Trim DEVEL Option - Trim typo MESOUNS --> MESOUND - Correctly use MDOCS and MEXAMPLES - Trim pkg-plist, remove docs and examples - Make portlint happy - Cleanup Makefile Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports) >How-To-Repeat: Build logs Original Port https://redports.org/buildarchive/20130702121100-32334/ Changed Port https://redports.org/buildarchive/20130702115001-58762/ https://redports.org/buildarchive/20130702123201-50159/ Should be added that not works on i386? Some users report that the port does not compile on i386. >Fix: --- allegro-4.2.2_3.patch begins here --- diff -ruN /usr/ports/devel/allegro/Makefile ./Makefile --- /usr/ports/devel/allegro/Makefile 2013-06-02 18:59:52.000000000 +0200 +++ ./Makefile 2013-07-02 13:39:38.000000000 +0200 @@ -8,7 +8,7 @@ MASTER_SITES= SF/alleg/${PORTNAME}/${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= A cross-platform library for games and multimedia programming +COMMENT= Cross-platform library for games and multimedia programming USE_AUTOTOOLS= autoconf USE_GCC= any @@ -17,7 +17,7 @@ USE_LDCONFIG= yes WANT_GNOME= yes -OPTIONS_DEFINE= ARTS DEBUG DEVEL ESOUND JACK OPTIMIZED_CFLAGS PROFILE THREADS +OPTIONS_DEFINE= DOCS EXAMPLES ARTS DEBUG DEVEL ESOUND JACK OPTIMIZED_CFLAGS PROFILE THREADS OPTIONS_DEFAULT= DEVEL OPTIMIZED_CFLAGS THREADS DEVEL_DESC= Install development utilities @@ -25,9 +25,8 @@ ALL_TARGET= full-build MAKE_JOBS_UNSAFE= yes -.include "Makefile.man" - -INFO= allegro +PORTDOCS= * +PORTEXAMPLES= * CONFLICTS= allegro-devel-[0-9]* PLIST_SUB= SHLIB_VER="${SHLIB_VER}" @@ -38,7 +37,13 @@ # Restrict to stable (even) versions, indicated by the second component. PORTSCOUT= limitw:1,even -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} +.include "Makefile.man" +INFO= allegro +INSTALL_TARGET+= install-man +.endif .if ${PORT_OPTIONS:MARTS} LIB_DEPENDS+= artsc:${PORTSDIR}/audio/arts @@ -58,14 +63,14 @@ .endif .if ${PORT_OPTIONS:MDEVEL} -INSTALL_TARGET= full-install install-man install-info +INSTALL_TARGET+= full-install PLIST_SUB+= DEVEL="" .else -INSTALL_TARGET= mini-install install-man install-info +INSTALL_TARGET+= mini-install PLIST_SUB+= DEVEL="@comment " .endif -.if ${PORT_OPTIONS:MESOUNS} +.if ${PORT_OPTIONS:MESOUND} USE_GNOME+= esound CONFIGURE_ARGS+=--enable-esddigi PLIST_SUB+= ESOUND="" @@ -123,13 +128,14 @@ .endif post-install: -# Documentation. .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/html/*.html ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/html/*.css ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/info/allegro.info ${PREFIX}/info +.endif -# Examples. +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} ${INSTALL_PROGRAM} ${WRKSRC}/demo/demo ${EXAMPLESDIR} . for f in ${DEMO} @@ -137,4 +143,4 @@ . endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -ruN /usr/ports/devel/allegro/pkg-plist ./pkg-plist --- /usr/ports/devel/allegro/pkg-plist 2013-06-02 18:59:52.000000000 +0200 +++ ./pkg-plist 2013-07-02 12:45:30.000000000 +0200 @@ -111,85 +111,6 @@ %%PROFILE%%lib/liballp.so.%%SHLIB_VER%% %%PROFILE%%lib/liballp_unsharable.a share/aclocal/allegro.m4 -%%PORTDOCS%%%%DOCSDIR%%/abi.html -%%PORTDOCS%%%%DOCSDIR%%/ahack.html -%%PORTDOCS%%%%DOCSDIR%%/alleg000.html -%%PORTDOCS%%%%DOCSDIR%%/alleg001.html -%%PORTDOCS%%%%DOCSDIR%%/alleg002.html -%%PORTDOCS%%%%DOCSDIR%%/alleg003.html -%%PORTDOCS%%%%DOCSDIR%%/alleg004.html -%%PORTDOCS%%%%DOCSDIR%%/alleg005.html -%%PORTDOCS%%%%DOCSDIR%%/alleg006.html -%%PORTDOCS%%%%DOCSDIR%%/alleg007.html -%%PORTDOCS%%%%DOCSDIR%%/alleg008.html -%%PORTDOCS%%%%DOCSDIR%%/alleg009.html -%%PORTDOCS%%%%DOCSDIR%%/alleg010.html -%%PORTDOCS%%%%DOCSDIR%%/alleg011.html -%%PORTDOCS%%%%DOCSDIR%%/alleg012.html -%%PORTDOCS%%%%DOCSDIR%%/alleg013.html -%%PORTDOCS%%%%DOCSDIR%%/alleg014.html -%%PORTDOCS%%%%DOCSDIR%%/alleg015.html -%%PORTDOCS%%%%DOCSDIR%%/alleg016.html -%%PORTDOCS%%%%DOCSDIR%%/alleg017.html -%%PORTDOCS%%%%DOCSDIR%%/alleg018.html -%%PORTDOCS%%%%DOCSDIR%%/alleg019.html -%%PORTDOCS%%%%DOCSDIR%%/alleg020.html -%%PORTDOCS%%%%DOCSDIR%%/alleg021.html -%%PORTDOCS%%%%DOCSDIR%%/alleg022.html -%%PORTDOCS%%%%DOCSDIR%%/alleg023.html -%%PORTDOCS%%%%DOCSDIR%%/alleg024.html -%%PORTDOCS%%%%DOCSDIR%%/alleg025.html -%%PORTDOCS%%%%DOCSDIR%%/alleg026.html -%%PORTDOCS%%%%DOCSDIR%%/alleg027.html -%%PORTDOCS%%%%DOCSDIR%%/alleg028.html -%%PORTDOCS%%%%DOCSDIR%%/alleg029.html -%%PORTDOCS%%%%DOCSDIR%%/alleg030.html -%%PORTDOCS%%%%DOCSDIR%%/alleg031.html -%%PORTDOCS%%%%DOCSDIR%%/alleg032.html -%%PORTDOCS%%%%DOCSDIR%%/alleg033.html -%%PORTDOCS%%%%DOCSDIR%%/alleg034.html -%%PORTDOCS%%%%DOCSDIR%%/alleg035.html -%%PORTDOCS%%%%DOCSDIR%%/alleg036.html -%%PORTDOCS%%%%DOCSDIR%%/alleg037.html -%%PORTDOCS%%%%DOCSDIR%%/alleg038.html -%%PORTDOCS%%%%DOCSDIR%%/alleg039.html -%%PORTDOCS%%%%DOCSDIR%%/alleg040.html -%%PORTDOCS%%%%DOCSDIR%%/alleg041.html -%%PORTDOCS%%%%DOCSDIR%%/alleg042.html -%%PORTDOCS%%%%DOCSDIR%%/alleg043.html -%%PORTDOCS%%%%DOCSDIR%%/alleg044.html -%%PORTDOCS%%%%DOCSDIR%%/alleg045.html -%%PORTDOCS%%%%DOCSDIR%%/alleg046.html -%%PORTDOCS%%%%DOCSDIR%%/alleg047.html -%%PORTDOCS%%%%DOCSDIR%%/alleg048.html -%%PORTDOCS%%%%DOCSDIR%%/alleg049.html -%%PORTDOCS%%%%DOCSDIR%%/allegro.css -%%PORTDOCS%%%%DOCSDIR%%/allegro.html -%%PORTDOCS%%%%DOCSDIR%%/api.html -%%PORTDOCS%%%%DOCSDIR%%/changes.html -%%PORTDOCS%%%%DOCSDIR%%/const.html -%%PORTDOCS%%%%DOCSDIR%%/dat.html -%%PORTDOCS%%%%DOCSDIR%%/dat2c.html -%%PORTDOCS%%%%DOCSDIR%%/dat2s.html -%%PORTDOCS%%%%DOCSDIR%%/datafile.html -%%PORTDOCS%%%%DOCSDIR%%/faq.html -%%PORTDOCS%%%%DOCSDIR%%/grabber.html -%%PORTDOCS%%%%DOCSDIR%%/help.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/license.html -%%PORTDOCS%%%%DOCSDIR%%/makedoc.html -%%PORTDOCS%%%%DOCSDIR%%/mistakes.html -%%PORTDOCS%%%%DOCSDIR%%/packfile.html -%%PORTDOCS%%%%DOCSDIR%%/readme.html -%%PORTDOCS%%%%DOCSDIR%%/thanks.html -%%PORTDOCS%%%%EXAMPLESDIR%%/demo -%%PORTDOCS%%%%EXAMPLESDIR%%/demo.c -%%PORTDOCS%%%%EXAMPLESDIR%%/demo.dat -%%PORTDOCS%%%%EXAMPLESDIR%%/demo.h -%%PORTDOCS%%%%EXAMPLESDIR%%/music.txt -%%PORTDOCS%%%%EXAMPLESDIR%%/readme.txt -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/allegro/%%SHLIB_VER%% @dirrm lib/allegro @dirrm include/allegro/platform --- allegro-4.2.2_3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130702131838.07678A70>