From ec48cd50fa23c24a3b4cc72ff2697ea80eaebf54 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Thu, 19 Sep 2002 17:35:53 +0000 Subject: Fix things after recent GNOMENG conversion. Submitted by: bento --- audio/gqmpeg-devel/Makefile | 13 +++++++++++-- audio/gqmpeg/Makefile | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile index 0794b69cdb9c..e105bd3eb205 100644 --- a/audio/gqmpeg-devel/Makefile +++ b/audio/gqmpeg-devel/Makefile @@ -14,7 +14,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER?= lyngbol@wheel.dk -LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf .if defined(WITH_MPG321) RUN_DEPENDS= mpg321:${PORTSDIR}/audio/mpg321 .else @@ -25,17 +24,27 @@ USE_REINPLACE= yes USE_X_PREFIX= yes USE_GNOMENG= yes USE_GNOME= gdkpixbuf +WANT_GNOME= yes USE_LIBTOOL= yes USE_AUTOCONF= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ - USE_GNOME="${USE_GNOME}" MAN1= gqmpeg.1 .include +.if ${HAVE_GNOME:Mgnomelibs}!="" +USE_GNOME+= gnomeprefix gnomelibs +PKGNAMESUFFIX= -gnome +CONFIGURE_ENV+= USE_GNOME="yes" +PLIST_SUB+= DATATDIR="share/gnome" +.else +CONFIGURE_ENV+= USE_GNOME="" +PLIST_SUB+= DATADIR="share" +.endif + .if !defined(WITH_MPG321) pre-everything:: @${ECHO_MSG} diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index 0794b69cdb9c..e105bd3eb205 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -14,7 +14,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER?= lyngbol@wheel.dk -LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf .if defined(WITH_MPG321) RUN_DEPENDS= mpg321:${PORTSDIR}/audio/mpg321 .else @@ -25,17 +24,27 @@ USE_REINPLACE= yes USE_X_PREFIX= yes USE_GNOMENG= yes USE_GNOME= gdkpixbuf +WANT_GNOME= yes USE_LIBTOOL= yes USE_AUTOCONF= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ - USE_GNOME="${USE_GNOME}" MAN1= gqmpeg.1 .include +.if ${HAVE_GNOME:Mgnomelibs}!="" +USE_GNOME+= gnomeprefix gnomelibs +PKGNAMESUFFIX= -gnome +CONFIGURE_ENV+= USE_GNOME="yes" +PLIST_SUB+= DATATDIR="share/gnome" +.else +CONFIGURE_ENV+= USE_GNOME="" +PLIST_SUB+= DATADIR="share" +.endif + .if !defined(WITH_MPG321) pre-everything:: @${ECHO_MSG} -- cgit v1.2.3