5 files changed, 92 insertions, 114 deletions

diff --git a/x11-themes/xenophilia/Makefile b/x11-themes/xenophilia/Makefile
index 476c1b32827b..bf02310542aa 100644
--- a/x11-themes/xenophilia/Makefile
+++ b/x11-themes/xenophilia/Makefile
@@ -6,21 +6,47 @@
 #
 
 PORTNAME=	xenophilia
-PORTVERSION=	0.7
-PORTREVISION=	1
+PORTVERSION=	0.8
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	xenophilia
-DISTNAME=	xenophilia-1.2.x
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Xenophilia theme module to make GTK+ look nicer
+COMMENT=	A theme module to make GTK+ look nicer
 
-WRKSRC=		${WRKDIR}/Xenophilia-0.7
+WRKSRC=		${WRKDIR}/Xenophilia-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-ALL_TARGET=	# empty
-MAKE_ENV=	GTK-CONFIG="${GTK_CONFIG}"
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+CFLAGS+=	-DG_DISABLE_CHECKS -fPIC
+
+ENGINES_DIR=	${PREFIX}/lib/gtk/themes/engines
+THEMES_DIR=	${PREFIX}/share/themes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's| make -C| $$(MAKE) -C|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|\.@VERSION@||g ; \
+		 s|\.@MAJOR@||g' ${WRKSRC}/gtk-src/Makefile.in
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/gtk-src/libxeno.so ${ENGINES_DIR}
+	cd ${WRKSRC}/themes && ${FIND} "Xeno Buffed" | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${THEMES_DIR} 
+	cd ${WRKSRC}/themes && ${FIND} "Xeno Gradient" | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${THEMES_DIR} 
+	cd ${WRKSRC}/themes && ${FIND} "Xeno Helix" | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${THEMES_DIR} 
+	cd ${WRKSRC}/themes && ${FIND} "Xeno Perkele" | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${THEMES_DIR} 
+	cd ${WRKSRC}/themes && ${FIND} "Xeno Thin" | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${THEMES_DIR} 
+	cd ${WRKSRC}/themes && ${FIND} "Xenophilia" | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${THEMES_DIR} 
 
 .include <bsd.port.mk>
diff --git a/x11-themes/xenophilia/distinfo b/x11-themes/xenophilia/distinfo
index 754b5cf348ab..9ffac57bd7ba 100644
--- a/x11-themes/xenophilia/distinfo
+++ b/x11-themes/xenophilia/distinfo
@@ -1,2 +1,2 @@
-MD5 (xenophilia-1.2.x.tar.gz) = c6bc873959a4ea299c0c80d10f7dd109
-SIZE (xenophilia-1.2.x.tar.gz) = 101229
+MD5 (xenophilia-0.8.tar.gz) = 620127ce8e668588de2373783254a3e8
+SIZE (xenophilia-0.8.tar.gz) = 142101
diff --git a/x11-themes/xenophilia/files/patch-aa b/x11-themes/xenophilia/files/patch-aa
deleted file mode 100644
index 6c0e9c0a3ffb..000000000000
--- a/x11-themes/xenophilia/files/patch-aa
+++ /dev/null
@@ -1,74 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig	Mon Apr  9 01:16:34 2001
-+++ Makefile	Tue May 29 19:37:05 2001
-@@ -9,14 +9,15 @@
- #FONTDIR	= /usr/lib/X11/fonts/local
- 
- # Works on my Red Hat Linux system:
--GTK-CONFIG	= gtk-config
--PREFIX		= `$(GTK-CONFIG) --prefix`
-+GTK-CONFIG	?= gtk-config
-+PREFIX		?= `$(GTK-CONFIG) --prefix`
- FONTDIR		= /usr/lib/X11/fonts/misc
- 
--CC		= gcc -pipe
--CFLAGS		= -O2 -fomit-frame-pointer `$(GTK-CONFIG) --cflags` -DG_DISABLE_CHECKS
-+CC		?= gcc -pipe
-+GTK_CFLAGS	!= $(GTK-CONFIG) --cflags
-+CFLAGS		+= $(GTK_CFLAGS) -DG_DISABLE_CHECKS -fPIC
- #CFLAGS		= `$(GTK-CONFIG) --cflags`
--LIBS		= `$(GTK-CONFIG) --libs`
-+LIBS		!= $(GTK-CONFIG) --libs
- 
- 
- #-- End of Configuration --
-@@ -35,8 +36,8 @@
- OBJECTS		= xeno_theme_main.o xeno_theme_rc.o xeno_theme_style.o xeno_theme_draw.o \
- 		  xeno_theme_color.o xeno_theme_images.o xeno_theme_patches.o
- 
--SONAME		= libxeno.so.$(VERSION)
--SHORTNAME	= libxeno.so.$(MAJOR)
-+SONAME		= libxeno.so
-+SHORTNAME	= libxeno.so
- TINYNAME	= libxeno.so
- 
- #-- Targets ----------------------------------------
-@@ -44,19 +45,25 @@
- 		$(LINK) $(GTKLIBS) $(OBJECTS) -shared -Wl,-soname,$(SHORTNAME) -o $(SONAME)
- 
- install-libs:	$(SONAME)
--		install -d $(LIB_PATH)
--		chmod 755 $(SONAME)
--		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 -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 -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
-+		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-themes/xenophilia/files/patch-xeno__theme__patches.c b/x11-themes/xenophilia/files/patch-xeno__theme__patches.c
deleted file mode 100644
index e704b82ed58a..000000000000
--- a/x11-themes/xenophilia/files/patch-xeno__theme__patches.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- xeno_theme_patches.c.orig	Fri Aug  6 23:26:02 2004
-+++ xeno_theme_patches.c	Fri Aug  6 23:26:14 2004
-@@ -632,7 +632,6 @@
- 				spacing = -1;
- 				extra = -1;
- 			}
--		  nope:
- 		}
- 		dims->min_length = size;
- 	}
diff --git a/x11-themes/xenophilia/pkg-plist b/x11-themes/xenophilia/pkg-plist
index 95961f17b56d..7005ff4630ca 100644
--- a/x11-themes/xenophilia/pkg-plist
+++ b/x11-themes/xenophilia/pkg-plist
@@ -1,12 +1,50 @@
 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/Xeno Buffed/README.css
+share/themes/Xeno Buffed/README.html
+share/themes/Xeno Buffed/arrows.png
+share/themes/Xeno Buffed/buds.png
+share/themes/Xeno Buffed/buttons.png
+share/themes/Xeno Buffed/dimple.png
+share/themes/Xeno Buffed/gtk/gtkrc
+share/themes/Xeno Buffed/holes.png
+share/themes/Xeno Buffed/lines.png
+share/themes/Xeno Gradient/README.css
+share/themes/Xeno Gradient/README.html
+share/themes/Xeno Gradient/arrows.png
+share/themes/Xeno Gradient/buds.png
+share/themes/Xeno Gradient/buttons.png
+share/themes/Xeno Gradient/dimple.png
+share/themes/Xeno Gradient/gtk/gtkrc
+share/themes/Xeno Gradient/holes.png
+share/themes/Xeno Gradient/lines.png
+share/themes/Xeno Helix/README.css
+share/themes/Xeno Helix/README.html
+share/themes/Xeno Helix/arrows.png
+share/themes/Xeno Helix/buds.png
+share/themes/Xeno Helix/buttons.png
+share/themes/Xeno Helix/dimple.png
+share/themes/Xeno Helix/gtk/gtkrc
+share/themes/Xeno Helix/holes.png
+share/themes/Xeno Helix/lines.png
+share/themes/Xeno Perkele/README.css
+share/themes/Xeno Perkele/README.html
+share/themes/Xeno Perkele/arrows.png
+share/themes/Xeno Perkele/buds.png
+share/themes/Xeno Perkele/buttons.png
+share/themes/Xeno Perkele/dimple.png
+share/themes/Xeno Perkele/gtk/gtkrc
+share/themes/Xeno Perkele/holes.png
+share/themes/Xeno Perkele/lines.png
+share/themes/Xeno Thin/README.css
+share/themes/Xeno Thin/README.html
+share/themes/Xeno Thin/arrows.png
+share/themes/Xeno Thin/buds.png
+share/themes/Xeno Thin/buttons.png
+share/themes/Xeno Thin/dimple.png
+share/themes/Xeno Thin/gtk/gtkrc
+share/themes/Xeno Thin/holes.png
+share/themes/Xeno Thin/lines.png
+share/themes/Xenophilia/README.css
 share/themes/Xenophilia/README.html
 share/themes/Xenophilia/arrows.png
 share/themes/Xenophilia/buds.png
@@ -15,14 +53,15 @@ share/themes/Xenophilia/dimple.png
 share/themes/Xenophilia/gtk/gtkrc
 share/themes/Xenophilia/holes.png
 share/themes/Xenophilia/lines.png
-share/themes/Xenophilia/xeno.css
 @dirrm share/themes/Xenophilia/gtk
 @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
+@dirrm share/themes/Xeno Thin/gtk
+@dirrm share/themes/Xeno Thin
+@dirrm share/themes/Xeno Perkele/gtk
+@dirrm share/themes/Xeno Perkele
+@dirrm share/themes/Xeno Helix/gtk
+@dirrm share/themes/Xeno Helix
+@dirrm share/themes/Xeno Gradient/gtk
+@dirrm share/themes/Xeno Gradient
+@dirrm share/themes/Xeno Buffed/gtk
+@dirrm share/themes/Xeno Buffed