Update to 1.0.1.

8 files changed, 60 insertions, 44 deletions

diff --git a/x11/gtk-theme-switch/Makefile b/x11/gtk-theme-switch/Makefile
index 648d445..b6d87dd 100644
--- a/x11/gtk-theme-switch/Makefile
+++ b/x11/gtk-theme-switch/Makefile
@@ -6,21 +6,22 @@
 #
 
 PORTNAME=	gtk-theme-switch
-PORTVERSION=	0.4
+PORTVERSION=	1.0.1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.muhri.net/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-
 USE_X_PREFIX=	yes
 USE_GTK=	yes
+USE_GMAKE=	yes
+
+MAN1=		switch.1
 
 .if !defined(NOPORTDOCS)
 post-install:
 	${MKDIR} ${PREFIX}/share/gtk-theme-switch
-	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/gtk-theme-switch
+	${INSTALL_MAN} ${WRKSRC}/readme ${PREFIX}/share/gtk-theme-switch/README
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/gtk-theme-switch/distinfo b/x11/gtk-theme-switch/distinfo
index e701229..d592e19 100644
--- a/x11/gtk-theme-switch/distinfo
+++ b/x11/gtk-theme-switch/distinfo
@@ -1 +1 @@
-MD5 (gtk-theme-switch-0.4.tar.gz) = da3eff3dc43c8a1006bb0173e452a87b
+MD5 (gtk-theme-switch-1.0.1.tar.gz) = e4227b986b1def0e28d1def3d0e9b0ff
diff --git a/x11/gtk-theme-switch/files/patch-aa b/x11/gtk-theme-switch/files/patch-aa
index 43ec8b0..04632c8 100644
--- a/x11/gtk-theme-switch/files/patch-aa
+++ b/x11/gtk-theme-switch/files/patch-aa
@@ -1,25 +1,33 @@
---- Makefile.orig	Wed Aug 30 09:35:43 2000
-+++ Makefile	Thu Sep 14 09:54:48 2000
-@@ -1,7 +1,7 @@
--GCC = gcc
+
+$FreeBSD$
+
+--- Makefile.orig	Fri Apr 13 17:57:24 2001
++++ Makefile	Tue Apr 17 09:31:20 2001
+@@ -1,7 +1,8 @@
+-GCC = cc
 -PREFIX=/usr/local
--CFLAGS = -I/usr/lib/glib/include -I/usr/X11R6/include
--LIBS = -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
+-CFLAGS = -O2 -Wall $(shell gtk-config --cflags)
+-LIBS = $(shell gtk-config --libs)
 +GCC = ${CC}
 +PREFIX?=/usr/local
-+CFLAGS += `${GTK_CONFIG} --cflags`
-+LIBS = `${GTK_CONFIG} --libs`
- VERSION = 0.4
- all : gthemeswitch
++GTK_CONFIG?=gtk-config
++CFLAGS += -Wall $(shell $(GTK_CONFIG) --cflags)
++LIBS = $(shell $(GTK_CONFIG) --libs)
+ VERSION = 1.0.1
+ all: switch
  
-@@ -12,8 +12,8 @@
- 	-rm gthemeswitch *~
+@@ -12,11 +13,10 @@
+ 	-rm -f switch *~
+ 	
  install: all
-        
--	install -c gthemeswitch ${PREFIX}/bin
+-	strip switch
+ 	mkdir -p ${PREFIX}/bin
+-	mkdir -p ${PREFIX}/man
 -	install -c switch ${PREFIX}/bin
-+	${BSD_INSTALL_PROGRAM} gthemeswitch ${PREFIX}/bin
-+	${BSD_INSTALL_SCRIPT} switch ${PREFIX}/bin
+-	install -c switch.1 ${PREFIX}/man
++	mkdir -p ${PREFIX}/man/man1
++	$(BSD_INSTALL_PROGRAM) switch ${PREFIX}/bin
++	$(BSD_INSTALL_MAN) switch.1 ${PREFIX}/man/man1
  
  dist: clean
  	rm -rf /tmp/gtk-theme-switch-$(VERSION)
diff --git a/x11/gtk-theme-switch/pkg-plist b/x11/gtk-theme-switch/pkg-plist
index 1453bf3..be535c6 100644
--- a/x11/gtk-theme-switch/pkg-plist
+++ b/x11/gtk-theme-switch/pkg-plist
@@ -1,4 +1,3 @@
-bin/gthemeswitch
 bin/switch
 share/gtk-theme-switch/README
 @dirrm share/gtk-theme-switch
diff --git a/x11/gtk-theme-switch2/Makefile b/x11/gtk-theme-switch2/Makefile
index 648d445..b6d87dd 100644
--- a/x11/gtk-theme-switch2/Makefile
+++ b/x11/gtk-theme-switch2/Makefile
@@ -6,21 +6,22 @@
 #
 
 PORTNAME=	gtk-theme-switch
-PORTVERSION=	0.4
+PORTVERSION=	1.0.1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.muhri.net/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-
 USE_X_PREFIX=	yes
 USE_GTK=	yes
+USE_GMAKE=	yes
+
+MAN1=		switch.1
 
 .if !defined(NOPORTDOCS)
 post-install:
 	${MKDIR} ${PREFIX}/share/gtk-theme-switch
-	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/gtk-theme-switch
+	${INSTALL_MAN} ${WRKSRC}/readme ${PREFIX}/share/gtk-theme-switch/README
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/gtk-theme-switch2/distinfo b/x11/gtk-theme-switch2/distinfo
index e701229..d592e19 100644
--- a/x11/gtk-theme-switch2/distinfo
+++ b/x11/gtk-theme-switch2/distinfo
@@ -1 +1 @@
-MD5 (gtk-theme-switch-0.4.tar.gz) = da3eff3dc43c8a1006bb0173e452a87b
+MD5 (gtk-theme-switch-1.0.1.tar.gz) = e4227b986b1def0e28d1def3d0e9b0ff
diff --git a/x11/gtk-theme-switch2/files/patch-aa b/x11/gtk-theme-switch2/files/patch-aa
index 43ec8b0..04632c8 100644
--- a/x11/gtk-theme-switch2/files/patch-aa
+++ b/x11/gtk-theme-switch2/files/patch-aa
@@ -1,25 +1,33 @@
---- Makefile.orig	Wed Aug 30 09:35:43 2000
-+++ Makefile	Thu Sep 14 09:54:48 2000
-@@ -1,7 +1,7 @@
--GCC = gcc
+
+$FreeBSD$
+
+--- Makefile.orig	Fri Apr 13 17:57:24 2001
++++ Makefile	Tue Apr 17 09:31:20 2001
+@@ -1,7 +1,8 @@
+-GCC = cc
 -PREFIX=/usr/local
--CFLAGS = -I/usr/lib/glib/include -I/usr/X11R6/include
--LIBS = -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
+-CFLAGS = -O2 -Wall $(shell gtk-config --cflags)
+-LIBS = $(shell gtk-config --libs)
 +GCC = ${CC}
 +PREFIX?=/usr/local
-+CFLAGS += `${GTK_CONFIG} --cflags`
-+LIBS = `${GTK_CONFIG} --libs`
- VERSION = 0.4
- all : gthemeswitch
++GTK_CONFIG?=gtk-config
++CFLAGS += -Wall $(shell $(GTK_CONFIG) --cflags)
++LIBS = $(shell $(GTK_CONFIG) --libs)
+ VERSION = 1.0.1
+ all: switch
  
-@@ -12,8 +12,8 @@
- 	-rm gthemeswitch *~
+@@ -12,11 +13,10 @@
+ 	-rm -f switch *~
+ 	
  install: all
-        
--	install -c gthemeswitch ${PREFIX}/bin
+-	strip switch
+ 	mkdir -p ${PREFIX}/bin
+-	mkdir -p ${PREFIX}/man
 -	install -c switch ${PREFIX}/bin
-+	${BSD_INSTALL_PROGRAM} gthemeswitch ${PREFIX}/bin
-+	${BSD_INSTALL_SCRIPT} switch ${PREFIX}/bin
+-	install -c switch.1 ${PREFIX}/man
++	mkdir -p ${PREFIX}/man/man1
++	$(BSD_INSTALL_PROGRAM) switch ${PREFIX}/bin
++	$(BSD_INSTALL_MAN) switch.1 ${PREFIX}/man/man1
  
  dist: clean
  	rm -rf /tmp/gtk-theme-switch-$(VERSION)
diff --git a/x11/gtk-theme-switch2/pkg-plist b/x11/gtk-theme-switch2/pkg-plist
index 1453bf3..be535c6 100644
--- a/x11/gtk-theme-switch2/pkg-plist
+++ b/x11/gtk-theme-switch2/pkg-plist
@@ -1,4 +1,3 @@
-bin/gthemeswitch
 bin/switch
 share/gtk-theme-switch/README
 @dirrm share/gtk-theme-switch