diff options
| author | sobomax <sobomax@FreeBSD.org> | 2001-08-28 20:04:42 +0800 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2001-08-28 20:04:42 +0800 |
| commit | 289c36981d7e8e7c4e20fdd241e8661081a99624 (patch) | |
| tree | 80591fa18bcf2c713dd8869233356aceae37ac70 /graphics | |
| parent | e07c2ca63b482b3172d45131de57ceab6be8c10b (diff) | |
| download | freebsd-ports-gnome-289c36981d7e8e7c4e20fdd241e8661081a99624.tar.gz freebsd-ports-gnome-289c36981d7e8e7c4e20fdd241e8661081a99624.tar.zst freebsd-ports-gnome-289c36981d7e8e7c4e20fdd241e8661081a99624.zip | |
- Rework optional GNOME dependency, so it would not confuse bento;
- enable gnomeprint support in Gnome case;
- use "@*" to pass arguments from the helper script to the binary instead of
$*.
Submitted by: bento
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/dia/Makefile | 18 | ||||
| -rw-r--r-- | graphics/dia/files/dia.sh | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index 940792b2a83e..a83294e92590 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -7,18 +7,19 @@ PORTNAME= dia PORTVERSION= 0.88.1 +PORTREVISION= 1 CATEGORIES+= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/dia MAINTAINER?= gnome@FreeBSD.org -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt +LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ + gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOMELIBS= yes -WANT_GNOME= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl" @@ -27,13 +28,18 @@ MAN1= dia.1 .include <bsd.port.pre.mk> -.if defined(HAVE_GNOME) +.if exists(${X11BASE}/bin/panel) || defined(WITH_GNOME) USE_GNOME= yes -CONFIGURE_ARGS= --enable-gnome -PLIST_SUB+= DIAHELP="help/dia" +PKGNAMESUFFIX= -gnome +CONFIGURE_ARGS= --enable-gnome \ + --enable-gnome-print +PLIST_SUB+= DIAHELP="help/dia" \ + GNOME:="" +MAKE_ENV= HAVE_GNOME="yes" .else CONFIGURE_ARGS= --disable-gnome -PLIST_SUB+= DIAHELP="dia/help" +PLIST_SUB+= DIAHELP="dia/help" \ + GNOME:="@comment " .endif pre-patch: diff --git a/graphics/dia/files/dia.sh b/graphics/dia/files/dia.sh index 5d9473f4e89c..a41d856d67b4 100644 --- a/graphics/dia/files/dia.sh +++ b/graphics/dia/files/dia.sh @@ -4,4 +4,4 @@ DIA_SHAPE_PATH=%%PREFIX%%/share/gnome/dia/shapes DIA_SHEET_PATH=%%PREFIX%%/share/gnome/dia/sheets export DIA_LIB_PATH DIA_SHAPE_PATH DIA_INT_SHAPE_PATH DIA_SHEET_PATH -exec %%PREFIX%%/bin/dia-bin $* +exec %%PREFIX%%/bin/dia-bin "$@" |