ports/56172: updated port: x11-toolkits/gnome-industrial-theme

[Frank Ruell]

>Number:         56172
>Category:       ports
>Synopsis:       updated port: x11-toolkits/gnome-industrial-theme
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 29 20:30:06 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Frank Ruell
>Release:        FreeBSD 5.1-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD dreamwarrior.foobar.ath.cx 5.1-RELEASE-p2 FreeBSD 5.1-RELEASE-p2 #0: Wed Aug 20 18:32:14 CEST 2003 stoerte at dreamwarrior.foobar.ath.cx:/usr/obj/usr/src/sys/Dreamwarrior i386


>Description:
	Updated the port, made it a bit cleaner and added a mirror.
>How-To-Repeat:
>Fix:
--- gtk-industrial-theme-0.2.29.patch begins here ---
diff -ruN gtk-industrial-theme.orig/Makefile gtk-industrial-theme/Makefile
--- gtk-industrial-theme.orig/Makefile	Tue Aug 19 18:36:30 2003
+++ gtk-industrial-theme/Makefile	Sat Aug 30 05:17:00 2003
@@ -3,11 +3,10 @@
 # Whom:			Frank Ruell
 #
 # $FreeBSD: ports/x11-toolkits/gtk-industrial-theme/Makefile,v 1.4 2003/08/19 16:36:30 marcus Exp $
-#
+
 
 PORTNAME=	gtk-industrial-theme
-PORTVERSION=	0.2.26
-PORTREVISION=	2
+PORTVERSION=	0.2.29
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://ftp.ximian.com/pub/xd2/redhat-9-i386/source/
 DISTNAME=	ximian-artwork-${PORTVERSION}-${XIMIAN_SUBVERSION}.ximian.${XIMIAN_DISTVERSION}.src
@@ -26,17 +25,20 @@
 USE_LIBTOOL=	yes
 
 XIMIAN_SUBVERSION=	0
-XIMIAN_DISTVERSION=	6.1
-THEMES_SUBDIRS= ${WRKSRC}/gtk/gtk1-engine/
+XIMIAN_DISTVERSION=	6.2
+
 
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-	@if ! (cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | cpio -i ximian-artwork-${PORTVERSION}.tar.gz 2>/dev/null && ${GZIP_CMD} -dc ximian-artwork-${PORTVERSION}.tar.gz | tar -xf - && ${RM} ximian-artwork-${PORTVERSION}.tar.gz);\
+	@if ! (cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\
+		| cpio -i ximian-artwork-${PORTVERSION}.tar.gz 2>/dev/null \
+		&& ${GZIP_CMD} -dc ximian-artwork-${PORTVERSION}.tar.gz \
+		| tar -xf - && ${RM} ximian-artwork-${PORTVERSION}.tar.gz);\
 		then \
 			exit 1; \
 		fi
-	@${CP} ${FILESDIR}/Makefile-gtk1 ${WRKSRC}/gtk/gtk1-engine/Makefile
+	@${CP} ${FILESDIR}/Makefile ${WRKSRC}/gtk/gtk1-engine
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#' \
@@ -46,15 +48,13 @@
 	@${DO_NADA}
 
 do-build:
-	@for theme_dir in ${THEMES_SUBDIRS};do \
-		(cd $$theme_dir; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}); \
-	done
+	(cd ${WRKSRC}/gtk/gtk1-engine/;\
+	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/themes/Industrial && ${CHMOD} a+rx ${PREFIX}/share/themes/Industrial
-	@${MKDIR} ${PREFIX}/lib/gtk/themes/engines && ${CHMOD} a+rx ${PREFIX}/lib/gtk/themes/engines
+	@${MKDIR} ${PREFIX}/lib/gtk/themes/engines
 	@${INSTALL_PROGRAM} ${WRKSRC}/gtk/gtk1-engine/.libs/libindustrial.so ${PREFIX}/lib/gtk/themes/engines
-	@${MKDIR} ${PREFIX}/share/themes/Industrial/gtk && ${CHMOD} a+rx ${PREFIX}/share/themes/Industrial/gtk
+	@${MKDIR} ${PREFIX}/share/themes/Industrial/gtk
 	@${INSTALL_DATA} ${WRKSRC}/gtk/gtk1-engine/gtk/gtkrc ${PREFIX}/share/themes/Industrial/gtk
 
 .include <bsd.port.mk>
diff -ruN gtk-industrial-theme.orig/distinfo gtk-industrial-theme/distinfo
--- gtk-industrial-theme.orig/distinfo	Tue Aug 19 18:36:30 2003
+++ gtk-industrial-theme/distinfo	Sat Aug 30 05:17:00 2003
@@ -1 +1 @@
-MD5 (ximian-artwork-0.2.26-0.ximian.6.1.src.rpm) = 40a4b551cab97860eead3cff519e7278
+MD5 (ximian-artwork-0.2.29-0.ximian.6.2.src.rpm) = 2b0fc5b6299d1f6ca5df0769d7816265
diff -ruN gtk-industrial-theme.orig/files/Makefile gtk-industrial-theme/files/Makefile
--- gtk-industrial-theme.orig/files/Makefile	Thu Jan  1 01:00:00 1970
+++ gtk-industrial-theme/files/Makefile	Sat Aug 30 05:17:00 2003
@@ -0,0 +1,46 @@
+CC = cc
+CPP = cc -E
+CXX = c++
+CXXCPP = c++ -E
+GDK_PIXBUF_CFLAGS = `$(GDK_PIXBUF_CONFIG) --cflags`
+GDK_PIXBUF_CONFIG = /usr/X11R6/bin/gdk-pixbuf-config
+GDK_PIXBUF_LIBS = `$(GDK_PIXBUF_CONFIG) --libs`
+GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
+GTK_CONFIG = /usr/X11R6/bin/gtk12-config
+GTK_LIBS = `$(GTK_CONFIG) --libs`
+LIBTOOL = libtool
+LN_S = ln -s
+INCLUDES = $(GTK_CFLAGS) $(GDK_PIXBUF_CFLAGS)
+libdir=/usr/X11R6/lib
+enginedir = $(libdir)/gtk/themes/engines
+engine_LTLIBRARIES = libindustrial.la
+libindustrial_la_LDFLAGS = -module -avoid-version
+libindustrial_la_LIBADD = $(GTK_LIBS) $(GDK_PIXBUF_LIBS)
+EXTRA_DIST = raleigh_dot.c
+LTLIBRARIES =  $(engine_LTLIBRARIES)
+CPPFLAGS = -I/usr/local/include -I/usr/X11R6/include  -I/usr/X11R6/include -D_GETOPT_H -D_THREAD_SAFE
+LDFLAGS = 
+LIBS = -Wl,-export-dynamic -L/usr/local/lib -L/usr/X11R6/lib
+libindustrial_la_DEPENDENCIES = 
+libindustrial_la_OBJECTS =  industrial1_theme_main.lo \
+industrial_style.lo
+CFLAGS = -O2
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+all: all-am
+.SUFFIXES:
+.SUFFIXES: .S .c .lo .o .obj .s
+.c.o:
+	$(COMPILE) -c $<
+.c.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+.s.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+.S.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+libindustrial.la: $(libindustrial_la_OBJECTS) $(libindustrial_la_DEPENDENCIES)
+	$(LINK) -rpath $(enginedir) $(libindustrial_la_LDFLAGS) $(libindustrial_la_OBJECTS) $(libindustrial_la_LIBADD) $(LIBS)
+all-am: $(LTLIBRARIES)
+.NOEXPORT:
diff -ruN gtk-industrial-theme.orig/files/Makefile-gtk1 gtk-industrial-theme/files/Makefile-gtk1
--- gtk-industrial-theme.orig/files/Makefile-gtk1	Tue Aug 19 18:36:31 2003
+++ gtk-industrial-theme/files/Makefile-gtk1	Thu Jan  1 01:00:00 1970
@@ -1,46 +0,0 @@
-CC = cc
-CPP = cc -E
-CXX = c++
-CXXCPP = c++ -E
-GDK_PIXBUF_CFLAGS = `$(GDK_PIXBUF_CONFIG) --cflags`
-GDK_PIXBUF_CONFIG = /usr/X11R6/bin/gdk-pixbuf-config
-GDK_PIXBUF_LIBS = `$(GDK_PIXBUF_CONFIG) --libs`
-GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
-GTK_CONFIG = /usr/X11R6/bin/gtk12-config
-GTK_LIBS = `$(GTK_CONFIG) --libs`
-LIBTOOL = libtool
-LN_S = ln -s
-INCLUDES = $(GTK_CFLAGS) $(GDK_PIXBUF_CFLAGS)
-libdir=/usr/X11R6/lib
-enginedir = $(libdir)/gtk/themes/engines
-engine_LTLIBRARIES = libindustrial.la
-libindustrial_la_LDFLAGS = -module -avoid-version
-libindustrial_la_LIBADD = $(GTK_LIBS) $(GDK_PIXBUF_LIBS)
-EXTRA_DIST = raleigh_dot.c
-LTLIBRARIES =  $(engine_LTLIBRARIES)
-CPPFLAGS = -I/usr/local/include -I/usr/X11R6/include  -I/usr/X11R6/include -D_GETOPT_H -D_THREAD_SAFE
-LDFLAGS = 
-LIBS = -Wl,-export-dynamic -L/usr/local/lib -L/usr/X11R6/lib
-libindustrial_la_DEPENDENCIES = 
-libindustrial_la_OBJECTS =  industrial1_theme_main.lo \
-industrial_style.lo
-CFLAGS = -O2
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-all: all-am
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-.c.o:
-	$(COMPILE) -c $<
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-libindustrial.la: $(libindustrial_la_OBJECTS) $(libindustrial_la_DEPENDENCIES)
-	$(LINK) -rpath $(enginedir) $(libindustrial_la_LDFLAGS) $(libindustrial_la_OBJECTS) $(libindustrial_la_LIBADD) $(LIBS)
-all-am: $(LTLIBRARIES)
-.NOEXPORT:
diff -ruN gtk-industrial-theme.orig/pkg-plist gtk-industrial-theme/pkg-plist
--- gtk-industrial-theme.orig/pkg-plist	Tue Aug 19 18:36:30 2003
+++ gtk-industrial-theme/pkg-plist	Sat Aug 30 05:17:00 2003
@@ -1,4 +1,4 @@
 lib/gtk/themes/engines/libindustrial.so
 share/themes/Industrial/gtk/gtkrc
 @dirrm share/themes/Industrial/gtk
- at dirrm share/themes/Industrial
+ at unexec rmdir %D/share/themes/Industrial 2>/dev/null || true

--- gtk-industrial-theme-0.2.29.patch ends here ---




>Release-Note:
>Audit-Trail:
>Unformatted: