From nobody Sun Oct 01 19:21:37 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RzDTs6d54z4vjFQ; Sun, 1 Oct 2023 19:21:37 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RzDTs5y24z4HSH; Sun, 1 Oct 2023 19:21:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696188097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=01Tz3fcvRVBbUr3KlZO3iyRNe9mTOsB6gwGrPmeBVrA=; b=HYT9JwgaZj0wdbFEjW+l+qHjm8TKNdPI5VJPKIF+AFTmcfLaFRJkUT97tXdfsdl2QKz5kr U1qfiutKh0GLuNlnOPEekaVx3IOjNAMohpoPy+yQf7a0Exvl6pESSsABGHOLPUOV9EpfXb 6YS8K+Be6MUWDfnCoilZVeivYYRudhODzGKNVKCildM954r6yQSENGCs8LvGt/+YmW7PGv +XOfxTUPKlQyJJ+Ex/RXM7seMqjJ1oKADC50mU3+RM6c/SAfYi9J0rcWIlv8Pgfvw+VK5g SZOk1b1dbSLM+lZaiUXK8b4j8ODkMPXtHrPLyrHrv/UZCaEROmB3bITea0JaYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696188097; a=rsa-sha256; cv=none; b=Amf+iRJ9IKoSDxTt4t9+lr47jsCgYYKa1vYFXFUDKkNKjfzd6JNQstKzvmrMaTyGltt7H6 Ys7fPUaTS/aDXwjtYNY7RMiKcjUi+tqdKxXoSqQbHNyHa4jlJYruxJ3nRh0MbhQ49B/fYx QPeBgUxMvGOsnsC9ZAkDpAxwU9lxtPvpJqriWsrBVvj+FXivQpzQn1d6Gzv8ZOVS+0RTY1 6mlkxsBn3MGddXNROPsIjUBcchg07SlUNbFoZM7JyFPEAzG+3Zkoun5/u1s8Hpi6FxmSPe 3VE0gYQyHqVOe8y7+SWNfjL3+kEQ5/h0Jq/5Pn5+HsTUlOO80V19duqLANky0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696188097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=01Tz3fcvRVBbUr3KlZO3iyRNe9mTOsB6gwGrPmeBVrA=; b=xXlbWi0QQibUvcJ0zl+mYyh7KfGPzpSBuzXvySsm3GutNY8Is9+BAwJaKAejsvB+Mtk7gY kaZIKJlqWAamR6HhHxJyJ6zkeSnYsO/D7PkggFvkg/3zqmuAPkATbpu3Go+CuDqb2SJQGA 4F5eBh68uWqGwREf332nArTXTQiOOBkJRPajuDCkfECnbhI87T2DgbYR9rIi4qUo1Rxciy em0eFgqXb2+tcrfkjk9IhZg63yObtavzg59HJbsaxtazK7ymRBgRgS5FueRH90TaIcQnG1 crgVSGNl5qlo6MTD6sh49CmOvZ0eCCd923oJ2BhXq9fmBHUwKoYAM8GpVw+SAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RzDTs4zRyzhfk; Sun, 1 Oct 2023 19:21:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 391JLb25082641; Sun, 1 Oct 2023 19:21:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 391JLb5b082624; Sun, 1 Oct 2023 19:21:37 GMT (envelope-from git) Date: Sun, 1 Oct 2023 19:21:37 GMT Message-Id: <202310011921.391JLb5b082624@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 79977efe221d - main - www/badwolf: Fix build without NLS List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79977efe221da0e1377b86e1add09f66358e97bc Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=79977efe221da0e1377b86e1add09f66358e97bc commit 79977efe221da0e1377b86e1add09f66358e97bc Author: Nuno Teixeira AuthorDate: 2023-10-01 13:20:45 +0000 Commit: Nuno Teixeira CommitDate: 2023-10-01 19:21:23 +0000 www/badwolf: Fix build without NLS - Upstream use configure/ninja and stopped using make for builds. Patch configure to have a NLS knob working PR: 274102 Approved by: portmgr (build fix blanket) --- www/badwolf/Makefile | 3 +- www/badwolf/files/extra-patch-Makefile | 40 ----------------------- www/badwolf/files/extra-patch-configure | 58 +++++++++++++++++++++++++++++++++ www/badwolf/pkg-plist | 18 +++++----- 4 files changed, 69 insertions(+), 50 deletions(-) diff --git a/www/badwolf/Makefile b/www/badwolf/Makefile index b1ca17de135e..dc2ed25f2d96 100644 --- a/www/badwolf/Makefile +++ b/www/badwolf/Makefile @@ -1,5 +1,6 @@ PORTNAME= badwolf DISTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://hacktivis.me/releases/ @@ -35,7 +36,7 @@ LIBSOUP_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup LIBSOUP_CONFIGURE_ENV= WITH_URI_PARSER=libsoup2 NLS_USES= gettext -NLS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-Makefile +NLS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-configure GURI_USE_GNOME= glib20 LIBAV_USE_GSTREAMER= libav diff --git a/www/badwolf/files/extra-patch-Makefile b/www/badwolf/files/extra-patch-Makefile deleted file mode 100644 index 8419778d4446..000000000000 --- a/www/badwolf/files/extra-patch-Makefile +++ /dev/null @@ -1,40 +0,0 @@ ---- Makefile.orig 2021-11-20 12:28:32 UTC -+++ Makefile -@@ -10,10 +10,10 @@ EXE_test = uri_test - OBJS_test = uri_test.o - EXE = badwolf - EXE_test = uri_test --TRANS = fr.mo pt_BR.mo tr.mo de.mo vi.mo -+#TRANS = fr.mo pt_BR.mo tr.mo de.mo vi.mo - DOCS = usr.bin.badwolf README.md KnowledgeBase.md interface.txt - --all: config.mk $(EXE) $(TRANS) po/messages.pot -+all: config.mk $(EXE) - - config.mk: configure - @echo "Error: You need to execute ./configure before running make" -@@ -35,9 +35,9 @@ po/%.po: po/messages.pot - po/%.po: po/messages.pot - msgmerge --update --backup=off $@ $< - --${TRANS}: po/${@:.mo=.po} -- mkdir -p locale/${@:.mo=}/LC_MESSAGES -- $(MSGFMT) -o locale/${@:.mo=}/LC_MESSAGES/$(PACKAGE).mo po/${@:.mo=.po} -+#${TRANS}: po/${@:.mo=.po} -+# mkdir -p locale/${@:.mo=}/LC_MESSAGES -+# $(MSGFMT) -o locale/${@:.mo=}/LC_MESSAGES/$(PACKAGE).mo po/${@:.mo=.po} - - badwolf: $(OBJS) - $(CC) -std=c11 -o $@ $(OBJS) $(LDFLAGS) $(LIBS) -@@ -62,9 +62,8 @@ install: all - cp -p badwolf $(DESTDIR)$(BINDIR)/ - mkdir -p $(DESTDIR)$(MANDIR)/man1 - cp -p badwolf.1 $(DESTDIR)$(MANDIR)/man1/ -- mkdir -p $(DESTDIR)$(DATADIR)/locale -- cp -r locale/ $(DESTDIR)$(DATADIR)/ -- cp interface.css $(DESTDIR)$(DATADIR)/ -+ mkdir -p $(DESTDIR)$(DATADIR) -+ cp -p interface.css $(DESTDIR)$(DATADIR)/ - mkdir -p $(DESTDIR)$(APPSDIR) - cp -p badwolf.desktop $(DESTDIR)$(APPSDIR)/ - mkdir -p $(DESTDIR)$(DOCDIR) diff --git a/www/badwolf/files/extra-patch-configure b/www/badwolf/files/extra-patch-configure new file mode 100644 index 000000000000..5c566356ae2a --- /dev/null +++ b/www/badwolf/files/extra-patch-configure @@ -0,0 +1,58 @@ +--- configure.orig 2023-10-01 13:05:07 UTC ++++ configure +@@ -13,8 +13,8 @@ DOCS="usr.bin.badwolf README.md KnowledgeBase.md inter + EXE_test="fmt_test uri_test bookmarks_test" + DOCS="usr.bin.badwolf README.md KnowledgeBase.md interface.md" + +-TRANS="fr pt_BR tr de vi" +-TRANS_MAN="de fr tr vi" ++#TRANS="fr pt_BR tr de vi" ++#TRANS_MAN="de fr tr vi" + + lint_targets="" + +@@ -373,18 +373,18 @@ done >>config.ninja + echo + done >>config.ninja + +-for trans in ${TRANS}; do +- echo "build po/${trans}.po: msgmerge po/messages.pot" +- echo "build locale/${trans}/LC_MESSAGES/Badwolf.mo: po2mo po/${trans}.po" +- all="${all} locale/${trans}/LC_MESSAGES/Badwolf.mo" +-done >>config.ninja ++#for trans in ${TRANS}; do ++# echo "build po/${trans}.po: msgmerge po/messages.pot" ++# echo "build locale/${trans}/LC_MESSAGES/Badwolf.mo: po2mo po/${trans}.po" ++# all="${all} locale/${trans}/LC_MESSAGES/Badwolf.mo" ++#done >>config.ninja + +-for man in ${TRANS_MAN}; do +- echo "build po/${man}_man.po: xgettext_man badwolf.1" +- echo "build badwolf.${man}.1: translate_manpage po/${man}_man.po" +- bundled="${bundled} badwolf.${man}.1" +- trans_man="${trans_man} badwolf.${man}.1" +-done >>config.ninja ++#for man in ${TRANS_MAN}; do ++# echo "build po/${man}_man.po: xgettext_man badwolf.1" ++# echo "build badwolf.${man}.1: translate_manpage po/${man}_man.po" ++# bundled="${bundled} badwolf.${man}.1" ++# trans_man="${trans_man} badwolf.${man}.1" ++#done >>config.ninja + + for i in 24 32 48 64 128 256; do + echo "build icons/hicolor/${i}x${i}/apps/badwolf.png: gen_icon icons/hicolor/scalable/apps/badwolf.svg +@@ -438,10 +438,10 @@ doins "${MANDIR}/man1" ./badwolf.1 + + doins "${BINDIR}" ./badwolf + doins "${MANDIR}/man1" ./badwolf.1 +-for man in ${TRANS_MAN}; do +- newins "${MANDIR}/\${man}/man1" "./badwolf.\${man}.1" "badwolf.1" +-done +-doins "${DATADIR}" ./locale ++#for man in ${TRANS_MAN}; do ++# newins "${MANDIR}/\${man}/man1" "./badwolf.\${man}.1" "badwolf.1" ++#done ++#doins "${DATADIR}" ./locale + doins "${DATADIR}" ./interface.css + doins "${APPSDIR}" badwolf.desktop + doins "${DOCDIR}" ${DOCS} diff --git a/www/badwolf/pkg-plist b/www/badwolf/pkg-plist index ccf6fb43afb8..6ba90373a2ac 100644 --- a/www/badwolf/pkg-plist +++ b/www/badwolf/pkg-plist @@ -10,12 +10,12 @@ share/icons/hicolor/64x64/apps/badwolf.png share/icons/hicolor/scalable/apps/badwolf.svg share/man/man1/badwolf.1.gz %%NLS%%@dir %%DATADIR%%/locale -%%DATADIR%%/locale/de/LC_MESSAGES/Badwolf.mo -%%DATADIR%%/locale/fr/LC_MESSAGES/Badwolf.mo -%%DATADIR%%/locale/pt_BR/LC_MESSAGES/Badwolf.mo -%%DATADIR%%/locale/tr/LC_MESSAGES/Badwolf.mo -%%DATADIR%%/locale/vi/LC_MESSAGES/Badwolf.mo -share/man/de/man1/badwolf.1.gz -share/man/fr/man1/badwolf.1.gz -share/man/tr/man1/badwolf.1.gz -share/man/vi/man1/badwolf.1.gz +%%NLS%%%%DATADIR%%/locale/de/LC_MESSAGES/Badwolf.mo +%%NLS%%%%DATADIR%%/locale/fr/LC_MESSAGES/Badwolf.mo +%%NLS%%%%DATADIR%%/locale/pt_BR/LC_MESSAGES/Badwolf.mo +%%NLS%%%%DATADIR%%/locale/tr/LC_MESSAGES/Badwolf.mo +%%NLS%%%%DATADIR%%/locale/vi/LC_MESSAGES/Badwolf.mo +%%NLS%%share/man/de/man1/badwolf.1.gz +%%NLS%%share/man/fr/man1/badwolf.1.gz +%%NLS%%share/man/tr/man1/badwolf.1.gz +%%NLS%%share/man/vi/man1/badwolf.1.gz