From owner-svn-ports-head@freebsd.org Thu Sep 7 00:45:29 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B458BE20285; Thu, 7 Sep 2017 00:45:29 +0000 (UTC) (envelope-from swills@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 mx1.freebsd.org (Postfix) with ESMTPS id 1D0336F5AF; Thu, 7 Sep 2017 00:45:28 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v870jSBj044705; Thu, 7 Sep 2017 00:45:28 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v870jROg044700; Thu, 7 Sep 2017 00:45:27 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201709070045.v870jROg044700@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Thu, 7 Sep 2017 00:45:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449383 - in head/graphics/xournal: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/graphics/xournal: . files X-SVN-Commit-Revision: 449383 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.23 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: Thu, 07 Sep 2017 00:45:30 -0000 Author: swills Date: Thu Sep 7 00:45:27 2017 New Revision: 449383 URL: https://svnweb.freebsd.org/changeset/ports/449383 Log: graphics/xournal: make DATADIR clean While here, put back USES=desktop-file-utils shared-mime-info which was mistakenly removed in previous commits. PR: 221713 Approved by: me@janh.de (maintainer timeout, >2 weeks) Added: head/graphics/xournal/files/patch-src_Makefile.in (contents, props changed) head/graphics/xournal/files/patch-src_main.c (contents, props changed) Modified: head/graphics/xournal/Makefile head/graphics/xournal/files/patch-Makefile.in head/graphics/xournal/files/patch-configure Modified: head/graphics/xournal/Makefile ============================================================================== --- head/graphics/xournal/Makefile Thu Sep 7 00:41:34 2017 (r449382) +++ head/graphics/xournal/Makefile Thu Sep 7 00:45:27 2017 (r449383) @@ -16,7 +16,7 @@ LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 -USES= pkgconfig +USES= pkgconfig desktop-file-utils shared-mime-info USE_GNOME= cairo libgnomecanvas USE_XORG= x11 GNU_CONFIGURE= yes @@ -29,6 +29,7 @@ GHOSTSCRIPT_DESC= Install ghostscript (PS/PDF as bitma OPTIONS_DEFAULT= GHOSTSCRIPT GHOSTSCRIPT_USES= ghostscript:run +MAKE_ENV+= DATADIR=${DATADIR} PORTDOCS_MAIN= AUTHORS \ ChangeLog \ @@ -67,11 +68,6 @@ PORTDOCS= ${PORTDOCS_MAIN} \ html-doc/pixmaps/shapes.png \ html-doc/pixmaps/black.png \ html-doc/pixmaps/text-tool.png - -post-patch: - @${REINPLACE_CMD} \ - -e 's|$$(DESTDIR)/usr/share/|$$(DESTDIR)$$$$desktopdir/|g' \ - ${WRKSRC}/Makefile.in post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/graphics/xournal/files/patch-Makefile.in ============================================================================== --- head/graphics/xournal/files/patch-Makefile.in Thu Sep 7 00:41:34 2017 (r449382) +++ head/graphics/xournal/files/patch-Makefile.in Thu Sep 7 00:45:27 2017 (r449383) @@ -1,6 +1,15 @@ ---- Makefile.in.orig 2014-06-29 08:53:20.000000000 +0200 -+++ Makefile.in 2015-02-23 22:51:49.000000000 +0100 -@@ -796,31 +796,29 @@ +--- Makefile.in.orig 2017-07-20 18:30:27 UTC ++++ Makefile.in +@@ -809,38 +809,36 @@ uninstall-am: + install-data-local: + @$(NORMAL_INSTALL) + if test -d $(srcdir)/pixmaps; then \ +- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \ ++ $(mkinstalldirs) $(DESTDIR)$(DATADIR)/pixmaps; \ + for pixmap in $(srcdir)/pixmaps/*; do \ + if test -f $$pixmap; then \ +- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \ ++ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(DATADIR)/pixmaps; \ fi \ done \ fi; \ @@ -33,7 +42,7 @@ - else \ - desktopdir=/usr/local/share; \ - fi; \ -+ desktopdir=$(pkgdatadir); \ ++ desktopdir=$(DATADIR); \ $(mkinstalldirs) $(DESTDIR)$$desktopdir/icons/hicolor/scalable/apps; \ $(mkinstalldirs) $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \ $(mkinstalldirs) $(DESTDIR)$$desktopdir/mime/packages; \ @@ -43,7 +52,7 @@ $(INSTALL_DATA) $(srcdir)/pixmaps/xournal.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/apps; \ $(INSTALL_DATA) $(srcdir)/pixmaps/xoj.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \ if test ! -e $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; then \ -@@ -828,7 +826,7 @@ +@@ -851,7 +849,7 @@ desktop-install: fi; \ $(INSTALL_DATA) $(srcdir)/xournal.xml $(DESTDIR)$$desktopdir/mime/packages; \ $(INSTALL_DATA) $(srcdir)/xournal.desktop $(DESTDIR)$$desktopdir/applications; \ Modified: head/graphics/xournal/files/patch-configure ============================================================================== --- head/graphics/xournal/files/patch-configure Thu Sep 7 00:41:34 2017 (r449382) +++ head/graphics/xournal/files/patch-configure Thu Sep 7 00:45:27 2017 (r449383) @@ -1,6 +1,6 @@ ---- configure.orig 2017-07-20 18:30:25.000000000 +0000 -+++ configure 2017-08-01 14:05:24.637135000 +0000 -@@ -5605,6 +5605,8 @@ +--- configure.orig 2017-07-20 18:30:25 UTC ++++ configure +@@ -5605,6 +5605,8 @@ fi case "$host" in *-*-linux*) os_linux=yes;; Added: head/graphics/xournal/files/patch-src_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/xournal/files/patch-src_Makefile.in Thu Sep 7 00:45:27 2017 (r449383) @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig 2017-08-20 23:55:48 UTC ++++ src/Makefile.in +@@ -342,7 +342,7 @@ top_srcdir = @top_srcdir@ + @WIN32_FALSE@SUBDIRS = ttsubset + @WIN32_TRUE@SUBDIRS = ttsubset win32 + INCLUDES = \ +- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ ++ -DPACKAGE_DATA_DIR=\""$(DATADIR)/pixmaps"\" \ + -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + @PACKAGE_CFLAGS@ + Added: head/graphics/xournal/files/patch-src_main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/xournal/files/patch-src_main.c Thu Sep 7 00:45:27 2017 (r449383) @@ -0,0 +1,11 @@ +--- src/main.c.orig 2015-10-25 04:26:29 UTC ++++ src/main.c +@@ -360,7 +360,7 @@ main (int argc, char *argv[]) + g_free(path); + g_free(path1); + g_free(path2); +- add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps"); ++ add_pixmap_directory (PACKAGE_DATA_DIR); + + /* + * The following code was added by Glade to create one of each component