cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some fixes to x11/xfce4 module : DIST_SUBDIR, CONFIGURE_STYLE and USE_X11

Browse Source 
are already defined in Makefile.inc, and putting them in the module was a
bad idea.
While here, remove temporarly myself as MAINTAINER, this info will also end
up in Makefile.inc when all ports are converted to use the module, like
it's done for gnome.
Also, conditionally define DISTNAME for XFCE_PLUGIN case, it's needed by
verve-plugin.

Requested by, discussed with and ok ajacoutot@
This commit is contained in:
landry 2008-07-07 12:06:04 +00:00
parent 680eb5603c
commit 8c73755969
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/xfce4/xfce4.port.mk
View File

@ -1,14 +1,11 @@
# $OpenBSD: xfce4.port.mk,v 1.2 2008/06/14 17:21:35 landry Exp $
# $OpenBSD: xfce4.port.mk,v 1.3 2008/07/07 12:06:04 landry Exp $
# Module for Xfce related ports, divided into three categories:
# core, goodies, plugins.
XFCE_DESKTOP_VERSION= 4.4.2
CATEGORIES+= x11/xfce4
DIST_SUBDIR= xfce4
MAINTAINER?= Landry Breuil <gaston@gcu.info>
USE_X11?= Yes
USE_GMAKE?= Yes
EXTRACT_SUFX?= .tar.bz2
@ -32,7 +29,7 @@ MODXFCE_RUN_DEPENDS+= :desktop-file-utils-*:devel/desktop-file-utils
HOMEPAGE?= http://goodies.xfce.org/projects/panel-plugins/xfce4-${XFCE_PLUGIN}-plugin
MASTER_SITES?= http://goodies.xfce.org/releases/xfce4-${XFCE_PLUGIN}-plugin/
DISTNAME= xfce4-${XFCE_PLUGIN}-plugin-${XFCE_VERSION}
DISTNAME?= xfce4-${XFCE_PLUGIN}-plugin-${XFCE_VERSION}
PKGNAME?= ${DISTNAME:S/-plugin//}
MODXFCE_LIB_DEPENDS= xfce4panel.>=2::x11/xfce4/xfce4-panel
@ -50,6 +47,5 @@ DISTNAME= ${XFCE_PROJECT}-${XFCE_VERSION}
LIB_DEPENDS+= ${MODXFCE_LIB_DEPENDS}
RUN_DEPENDS+= ${MODXFCE_RUN_DEPENDS}
CONFIGURE_STYLE?=gnu
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"