pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

midori: Cleanup/G/C a bit



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Dec 9 16:47:15 2018 +0100
Changeset:	41b28bfabf34d9243d35cc8942ac38301885c66c

Modified Files:
	midori/Makefile

Log Message:
midori: Cleanup/G/C a bit

- Remove all commented out lines that are no longer relevant:
  - configuration files are no longer present, remove CONF_FILES and related
    variables handling
  - gnome-keyring seems no longer a possible dependency
- rsvg-convert is no longer used, remove dependency to librsvg
- gmake is no longer needed
- libidn seems no longer needed, remove it as a dependency
- All CMAKE_ARGS were actually a noop, remove them
- Remove the pre-configure target (no longer `*.orig' files are
  around... (if that's still an issue it would be probably investigate further
  and try to properly address that))

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=41b28bfabf34d9243d35cc8942ac38301885c66c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 midori/Makefile | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diffs:
diff --git a/midori/Makefile b/midori/Makefile
index 80ada1d7ab..43c3abc559 100644
--- a/midori/Makefile
+++ b/midori/Makefile
@@ -11,51 +11,27 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://midori-browser.org/
 COMMENT=	Lightweight web browser using WebKit
 LICENSE=	gnu-lgpl-v2.1
-#EXTRACT_SUFX=	.tar.bz2
-
-#WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 USE_CMAKE=	yes
-USE_TOOLS+=	gmake intltool msgfmt pkg-config
-
-CMAKE_ARGS+=		-DPREFIX=${PREFIX}
-CMAKE_ARGS+=		-DUSE_ZEITGEIST=OFF
-CMAKE_ARGS+=		-DUSE_GTK3=ON
-CMAKE_ARGS+=		-DHALF_BRO_INCOM_WEBKIT2:BOOL=ON
+USE_TOOLS+=	intltool msgfmt pkg-config
 
 CHECK_PORTABILITY_SKIP+=	win32/old/x86-mingw32-opensuse/install.sh
 CHECK_PORTABILITY_SKIP+=	win32/makedist/makedist.midori
 
-BUILD_DEPENDS+=		librsvg>=2.18:../../graphics/librsvg
-
 DEPENDS+=		gnome-themes-standard-[0-9]*:../../graphics/gnome-themes-standard
 
-#EGDIR=			${PREFIX}/share/examples/midori
-#OWN_DIRS=		${PKG_SYSCONFDIR}/xdg/midori
-#CONF_FILES=		${EGDIR}/search ${PKG_SYSCONFDIR}/xdg/midori/search
-
-# Otherwise build chokes on .orig files
-pre-configure:
-	${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;
-
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
 .include "../../mk/bsd.prefs.mk"
 
-#OWN_DIRS+=	${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock
-#CONF_FILES+=	${EGDIR}/extensions/adblock/config \
-#		${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock/config
-
 CONFIGURE_ENV=	VALAC=${VALAC}
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/libpeas/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
-#.include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"


Home | Main Index | Thread Index | Old Index