Attachment 38448 Details for Bug 60855 – erwn.diff

[patch] erwn.diff

erwn.diff (text/plain), 3.51 KB, created by Vincent Tantardini on 2004-01-03 13:30:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vincent Tantardini

Created: 2004-01-03 13:30:19 UTC

Size: 3.51 KB

patch

obsolete

>diff -ruN erwn.orig/Makefile erwn/Makefile
>--- erwn.orig/Makefile	Sat Jan  3 14:21:22 2004
>+++ erwn/Makefile	Sat Jan  3 14:22:47 2004
>@@ -6,23 +6,28 @@
> #
> 
> PORTNAME=	erwn
>-PORTVERSION=	0.3.1
>+PORTVERSION=	0.5
> CATEGORIES=	www editors
>-MASTER_SITES=	http://lisas.de/erwin/legacy/
>+MASTER_SITES=	http://lisas.de/erwin/
> DISTNAME=	erwin-${PORTVERSION}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Simple (at the moment) html editor based on GTK+
> 
> USE_X_PREFIX=	yes
>+GNU_CONFIGURE=	yes
> USE_GMAKE=	yes
>-USE_GNOME=	gtk12
>+USE_GNOME=	gtk20
>+USE_LIBTOOL=	yes
>+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
>+
>+MAN1=	erwin.1
> 
> post-install:
> .if !defined(NOPORTDOCS)
>-	@${ECHO} "===>   Installing README in ${PREFIX}/share/doc/erwin"
>-	@${MKDIR} ${PREFIX}/share/doc/erwin && ${CHMOD} a+rx ${PREFIX}/share/doc/erwin
>-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/erwin
>+	@${ECHO} "===>   Installing README in ${DOCSDIR}"
>+	@${MKDIR} ${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
> .endif
> 
> .include <bsd.port.mk>
>diff -ruN erwn.orig/distinfo erwn/distinfo
>--- erwn.orig/distinfo	Sat Jan  3 14:21:22 2004
>+++ erwn/distinfo	Sat Jan  3 13:47:12 2004
>@@ -1 +1 @@
>-MD5 (erwin-0.3.1.tar.gz) = 73ea4a702ecdac15551019cd7653b289
>+MD5 (erwin-0.5.tar.gz) = 34cc4ea1ff7681ef73ba2b3239753740
>diff -ruN erwn.orig/files/patch-aa erwn/files/patch-aa
>--- erwn.orig/files/patch-aa	Sat Jan  3 14:21:22 2004
>+++ erwn/files/patch-aa	Thu Jan  1 01:00:00 1970
>@@ -1,43 +0,0 @@
>---- Makefile.orig	Sun Jul 25 05:33:08 1999
>-+++ Makefile	Sat Jul  1 17:57:20 2000
>-@@ -2,14 +2,14 @@
>- bindir		= $(prefix)/bin
>- 
>- NAME		= erwin-0.3.1
>--CC		= gcc
>-+CC		?= gcc
>- PROG		= erwin
>- OBJS		= erwin.o erwinmenu.o erwinfunctions.o erwintoolbar.o \
>- 		  erwinnotebook.o erwindialogs.o erwintags.o gtkmessage.o
>- INSTALL		= install
>--DEBUG		= -g -DDEBUG
>-+DEBUG		= # -g -DDEBUG
>- 
>--CFLAGS		= -DNAME=\"$(NAME)\" $(DEBUG) -Wall -O2 -m486 -fno-strength-reduce -malign-functions=4 -malign-jumps=4 -malign-loops=4 -ffast-math -fexpensive-optimizations
>-+CFLAGS		+= -DNAME=\"$(NAME)\" $(DEBUG) -fno-strength-reduce -ffast-math -fexpensive-optimizations
>- 
>- all: license $(PROG)
>- 
>-@@ -17,8 +17,7 @@
>- 	strip $(PROG)
>- 
>- install:	strip
>--	$(INSTALL) -d $(bindir)
>--	$(INSTALL) -m 0755 $(PROG) $(bindir)
>-+	${BSD_INSTALL_PROGRAM} $(PROG) $(bindir)
>- 
>- uninstall:
>- 	
>-@@ -28,10 +27,10 @@
>- 	rm -f $(PROG) $(OBJS) *.?~ core license.h
>- 
>- $(PROG):	$(OBJS)
>--	$(CC) $(LDFLAGS) $(shell gtk-config --libs) -o $@ $(OBJS)
>-+	$(CC) $(LDFLAGS) `$(GTK_CONFIG) --libs` -o $@ $(OBJS)
>- 
>- %.o:		%.c
>--	$(CC) $(CFLAGS) $(shell gtk-config --cflags) -o $@ -c $<
>-+	$(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -o $@ -c $<
>- 
>- tar:	clean
>- 	cd ..; ln -s erwin $(NAME);tar cf - $(NAME)/* > $(NAME).tar;rm $(NAME);gzip -f $(NAME).tar
>diff -ruN erwn.orig/files/patch-configure erwn/files/patch-configure
>--- erwn.orig/files/patch-configure	Thu Jan  1 01:00:00 1970
>+++ erwn/files/patch-configure	Sat Jan  3 13:52:04 2004
>@@ -0,0 +1,10 @@
>+--- configure.orig	Sat Jan  3 13:51:30 2004
>++++ configure	Sat Jan  3 13:51:48 2004
>+@@ -5705,6 +5705,7 @@
>+ 
>+ # This can be used to rebuild libtool when needed
>+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
>++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
>+ 
>+ # Always use our own libtool.
>+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
>diff -ruN erwn.orig/pkg-plist erwn/pkg-plist
>--- erwn.orig/pkg-plist	Sat Jan  3 14:21:22 2004
>+++ erwn/pkg-plist	Sat Jan  3 14:06:22 2004
>@@ -1,3 +1,3 @@
> bin/erwin
>-share/doc/erwin/README
>-@dirrm share/doc/erwin
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 60855: 38448