From a04e738c55b909afa006e7e50dc68399bf288ac3 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Thu, 20 Apr 2017 14:33:04 +0000 Subject: [PATCH] - Add LICENSE_FILE - Fix shebangs - Switch to USES=localbase --- x11/metisse/Makefile | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile index 7a08b129bd03..6d4ab24855b8 100644 --- a/x11/metisse/Makefile +++ b/x11/metisse/Makefile @@ -11,6 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Innovative X-based window system LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libNucleo.so:x11-toolkits/nucleo \ libpng.so:graphics/png @@ -21,7 +22,7 @@ CONFLICTS= fvwm-1.* fvwm-2.* BROKEN_aarch64= Fails to build: error: GETLEFTBITS_ALIGNMENT must be 1 BROKEN_armv6= Fails to build: error: GETLEFTBITS_ALIGNMENT must be 1 -USES= gettext libtool pathfix pkgconfig python shebangfix tar:bzip2 +USES= gettext libtool localbase:ldflags pathfix pkgconfig python shebangfix tar:bzip2 SHEBANG_FILES= ${WRKSRC}/fvwm-insitu/bin/fvwm-convert-2.4.in \ ${WRKSRC}/fvwm-insitu/bin/fvwm-convert-2.6.in \ ${WRKSRC}/fvwm-insitu/bin/fvwm-menu-desktop.in \ @@ -34,7 +35,10 @@ SHEBANG_FILES= ${WRKSRC}/fvwm-insitu/bin/fvwm-convert-2.4.in \ ${WRKSRC}/fvwm-insitu/modules/FvwmDebug/FvwmGtkDebug.in \ ${WRKSRC}/fvwm-insitu/modules/FvwmPerl/FvwmPerl.in \ ${WRKSRC}/fvwm-insitu/modules/FvwmTabs/FvwmTabs.in \ - ${WRKSRC}/fvwm-insitu/modules/FvwmWindowMenu/FvwmWindowMenu.in + ${WRKSRC}/fvwm-insitu/modules/FvwmWindowMenu/FvwmWindowMenu.in \ + ${WRKSRC}/bin/metisse-demo-address-app.in \ + ${WRKSRC}/bin/metisse-combo2radio.in \ + ${WRKSRC}/bin/metisse-combo2radio-edit.in perl_OLD_CMD= @PERL@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fontdir=${LOCALBASE}/share/fonts @@ -44,13 +48,13 @@ WANT_GNOME= yes MAKE_ARGS= METISSE_DOC_DIR="${DOCSDIR}" INSTALL_TARGET= install-strip -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - OPTIONS_DEFINE= GLX STROKE RPLAY FRIBIDI GLIB GTK2 GCONF \ DOCS OPTIONS_DEFINE_i386= GLX_X86 MMX OPTIONS_DEFINE_amd64= MMX +OPTIONS_DEFAULT= GLX +OPTIONS_DEFAULT_i386= GLX_X86 MMX +OPTIONS_DEFAULT_amd64= MMX OPTIONS_SUB= yes GLX_X86_DESC= GLX with x86 optimizations @@ -58,10 +62,6 @@ RPLAY_DESC= RPlay support in FvwmEvent GLIB_DESC= Use GLib 2.x for module integration GTK2_DESC= Use GDK-PixBuf-2.0 for image loading -OPTIONS_DEFAULT= GLX -OPTIONS_DEFAULT_i386= GLX_X86 MMX -OPTIONS_DEFAULT_amd64= MMX - MMX_CONFIGURE_ENABLE= mmx GLX_CONFIGURE_ENABLE= glx GLX_X86_CONFIGURE_ENABLE= glx-x86 @@ -70,8 +70,7 @@ MRPLAY_LIB_DEPENDS= librplay.so:audio/rplay FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi GLIB_USE= GNOME=glib20 GTK2_USE= GNOME=gtk20 - -GCONF_USE_GNOME+= gconf2 libglade2 +GCONF_USE= GNOME=gconf2,libglade2 post-patch: # Catch up with new header name