From 03788913d82c95cfe7ef79c4b4e9263c5e714e91 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Fri, 11 Apr 2014 14:13:05 +0000 Subject: [PATCH] Support stage --- devel/glade3/Makefile | 15 ++++++--------- devel/glade3/pkg-plist | 7 ++----- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile index 935cf68c7ec5..6208534019b4 100644 --- a/devel/glade3/Makefile +++ b/devel/glade3/Makefile @@ -9,20 +9,18 @@ MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= A user interface builder for GTK+/GNOME +COMMENT= User interface builder for GTK+/GNOME CONFLICTS= glade-3.* PORTSCOUT= ignore -LATEST_LINK= glade3 INSTALLS_ICONS= yes -USE_XZ= yes -USE_GMAKE= yes -USE_GNOME= gtk20 libxml2 gnomeprefix gnomedocutils ltverhack:10 -USES= gettext pathfix desktop-file-utils pkgconfig +USE_GNOME= gtk20 libxml2 gnomeprefix gnomedocutils +USES= gmake gettext libtool pathfix desktop-file-utils pkgconfig tar:xz INSTALLS_OMF= yes +INSTALL_TARGET= install-strip USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -32,7 +30,6 @@ OPTIONS_DEFINE= GNOME PYTHON OPTIONS_DEFAULT=PYTHON GNOME_DESC= GNOME UI widget support -NO_STAGE= yes .include .if ${PORT_OPTIONS:MGNOME} @@ -56,6 +53,6 @@ PLIST_SUB+= PYTHON:="@comment " .endif post-install: - ${MKDIR} ${PREFIX}/lib/glade3/bindings + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/glade3/bindings .include diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist index c4e59ece2a18..1a020c0de395 100644 --- a/devel/glade3/pkg-plist +++ b/devel/glade3/pkg-plist @@ -52,19 +52,16 @@ include/libgladeui-1.0/gladeui/glade-widget-adaptor.h include/libgladeui-1.0/gladeui/glade-widget.h include/libgladeui-1.0/gladeui/glade-xml-utils.h include/libgladeui-1.0/gladeui/glade.h -%%GNOME:%%lib/glade3/modules/libgladegnome.a %%GNOME:%%lib/glade3/modules/libgladegnome.la %%GNOME:%%lib/glade3/modules/libgladegnome.so -%%PYTHON:%%lib/glade3/modules/libgladepython.a %%PYTHON:%%lib/glade3/modules/libgladepython.la %%PYTHON:%%lib/glade3/modules/libgladepython.so -lib/glade3/modules/libgladegtk.a lib/glade3/modules/libgladegtk.la lib/glade3/modules/libgladegtk.so -lib/libgladeui-1.a lib/libgladeui-1.la lib/libgladeui-1.so -lib/libgladeui-1.so.10 +lib/libgladeui-1.so.11 +lib/libgladeui-1.so.11.1.2 libdata/pkgconfig/gladeui-1.0.pc share/applications/glade-3.desktop %%DOCSDIR%%/GladeApp.html