From owner-svn-ports-all@freebsd.org Sat Sep 19 11:04:49 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DD5C93DA79E; Sat, 19 Sep 2020 11:04:49 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BtnsY5TPCz4td7; Sat, 19 Sep 2020 11:04:49 +0000 (UTC) (envelope-from bapt@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 86455AE5A; Sat, 19 Sep 2020 11:04:49 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08JB4n8e010015; Sat, 19 Sep 2020 11:04:49 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08JB4nk5010014; Sat, 19 Sep 2020 11:04:49 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202009191104.08JB4nk5010014@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 19 Sep 2020 11:04:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548959 - head/sysutils/cdrdao X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/sysutils/cdrdao X-SVN-Commit-Revision: 548959 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Sep 2020 11:04:49 -0000 Author: bapt Date: Sat Sep 19 11:04:49 2020 New Revision: 548959 URL: https://svnweb.freebsd.org/changeset/ports/548959 Log: the gcdmaster port has been removed in 2018, remove some of its definition that has been left in the cdrdao port Modified: head/sysutils/cdrdao/Makefile Modified: head/sysutils/cdrdao/Makefile ============================================================================== --- head/sysutils/cdrdao/Makefile Sat Sep 19 11:03:10 2020 (r548958) +++ head/sysutils/cdrdao/Makefile Sat Sep 19 11:04:49 2020 (r548959) @@ -31,15 +31,6 @@ TOC2MP3_DESC= Build with toc2mp3 (requires audio/lame .include .endif -.if ${PORTNAME} == "gcdmaster" -USES+= pkgconfig shared-mime-info -GCONF_SCHEMAS= gcdmaster.schemas -LIB_DEPENDS+= ${MP3OGG_LIB_DEPENDS} \ - libgnomeuimm-2.6.so:x11-toolkits/libgnomeuimm26 -RUN_DEPENDS+= ${LOCALBASE}/bin/cdrdao:sysutils/cdrdao \ - ${LOCALBASE}/share/mime/packages/freedesktop.org.xml:misc/shared-mime-info -CONFIGURE_ARGS+= --with-lame=no -.else CONFIGURE_ARGS+= --with-gcdmaster=no .if ${PORT_OPTIONS:MTOC2MP3} LIB_DEPENDS+= libmp3lame.so:audio/lame @@ -63,7 +54,6 @@ CONFIGURE_ENV+= AO_CFLAGS=-I${LOCALBASE}/include \ .else CONFIGURE_ARGS+= --with-mp3-support=no --with-ogg-support=no .endif -.endif .include @@ -85,19 +75,6 @@ post-patch: 55readcd 55scgcheck 55scgskeleton 55rscsi 85man @${RM} ${WRKSRC}/scsilib/TARGETS/${i} .endfor -.if ${PORTNAME} == "gcdmaster" - @${REINPLACE_CMD} -E -e 's|(^SUBDIRS.+) utils|\1|' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -E -e 's|(^gladedir.+=).+|\1 ${DATADIR}|' \ - ${WRKSRC}/gcdmaster/Makefile.in - @${REINPLACE_CMD} -E -e \ - 's|(SET_CDRDAO_PATH.+path=)(cdrdao)|\1${LOCALBASE}\/bin\/\2|g' \ - ${WRKSRC}/gcdmaster/Settings.cc - @${REINPLACE_CMD} -E -e \ - 's|(icon-filename=).+(gcdmaster-doc.png)|\1${LOCALBASE}\/share\/pixmaps\/document-icons\/\2|g' \ - ${WRKSRC}/gcdmaster/gcdmaster.keys - @${REINPLACE_CMD} -e 's|connect(SigC::slot|connect(sigc::ptr_fun|g' \ - ${WRKSRC}/gcdmaster/xcdrdao.cc -.else .for i in cdrdao.man main.cc @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/dao/${i} .endfor @@ -106,42 +83,8 @@ post-patch: .for i in toc2cddb.1 toc2cue.1 @${REINPLACE_CMD} -e 's|1\.2\.2|${PORTVERSION}|g' ${WRKSRC}/utils/${i} .endfor -.endif -.if ${PORTNAME} == "gcdmaster" do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gcdmaster/gcdmaster \ - ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/gcdmaster/gcdmaster.man \ - ${STAGEDIR}${PREFIX}/man/man1/gcdmaster.1 - @${MKDIR} ${STAGEDIR}${LOCALBASE}/share/pixmaps/document-icons - ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster-doc.png \ - ${STAGEDIR}${LOCALBASE}/share/pixmaps/document-icons - @${MKDIR} ${STAGEDIR}${LOCALBASE}/share/application-registry - ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.applications \ - ${STAGEDIR}${LOCALBASE}/share/application-registry - ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.desktop \ - ${STAGEDIR}${LOCALBASE}/share/applications - @${MKDIR} ${STAGEDIR}${LOCALBASE}/share/mime-info - ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.keys \ - ${STAGEDIR}${LOCALBASE}/share/mime-info - ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.mime \ - ${STAGEDIR}${LOCALBASE}/share/mime-info - ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.png \ - ${STAGEDIR}${LOCALBASE}/share/pixmaps - @${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/gconf/schemas - ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.schemas \ - ${STAGEDIR}${LOCALBASE}/etc/gconf/schemas - @${MKDIR} ${STAGEDIR}${LOCALBASE}/share/mime/packages - ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.xml \ - ${STAGEDIR}${LOCALBASE}/share/mime/packages - @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/gcdmaster/glade/Preferences.glade \ - ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/gcdmaster/glade/ProjectChooser.glade \ - ${STAGEDIR}${DATADIR} -.else -do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dao/cdrdao ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/dao/cdrdao.man \ ${STAGEDIR}${PREFIX}/man/man1/cdrdao.1 @@ -163,6 +106,5 @@ do-install-DOCS-on: .for i in CREDITS ChangeLog README README.PlexDAE ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include