From b6cb7406493ab3a7df8268e80840c871ed356127 Mon Sep 17 00:00:00 2001 From: Chris Piazza Date: Fri, 24 Nov 2000 15:13:30 +0000 Subject: Clean the last commit up (....I hate gnome and wish it would go away) Submitted by: reg --- audio/gnapster/Makefile | 13 +++++++------ audio/gnapster/pkg-plist | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'audio') diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile index 7ad3adb4360d..11b81af6584b 100644 --- a/audio/gnapster/Makefile +++ b/audio/gnapster/Makefile @@ -12,10 +12,6 @@ MASTER_SITES= http://www.faradic.net/~jasta/files/ MAINTAINER= cpiazza@FreeBSD.org -.if defined(HAVE_GNOME) -LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk_pixbuf -.endif - USE_GMAKE= yes USE_X_PREFIX= yes USE_IMLIB= yes @@ -24,7 +20,12 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -.if !defined(HAVE_GNOME) +.include + +.if defined(HAVE_GNOME) +USE_GNOME= yes +LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf +.else CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf .endif @@ -35,4 +36,4 @@ pre-patch: 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' -.include +.include diff --git a/audio/gnapster/pkg-plist b/audio/gnapster/pkg-plist index cd396358b2b0..807996e611dd 100644 --- a/audio/gnapster/pkg-plist +++ b/audio/gnapster/pkg-plist @@ -1,5 +1,4 @@ bin/gnapster -%%GNOME:%%share/gnome/apps/Applications/gnapster.desktop %%DATADIR%%/gnapster/themes/cyblue.theme %%DATADIR%%/gnapster/themes/cypress.theme %%DATADIR%%/gnapster/themes/default.theme @@ -21,4 +20,5 @@ share/locale/ru/LC_MESSAGES/gnapster.mo share/locale/sv/LC_MESSAGES/gnapster.mo share/locale/tr/LC_MESSAGES/gnapster.mo @dirrm %%DATADIR%%/gnapster/themes +@dirrm %%DATADIR%%/gnapster/pixmaps @dirrm %%DATADIR%%/gnapster -- cgit v1.2.3