From stoerte@dreamwarrior.net Sat Aug 30 04:53:40 2003 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C07A316A4DC for ; Sat, 30 Aug 2003 04:53:40 -0700 (PDT) Received: from moutvdom.kundenserver.de (moutvdom.kundenserver.de [212.227.126.250]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4F3043F93 for ; Sat, 30 Aug 2003 04:53:39 -0700 (PDT) (envelope-from stoerte@dreamwarrior.net) Received: from [212.227.126.220] (helo=mrvdomng.kundenserver.de) by moutvdom.kundenserver.de with esmtp (Exim 3.35 #1) id 19t4IV-0007Ur-00 for FreeBSD-gnats-submit@freebsd.org; Sat, 30 Aug 2003 13:53:39 +0200 Received: from [217.84.45.225] (helo=dreamwarrior.foobar.ath.cx) by mrvdomng.kundenserver.de with esmtp (Exim 3.35 #1) id 19t4IU-000494-00 for FreeBSD-gnats-submit@freebsd.org; Sat, 30 Aug 2003 13:53:38 +0200 Received: from stoerte by dreamwarrior.foobar.ath.cx with local (Exim 4.22) id 19t4IV-0001hM-Jx for FreeBSD-gnats-submit@freebsd.org; Sat, 30 Aug 2003 13:53:39 +0200 Message-Id: Date: Sat, 30 Aug 2003 13:53:39 +0200 From: Frank Ruell Reply-To: Frank Ruell To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: port update: x11-toolkits/gtk-industrial-theme X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 56184 >Category: ports >Synopsis: port update: x11-toolkits/gtk-industrial-theme >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: closed >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 30 05:00:34 PDT 2003 >Closed-Date: Sat Aug 30 16:00:06 PDT 2003 >Last-Modified: Sat Aug 30 16:00:06 PDT 2003 >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@dreamwarrior.foobar.ath.cx:/usr/obj/usr/src/sys/Dreamwarrior i386 >Description: update to 0.2.29 added a mirror cleaned out >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 Sat Aug 30 13:43:29 2003 +++ gtk-industrial-theme/Makefile Sat Aug 30 13:48:34 2003 @@ -6,8 +6,7 @@ # 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,19 @@ 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 +47,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 diff -ruN gtk-industrial-theme.orig/distinfo gtk-industrial-theme/distinfo --- gtk-industrial-theme.orig/distinfo Sat Aug 30 13:43:29 2003 +++ gtk-industrial-theme/distinfo Sat Aug 30 13:45:33 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 13:45:33 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 Sat Aug 30 13:43:29 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 Sat Aug 30 13:43:29 2003 +++ gtk-industrial-theme/pkg-plist Sat Aug 30 13:45:33 2003 @@ -1,4 +1,4 @@ lib/gtk/themes/engines/libindustrial.so share/themes/Industrial/gtk/gtkrc @dirrm share/themes/Industrial/gtk -@dirrm share/themes/Industrial +@unexec rmdir %D/share/themes/Industrial 2>/dev/null || true --- gtk-industrial-theme-0.2.29.patch ends here --- >Release-Note: >Audit-Trail: From: Frank Ruell To: freebsd-gnats-submit@FreeBSD.org Cc: Subject: Re: ports/56184: port update: x11-toolkits/gtk-industrial-theme Date: Sat, 30 Aug 2003 14:17:41 +0200 Sorry for wasting your time, this patch doesn't add a mirror. Here's the right one: (or at http://foobar.ath.cx/gtk-industrial-theme-0.2.29.patch) --- 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 Sat Aug 30 13:43:29 2003 +++ gtk-industrial-theme/Makefile Sat Aug 30 14:08:27 2003 @@ -6,10 +6,10 @@ # 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/ +MASTER_SITES= http://ftp.ximian.com/pub/xd2/redhat-9-i386/source/ \ + http://www.linux-friends.de/stoerte/FreeBSD DISTNAME= ximian-artwork-${PORTVERSION}-${XIMIAN_SUBVERSION}.ximian.${XIMIAN_DISTVERSION}.src EXTRACT_SUFX= .rpm @@ -26,17 +26,19 @@ 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 diff -ruN gtk-industrial-theme.orig/distinfo gtk-industrial-theme/distinfo --- gtk-industrial-theme.orig/distinfo Sat Aug 30 13:43:29 2003 +++ gtk-industrial-theme/distinfo Sat Aug 30 13:50:35 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 13:50:35 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 Sat Aug 30 13:43:29 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 Sat Aug 30 13:43:29 2003 +++ gtk-industrial-theme/pkg-plist Sat Aug 30 13:50:35 2003 @@ -1,4 +1,4 @@ lib/gtk/themes/engines/libindustrial.so share/themes/Industrial/gtk/gtkrc @dirrm share/themes/Industrial/gtk -@dirrm share/themes/Industrial +@unexec rmdir %D/share/themes/Industrial 2>/dev/null || true --- gtk-industrial-theme-0.2.29.patch ends here --- Frank From: Frank Ruell To: freebsd-gnats-submit@FreeBSD.org Cc: Subject: Re: ports/56184: port update: x11-toolkits/gtk-industrial-theme Date: Sat, 30 Aug 2003 15:09:19 +0200 Add also a trailing slash to the mirror URL. --- 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 Sat Aug 30 13:43:29 2003 +++ gtk-industrial-theme/Makefile Sat Aug 30 14:54:04 2003 @@ -6,10 +6,10 @@ # 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/ +MASTER_SITES= http://ftp.ximian.com/pub/xd2/redhat-9-i386/source/ \ + http://www.linux-friends.de/stoerte/FreeBSD/ DISTNAME= ximian-artwork-${PORTVERSION}-${XIMIAN_SUBVERSION}.ximian.${XIMIAN_DISTVERSION}.src EXTRACT_SUFX= .rpm @@ -26,17 +26,19 @@ 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 diff -ruN gtk-industrial-theme.orig/distinfo gtk-industrial-theme/distinfo --- gtk-industrial-theme.orig/distinfo Sat Aug 30 13:43:29 2003 +++ gtk-industrial-theme/distinfo Sat Aug 30 14:53:24 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 14:53:24 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 Sat Aug 30 13:43:29 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 Sat Aug 30 13:43:29 2003 +++ gtk-industrial-theme/pkg-plist Sat Aug 30 14:53:24 2003 @@ -1,4 +1,4 @@ lib/gtk/themes/engines/libindustrial.so share/themes/Industrial/gtk/gtkrc @dirrm share/themes/Industrial/gtk -@dirrm share/themes/Industrial +@unexec rmdir %D/share/themes/Industrial 2>/dev/null || true --- gtk-industrial-theme-0.2.29.patch ends here --- State-Changed-From-To: open->closed State-Changed-By: marcus State-Changed-When: Sat Aug 30 15:59:32 PDT 2003 State-Changed-Why: Committed, but you have to keep the Makefile as Makefile-gtk1 or our commit_prep script won't like it. http://www.freebsd.org/cgi/query-pr.cgi?pr=56184 >Unformatted: