From owner-svn-ports-head@freebsd.org Sat Jul 28 12:07:24 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DAD1A104E955; Sat, 28 Jul 2018 12:07:23 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 90E6F8A520; Sat, 28 Jul 2018 12:07:23 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 721F9266BE; Sat, 28 Jul 2018 12:07:23 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6SC7N93066863; Sat, 28 Jul 2018 12:07:23 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6SC7NW2066862; Sat, 28 Jul 2018 12:07:23 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201807281207.w6SC7NW2066862@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 28 Jul 2018 12:07:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475533 - head/x11-fonts/alfont X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/x11-fonts/alfont X-SVN-Commit-Revision: 475533 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2018 12:07:24 -0000 Author: tobik Date: Sat Jul 28 12:07:22 2018 New Revision: 475533 URL: https://svnweb.freebsd.org/changeset/ports/475533 Log: games/alfont - Add soname to libalfont - print/freetype2 has the same license as alfont but with more permissions. Sync LICENSE_PERMS with it - Cleanup docs install - Regen distinfo; alfont.c has been folded into a patch in r454035 - Remove custom extract target and use EXTRACT_* instead - Fix bad version Modified: head/x11-fonts/alfont/Makefile head/x11-fonts/alfont/distinfo Modified: head/x11-fonts/alfont/Makefile ============================================================================== --- head/x11-fonts/alfont/Makefile Sat Jul 28 12:07:10 2018 (r475532) +++ head/x11-fonts/alfont/Makefile Sat Jul 28 12:07:22 2018 (r475533) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= alfont -PORTVERSION= 209 -PORTREVISION= 3 +PORTVERSION= 2.0.9 +PORTEPOCH= 1 CATEGORIES= x11-fonts MASTER_SITES= http://opensnc.sourceforge.net/alfont/mirror/ -DISTNAME= AlFont${DISTVERSION} +DISTNAME= AlFont${PORTVERSION:S/.//g} EXTRACT_SUFX= .rar DIST_SUBDIR= ${PORTNAME} @@ -16,7 +16,7 @@ COMMENT= Wrapper around the freetype2 library LICENSE= FTL LICENSE_NAME= The FreeType Project LICENSE (FTL) LICENSE_FILE= ${WRKSRC}/docs/FTL.txt -LICENSE_PERMS= auto-accept +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept EXTRACT_DEPENDS= unrar:archivers/unrar LIB_DEPENDS= liballeg.so.4:devel/allegro \ @@ -27,33 +27,23 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USES= dos2unix gmake iconv USE_LDCONFIG= yes +EXTRACT_CMD= ${LOCALBASE}/bin/unrar +EXTRACT_BEFORE_ARGS= x -y -idq +EXTRACT_AFTER_ARGS= + CPPFLAGS+= -Iinclude -I${LOCALBASE}/include \ -I${LOCALBASE}/include/freetype2 $$(freetype-config --cflags) LDFLAGS+= -L${LOCALBASE}/lib -lalleg $$(freetype-config --libs) PLIST_FILES= include/alfont.h \ include/alfontdll.h \ - lib/libalfont.so.${MAJORVER} \ + lib/libalfont.so.${PORTVERSION} \ lib/libalfont.so PORTDOCS= * -DOCSRCDIR1= ${WRKSRC} -DOC_FILES1= CHANGES.txt README.txt - -DOCSRCDIR2= ${WRKSRC}/docs -DOCSDIR2= ${DOCSDIR}/docs -DOC_FILES2= ALFONT.txt AUTHORS.txt - OPTIONS_DEFINE= DOCS -MAJORVER= ${PORTVERSION:S/209/2.0.9/} - -do-extract: - @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && ${LOCALBASE}/bin/unrar x -y -idq \ - ${_DISTDIR}/AlFont${DISTVERSION}.rar - post-patch: @${REINPLACE_CMD} -e \ 's|#define ALFONT_WINDOWS|//#define ALFONT_WINDOWS|; \ @@ -64,20 +54,20 @@ post-patch: do-build: cd ${WRKSRC} ; ${CC} ${CPPFLAGS} -fPIC -DPIC -c src/alfont.c -o \ src/alfont.o - cd ${WRKSRC} ; ${CC} -shared ${LDFLAGS} src/alfont.o -o \ - libalfont.so.${MAJORVER} + cd ${WRKSRC} ; ${CC} -shared ${LDFLAGS} -Wl,-soname=libalfont.so.${PORTVERSION} \ + src/alfont.o -o libalfont.so.${PORTVERSION} do-install: - ${INSTALL_DATA} ${WRKSRC}/libalfont.so.${MAJORVER} \ + ${INSTALL_DATA} ${WRKSRC}/libalfont.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libalfont.so.${MAJORVER} - @(cd ${STAGEDIR}${PREFIX}/lib ; ${LN} -sf libalfont.so.${MAJORVER} \ + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libalfont.so.${PORTVERSION} + @(cd ${STAGEDIR}${PREFIX}/lib ; ${LN} -sf libalfont.so.${PORTVERSION} \ libalfont.so) ${INSTALL_DATA} ${WRKSRC}/include/alfont*.h ${STAGEDIR}${PREFIX}/include +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR2} - ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} + cd ${WRKSRC} && ${INSTALL_DATA} CHANGES.txt README.txt docs/ALFONT.txt \ + docs/AUTHORS.txt ${STAGEDIR}${DOCSDIR} .include Modified: head/x11-fonts/alfont/distinfo ============================================================================== --- head/x11-fonts/alfont/distinfo Sat Jul 28 12:07:10 2018 (r475532) +++ head/x11-fonts/alfont/distinfo Sat Jul 28 12:07:22 2018 (r475533) @@ -1,4 +1,3 @@ +TIMESTAMP = 1532769735 SHA256 (alfont/AlFont209.rar) = 734f7f9758dfb3b80979baf010245d931c9cd2a7557683906c7fc616353f960d SIZE (alfont/AlFont209.rar) = 3696983 -SHA256 (alfont/alfont.c) = c9117c82131376b99d94d8aa5678b5724f14b3649b42abf08ec46cd9df00e0ae -SIZE (alfont/alfont.c) = 147298