5 files changed, 53 insertions, 27 deletions

diff --git a/x11-toolkits/xenophilia/Makefile b/x11-toolkits/xenophilia/Makefile
index f038f5a6c4e4..e1dad334494c 100644
--- a/x11-toolkits/xenophilia/Makefile
+++ b/x11-toolkits/xenophilia/Makefile
@@ -6,13 +6,16 @@
 #
 
 PORTNAME=	xenophilia
-PORTVERSION= 	0.4
+PORTVERSION= 	200012301145
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://www.obsession.se/johan/gtk/
-DISTNAME=	Xenophilia-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_THEMES}
+MASTER_SITE_SUBDIR=	gtk
+DISTNAME=	Xenophilia-1.2.x-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
+WRKSRC=		${WRKDIR}/Xenophilia-0.5
+
 USE_X_PREFIX=	yes
 USE_GTK=	yes
 ALL_TARGET=	# empty
diff --git a/x11-toolkits/xenophilia/distinfo b/x11-toolkits/xenophilia/distinfo
index 0b2fb9029017..230a32600588 100644
--- a/x11-toolkits/xenophilia/distinfo
+++ b/x11-toolkits/xenophilia/distinfo
@@ -1 +1 @@
-MD5 (Xenophilia-0.4.tar.gz) = e454b1a9b06c1bedb14ed9195cc28806
+MD5 (Xenophilia-1.2.x-200012301145.tar.gz) = 7c93a0ff40a03a0e83666de00da176b2
diff --git a/x11-toolkits/xenophilia/files/patch-aa b/x11-toolkits/xenophilia/files/patch-aa
index 0722e5031126..1501d39300a1 100644
--- a/x11-toolkits/xenophilia/files/patch-aa
+++ b/x11-toolkits/xenophilia/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Fri Mar 10 20:37:18 2000
-+++ Makefile	Thu Jun  1 11:18:35 2000
-@@ -4,12 +4,12 @@
+--- Makefile.orig	Sun Dec 10 00:22:37 2000
++++ Makefile	Mon Jan  8 02:45:58 2001
+@@ -4,12 +4,13 @@
  # Edit the entries below for your system:
  # In most cases you don't have to
  
@@ -13,46 +13,57 @@
 -CFLAGS		= `gtk-config --cflags`
 -LIBS		= `gtk-config --libs`
 +CC		?= gcc
-+CFLAGS		+= `$(GTK_CONFIG) --cflags` -fPIC -DPIC
-+LIBS		+= `$(GTK_CONFIG) --libs`
++GTK_CFLAGS	!= $(GTK_CONFIG) --cflags
++CFLAGS		+= $(GTK_CFLAGS) -fPIC -DPIC
++LIBS		!= $(GTK_CONFIG) --libs
  
  #Use these for FreeBSD:
  #PREFIX		= `gtk12-config --prefix`
-@@ -27,8 +27,8 @@
- DATA_PATH	= $(PREFIX)/share/themes
+@@ -28,8 +29,8 @@
  
- OBJECTS		= xeno_theme_draw.o xeno_theme_main.o xeno_theme_patches.o xeno_theme_color.o
--SONAME		= libxeno.so.0.4
+ OBJECTS		= xeno_theme_main.o xeno_theme_patches.o xeno_theme_draw.o xeno_theme_color.o \
+ 			  xeno_theme_images.o
+-SONAME		= libxeno.so.0.5
 -SHORTNAME	= libxeno.so.0
 +SONAME		= libxeno.so
 +SHORTNAME	= libxeno.so
  TINYNAME	= libxeno.so
- OLDNAME		= libxeno.so.0.3
+ OLDNAME		= libxeno.so.0.4
  
-@@ -37,14 +37,20 @@
+@@ -38,19 +39,25 @@
  		$(LINK) $(GTKLIBS) $(OBJECTS) -shared -Wl,-soname,$(SHORTNAME) -o $(SONAME)
  
  install-libs:	$(SONAME)
+-		install -d $(LIB_PATH)
 -		chmod 755 $(SONAME)
--		cp $(SONAME) $(LIB_PATH)
+-		cp -fdp $(SONAME) $(LIB_PATH)
 -		ln -fs $(SONAME) $(LIB_PATH)/$(SHORTNAME)
 -		ln -fs $(SONAME) $(LIB_PATH)/$(TINYNAME)
++#		install -d $(LIB_PATH)
 +#		chmod 755 $(SONAME)
-+#		cp $(SONAME) $(LIB_PATH)
++#		cp -fdp $(SONAME) $(LIB_PATH)
 +#		ln -fs $(SONAME) $(LIB_PATH)/$(SHORTNAME)
 +#		ln -fs $(SONAME) $(LIB_PATH)/$(TINYNAME)
 +		$(BSD_INSTALL_PROGRAM) $(SONAME) $(LIB_PATH)/$(SONAME)
  
  install-data:
--		cp -fR Xenophilia $(DATA_PATH)
--		cp -fR XenoThin $(DATA_PATH)
+-		cp -fdpR themes/Xenophilia $(DATA_PATH)
+-		cp -fdpR "themes/Xeno Thin" $(DATA_PATH)
+-		cp -fdpR "themes/Xeno Gradient" $(DATA_PATH)
+-		cp -fdpR "themes/Xeno Helix" $(DATA_PATH)
+-		cp -fdpR "themes/Xeno Buffed" $(DATA_PATH)
+-		ln -fs ../Xenophilia/README.html "$(DATA_PATH)/Xeno Thin/README.html"
 +		mkdir -p $(DATA_PATH)/Xenophilia/gtk
-+		mkdir -p $(DATA_PATH)/XenoThin/gtk
-+		cd Xenophilia && \
-+		$(BSD_INSTALL_DATA) README.html arrows.png buds.png buttons.png \
-+		dimple.png holes.png lines.png xeno.css $(DATA_PATH)/Xenophilia/ && \
-+		$(BSD_INSTALL_DATA) gtk/gtkrc $(DATA_PATH)/Xenophilia/gtk/
-+		$(BSD_INSTALL_DATA) XenoThin/gtk/gtkrc $(DATA_PATH)/XenoThin/gtk/
- 		ln -fs ../Xenophilia/README.html $(DATA_PATH)/XenoThin/README.html
++		cd themes/Xenophilia ; \
++			$(BSD_INSTALL_DATA) README.html arrows.png buds.png buttons.png \
++			dimple.png holes.png lines.png xeno.css $(DATA_PATH)/Xenophilia/ ; \
++			$(BSD_INSTALL_DATA) gtk/gtkrc $(DATA_PATH)/Xenophilia/gtk
++		for dir in "Xeno Thin" "Xeno Gradient" "Xeno Helix" "Xeno Buffed"; do \
++			target_dir=$(DATA_PATH)/`echo $${dir} | sed 's| ||'`/gtk ; \
++			mkdir -p $${target_dir} ; \
++			$(BSD_INSTALL_DATA) "themes/$${dir}/gtk/gtkrc" $${target_dir} ; \
++			ln -fs ../Xenophilia/README.html $${target_dir}/../ ; \
++		done
  
  install-fonts:
+ 		cp -fdp fonts/infernal-120.pcf.gz $(FONTDIR)/infernal-120.pcf.gz
diff --git a/x11-toolkits/xenophilia/pkg-descr b/x11-toolkits/xenophilia/pkg-descr
index 4bd473a93322..7f2474103be4 100644
--- a/x11-toolkits/xenophilia/pkg-descr
+++ b/x11-toolkits/xenophilia/pkg-descr
@@ -9,4 +9,4 @@ engine. The purpose is to make a clean plain look that feels professional,
 unlike many extravagant themes for GTK. Note, that "gtkrc-themes" can still be
 based on this theme. 
 
-WWW: http://www.obsession.se/johan/gtk.html
+WWW: http://gtk.themes.org/themes.phtml?themeid=935252517
diff --git a/x11-toolkits/xenophilia/pkg-plist b/x11-toolkits/xenophilia/pkg-plist
index 368b4ca7c464..95961f17b56d 100644
--- a/x11-toolkits/xenophilia/pkg-plist
+++ b/x11-toolkits/xenophilia/pkg-plist
@@ -1,4 +1,10 @@
 lib/gtk/themes/engines/libxeno.so
+share/themes/XenoBuffed/README.html
+share/themes/XenoBuffed/gtk/gtkrc
+share/themes/XenoGradient/README.html
+share/themes/XenoGradient/gtk/gtkrc
+share/themes/XenoHelix/README.html
+share/themes/XenoHelix/gtk/gtkrc
 share/themes/XenoThin/README.html
 share/themes/XenoThin/gtk/gtkrc
 share/themes/Xenophilia/README.html
@@ -14,3 +20,9 @@ share/themes/Xenophilia/xeno.css
 @dirrm share/themes/Xenophilia
 @dirrm share/themes/XenoThin/gtk
 @dirrm share/themes/XenoThin
+@dirrm share/themes/XenoHelix/gtk
+@dirrm share/themes/XenoHelix
+@dirrm share/themes/XenoGradient/gtk
+@dirrm share/themes/XenoGradient
+@dirrm share/themes/XenoBuffed/gtk
+@dirrm share/themes/XenoBuffed