From owner-freebsd-ports Thu Nov 23 14:50: 8 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E159637B4C5 for ; Thu, 23 Nov 2000 14:50:02 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id OAA72608; Thu, 23 Nov 2000 14:50:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Date: Thu, 23 Nov 2000 14:50:02 -0800 (PST) Message-Id: <200011232250.OAA72608@freefall.freebsd.org> To: freebsd-ports@FreeBSD.org Cc: From: Jeremy Norris Subject: Re: ports/23049: gnapster 1.4* should be able to compile witout gnome. Reply-To: Jeremy Norris Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org The following reply was made to PR ports/23049; it has been noted by GNATS. From: Jeremy Norris To: freebsd-gnats-submit@FreeBSD.ORG Cc: Subject: Re: ports/23049: gnapster 1.4* should be able to compile witout gnome. Date: Thu, 23 Nov 2000 16:46:12 -0600 Here's a patch that makes GNOME optional in gnapster port: diff -urN gnapster/Makefile gnapster.new/Makefile --- gnapster/Makefile Sun Nov 19 13:36:47 2000 +++ gnapster.new/Makefile Thu Nov 23 16:31:43 2000 @@ -12,15 +12,21 @@ MAINTAINER= cpiazza@FreeBSD.org -LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif +.if defined(HAVE_GNOME) +LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk_pixbuf +.endif USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= yes -USE_XPM= yes +USE_IMLIB= yes +WANT_GNOME= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" + +.if !defined(HAVE_GNOME) +CONFIGURE_ARGS= --disable-gnome --disable-gdk-pixbuf +.endif pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff -urN gnapster/files/patch-ae gnapster.new/files/patch-ae --- gnapster/files/patch-ae Wed Dec 31 18:00:00 1969 +++ gnapster.new/files/patch-ae Sun Oct 22 09:26:51 2000 @@ -0,0 +1,11 @@ +--- configure.orig Sun Oct 22 09:26:22 2000 ++++ configure Sun Oct 22 09:26:41 2000 +@@ -1323,7 +1323,7 @@ + + GNAPSTER_INCLUDES="" + GNAPSTER_LDADD="" +-CFLAGS="-g" ++#CFLAGS="-g" + + + if test "$gnome" = yes; then diff -urN gnapster/files/patch-af gnapster.new/files/patch-af --- gnapster/files/patch-af Wed Dec 31 18:00:00 1969 +++ gnapster.new/files/patch-af Mon Nov 6 19:56:39 2000 @@ -0,0 +1,11 @@ +--- pixmaps/Makefile.in.orig Mon Nov 6 19:53:30 2000 ++++ pixmaps/Makefile.in Mon Nov 6 19:55:59 2000 +@@ -121,7 +121,7 @@ + + EXTRA_DIST = gnapster.png + +-pixmapdir = $(datadir)/pixmaps ++pixmapdir = $(pkgdatadir)/pixmaps + + pixmap_DATA = gnapster.png + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff -urN gnapster/pkg-plist gnapster.new/pkg-plist --- gnapster/pkg-plist Sun Nov 19 13:36:47 2000 +++ gnapster.new/pkg-plist Thu Nov 23 16:42:52 2000 @@ -1,9 +1,10 @@ bin/gnapster -share/gnome/gnapster/themes/cyblue.theme -share/gnome/gnapster/themes/cypress.theme -share/gnome/gnapster/themes/default.theme -share/gnome/gnapster/themes/faded.theme -share/gnome/pixmaps/gnapster.png +%%GNOME:%%share/gnome/apps/Applications/gnapster.desktop +%%DATADIR%%/gnapster/themes/cyblue.theme +%%DATADIR%%/gnapster/themes/cypress.theme +%%DATADIR%%/gnapster/themes/default.theme +%%DATADIR%%/gnapster/themes/faded.theme +%%DATADIR%%/pixmaps/gnapster.png share/locale/ca/LC_MESSAGES/gnapster.mo share/locale/da/LC_MESSAGES/gnapster.mo share/locale/de/LC_MESSAGES/gnapster.mo @@ -19,5 +20,5 @@ share/locale/ru/LC_MESSAGES/gnapster.mo share/locale/sv/LC_MESSAGES/gnapster.mo share/locale/tr/LC_MESSAGES/gnapster.mo -@dirrm share/gnome/gnapster/themes -@dirrm share/gnome/gnapster +@dirrm %%DATADIR%%/gnapster/themes +@dirrm %%DATADIR%%/gnapster To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message