Update to 1.0.0.

PR:		ports/47494
Submitted by:	Ports Fury

5 files changed, 48 insertions, 35 deletions

diff --git a/x11/gbackground/Makefile b/x11/gbackground/Makefile
index 6861345..416d15e 100644
--- a/x11/gbackground/Makefile
+++ b/x11/gbackground/Makefile
@@ -6,21 +6,18 @@
 #
 
 PORTNAME=	gbackground
-PORTVERSION=	1.0.0.b2
-PORTREVISION=	1
+PORTVERSION=	1.0.0
+#PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://gBackGround.sourceforge.net/
-DISTNAME=	gBackGround-1.0.0-beta2
+DISTNAME=	gBackGround-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gnome Panel applet to change the background on the desktop
 
-USE_GNOME=	gnomelibs libpanel
+USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
-ALL_TARGET=	gBackGround_applet
-USE_X_PREFIX=	YES
-USE_AUTOCONF=	YES
-MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-			INSTALL_DATA="${INSTALL_DATA}"
+USE_GNOME=	libpanel
+GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/gbackground/distinfo b/x11/gbackground/distinfo
index 14e5c33..84a5f3a 100644
--- a/x11/gbackground/distinfo
+++ b/x11/gbackground/distinfo
@@ -1 +1 @@
-MD5 (gBackGround-1.0.0-beta2.tar.gz) = 218a664f8dbbd13ae16fae8246c86ff7
+MD5 (gBackGround-1.0.0.tar.gz) = 93a989d6c02ab128f3225074aa5a9842
diff --git a/x11/gbackground/files/patch-aa b/x11/gbackground/files/patch-aa
index c4c7854..e498f95 100644
--- a/x11/gbackground/files/patch-aa
+++ b/x11/gbackground/files/patch-aa
@@ -1,23 +1,38 @@
-*** Makefile.in.orig	Sat May  6 14:00:46 2000
---- Makefile.in	Sat May  6 14:01:49 2000
-***************
-*** 27,35 ****
-  
-  install:	$(TARGET) $(TARGET).gnorba $(TARGET).desktop
-  	strip -sv $(TARGET)
-! 	cp $(TARGET) $(BINDIR)
-! 	cp $(TARGET).gnorba $(GNORBADIR)
-! 	cp $(TARGET).desktop $(DESKTOPDIR)
-  
-  clean:
-  	@rm -f *.o core $(TARGET)
---- 27,35 ----
-  
-  install:	$(TARGET) $(TARGET).gnorba $(TARGET).desktop
-  	strip -sv $(TARGET)
-! 	${INSTALL_PROGRAM} $(TARGET) $(BINDIR)
-! 	${INSTALL_DATA} $(TARGET).gnorba $(GNORBADIR)
-! 	${INSTALL_DATA} $(TARGET).desktop $(DESKTOPDIR)
-  
-  clean:
-  	@rm -f *.o core $(TARGET)
+--- Makefile.in.orig	Wed Jan 10 00:38:43 2001
++++ Makefile.in	Sat Jan 25 04:30:45 2003
+@@ -1,5 +1,5 @@
+-CC = gcc
+-CFLAGS = -Wall -O2 -g `gnome-config --cflags applets`
++CC = @CC@
++CFLAGS = @CFLAGS@ `gnome-config --cflags applets`
+ LFLAGS = `gnome-config --libs applets` -lm
+ REL = `cat ./releasenum`
+ SUMMARY = Gnome applet to change your background.
+@@ -14,6 +14,10 @@
+ DESKTOPDIR = `gnome-config --datadir`/applets/Amusements/
+ DATADIR = `gnome-config --datadir`
+ 
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
++
+ SRC = gBackGround.c\
+ 	config_stuff.c\
+ 	callbacks.c\
+@@ -44,12 +48,10 @@
+ 	$(CC) -o $(PTARGET) $(POBJS) $(LFLAGS)
+ 
+ install:	$(TARGET) $(TARGET).gnorba $(TARGET).desktop $(PTARGET)
+-	strip -sv $(TARGET)
+-	strip -sv $(PTARGET)
+-	/usr/bin/install $(TARGET) $(BINDIR)
+-	/usr/bin/install $(TARGET).gnorba $(GNORBADIR)
+-	/usr/bin/install $(TARGET).desktop $(DESKTOPDIR)
+-	/usr/bin/install $(PTARGET) $(BINDIR)
++	${INSTALL_PROGRAM} $(TARGET) $(BINDIR)
++	${INSTALL_DATA} $(TARGET).gnorba $(GNORBADIR)
++	${INSTALL_DATA} $(TARGET).desktop $(DESKTOPDIR)
++	${INSTALL_DATA} $(PTARGET) $(BINDIR)
+ 
+ uninstall:
+ 	rm -f $(BINDIR)/$(TARGET)
diff --git a/x11/gbackground/pkg-descr b/x11/gbackground/pkg-descr
index 0871af1..792be7e 100644
--- a/x11/gbackground/pkg-descr
+++ b/x11/gbackground/pkg-descr
@@ -1,4 +1,4 @@
-  This is a Gnome Panel applet designed to change the
-  background on your desktop.
+This is a Gnome Panel applet designed to change the background on
+your desktop.
 
 WWW: http://gBackGround.sourceforge.net/
diff --git a/x11/gbackground/pkg-plist b/x11/gbackground/pkg-plist
index 8b6d259..6aa6e90 100644
--- a/x11/gbackground/pkg-plist
+++ b/x11/gbackground/pkg-plist
@@ -1,3 +1,4 @@
+bin/gBG_primer
 bin/gBackGround_applet
 etc/CORBA/servers/gBackGround_applet.gnorba
 share/gnome/applets/Amusements/gBackGround_applet.desktop