Index: head/x11-themes/xenophilia/Makefile =================================================================== --- head/x11-themes/xenophilia/Makefile (revision 43275) +++ head/x11-themes/xenophilia/Makefile (revision 43276) @@ -1,23 +1,24 @@ # New ports collection makefile for: xenophilia # Date Created: 1 June 2000 # Whom: Maxim Sobolev # # $FreeBSD$ # PORTNAME= xenophilia -PORTVERSION= 200101251009 +PORTVERSION= 200105060708 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_THEMES} MASTER_SITE_SUBDIR= gtk DISTNAME= Xenophilia-1.2.x-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -WRKSRC= ${WRKDIR}/Xenophilia-0.6 +WRKSRC= ${WRKDIR}/Xenophilia-0.7 USE_X_PREFIX= yes USE_GTK= yes ALL_TARGET= # empty +MAKE_ENV= GTK-CONFIG="${GTK_CONFIG}" .include Property changes on: head/x11-themes/xenophilia/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/x11-themes/xenophilia/distinfo =================================================================== --- head/x11-themes/xenophilia/distinfo (revision 43275) +++ head/x11-themes/xenophilia/distinfo (revision 43276) @@ -1 +1 @@ -MD5 (Xenophilia-1.2.x-200101251009.tar.gz) = 4ce8734f8856cc71aef6cce7597ff2d2 +MD5 (Xenophilia-1.2.x-200105060708.tar.gz) = c6bc873959a4ea299c0c80d10f7dd109 Property changes on: head/x11-themes/xenophilia/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/x11-themes/xenophilia/files/patch-aa =================================================================== --- head/x11-themes/xenophilia/files/patch-aa (revision 43275) +++ head/x11-themes/xenophilia/files/patch-aa (revision 43276) @@ -1,72 +1,74 @@ $FreeBSD$ ---- Makefile.orig Thu Jan 25 13:55:15 2001 -+++ Makefile Wed Feb 7 16:01:50 2001 -@@ -4,12 +4,13 @@ - # Edit the entries below for your system: - # In most cases you don't have to +--- 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 --PREFIX = `gtk-config --prefix` --FONTDIR = /usr/lib/X11/fonts/misc -+#PREFIX = `gtk-config --prefix` -+FONTDIR = $(PREFIX)/X11/fonts/misc + # 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 -ansi --CFLAGS = -O2 `gtk-config --cflags` -DG_DISABLE_CHECKS --LIBS = `gtk-config --libs` -+CC ?= gcc -pipe -ansi -+GTK_CFLAGS != $(GTK_CONFIG) --cflags -+CFLAGS = $(GTK_CFLAGS) -DG_DISABLE_CHECKS -+LIBS != $(GTK_CONFIG) --libs +-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 + #CFLAGS = `$(GTK-CONFIG) --cflags` +-LIBS = `$(GTK-CONFIG) --libs` ++LIBS != $(GTK-CONFIG) --libs - #Use these for FreeBSD: - #PREFIX = `gtk12-config --prefix` -@@ -28,8 +29,8 @@ - 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.6 --SHORTNAME = libxeno.so.0 + #-- 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 - OLDNAME = libxeno.so.0.5 -@@ -38,19 +39,25 @@ + #-- 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 Property changes on: head/x11-themes/xenophilia/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/x11-toolkits/xenophilia/Makefile =================================================================== --- head/x11-toolkits/xenophilia/Makefile (revision 43275) +++ head/x11-toolkits/xenophilia/Makefile (revision 43276) @@ -1,23 +1,24 @@ # New ports collection makefile for: xenophilia # Date Created: 1 June 2000 # Whom: Maxim Sobolev # # $FreeBSD$ # PORTNAME= xenophilia -PORTVERSION= 200101251009 +PORTVERSION= 200105060708 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_THEMES} MASTER_SITE_SUBDIR= gtk DISTNAME= Xenophilia-1.2.x-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -WRKSRC= ${WRKDIR}/Xenophilia-0.6 +WRKSRC= ${WRKDIR}/Xenophilia-0.7 USE_X_PREFIX= yes USE_GTK= yes ALL_TARGET= # empty +MAKE_ENV= GTK-CONFIG="${GTK_CONFIG}" .include Property changes on: head/x11-toolkits/xenophilia/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/x11-toolkits/xenophilia/distinfo =================================================================== --- head/x11-toolkits/xenophilia/distinfo (revision 43275) +++ head/x11-toolkits/xenophilia/distinfo (revision 43276) @@ -1 +1 @@ -MD5 (Xenophilia-1.2.x-200101251009.tar.gz) = 4ce8734f8856cc71aef6cce7597ff2d2 +MD5 (Xenophilia-1.2.x-200105060708.tar.gz) = c6bc873959a4ea299c0c80d10f7dd109 Property changes on: head/x11-toolkits/xenophilia/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/x11-toolkits/xenophilia/files/patch-aa =================================================================== --- head/x11-toolkits/xenophilia/files/patch-aa (revision 43275) +++ head/x11-toolkits/xenophilia/files/patch-aa (revision 43276) @@ -1,72 +1,74 @@ $FreeBSD$ ---- Makefile.orig Thu Jan 25 13:55:15 2001 -+++ Makefile Wed Feb 7 16:01:50 2001 -@@ -4,12 +4,13 @@ - # Edit the entries below for your system: - # In most cases you don't have to +--- 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 --PREFIX = `gtk-config --prefix` --FONTDIR = /usr/lib/X11/fonts/misc -+#PREFIX = `gtk-config --prefix` -+FONTDIR = $(PREFIX)/X11/fonts/misc + # 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 -ansi --CFLAGS = -O2 `gtk-config --cflags` -DG_DISABLE_CHECKS --LIBS = `gtk-config --libs` -+CC ?= gcc -pipe -ansi -+GTK_CFLAGS != $(GTK_CONFIG) --cflags -+CFLAGS = $(GTK_CFLAGS) -DG_DISABLE_CHECKS -+LIBS != $(GTK_CONFIG) --libs +-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 + #CFLAGS = `$(GTK-CONFIG) --cflags` +-LIBS = `$(GTK-CONFIG) --libs` ++LIBS != $(GTK-CONFIG) --libs - #Use these for FreeBSD: - #PREFIX = `gtk12-config --prefix` -@@ -28,8 +29,8 @@ - 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.6 --SHORTNAME = libxeno.so.0 + #-- 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 - OLDNAME = libxeno.so.0.5 -@@ -38,19 +39,25 @@ + #-- 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 Property changes on: head/x11-toolkits/xenophilia/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property