Attachment 226117 Details for Bug 256660 – git diff for editors/aee

[patch] git diff for editors/aee

editors_aee02.diff (text/plain), 2.44 KB, created by Chris Hutchinson on 2021-06-29 18:10:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Hutchinson

Created: 2021-06-29 18:10:40 UTC

Size: 2.44 KB

patch

obsolete

>diff --git a/editors/aee/Makefile b/editors/aee/Makefile
>index 36dc131987a0..b8a20b119de8 100644
>--- a/editors/aee/Makefile
>+++ b/editors/aee/Makefile
>@@ -19,14 +19,14 @@ GL_ACCOUNT=	ports1
> GL_PROJECT=	aee
> GL_COMMIT=	bf68f4accb96ac39020ac2d9092022aebfa5df27
> 
>-OPTIONS_DEFINE=	XAE
>+#OPTIONS_DEFINE=	XAE
> 
>-XAE_DESC=		Build X11 version 'xae'
>-XAE_USES=		xorg
>-XAE_USE=		XORG=x11
>-XAE_PLIST_FILES=	bin/xae bin/rxae
>-XAE_ALL_TARGET=		xae
>-XAE_DESKTOP_ENTRIES=	"Xae" "" "" "xae" "" false
>+#XAE_DESC=		Build X11 version 'xae'
>+#XAE_USES=		xorg
>+#XAE_USE=		XORG=x11
>+#XAE_PLIST_FILES=	bin/xae bin/rxae
>+#XAE_ALL_TARGET=		xae
>+#XAE_DESKTOP_ENTRIES=	"Xae" "" "" "xae" "" false
> 
> post-patch:
> 	@${REINPLACE_CMD} -e \
>@@ -35,10 +35,13 @@ post-patch:
> 		 s|/usr/X11R6|${LOCALBASE}|g' \
> 		 ${WRKSRC}/create.mk.aee \
> 		 ${WRKSRC}/create.mk.xae
>+		 ${MKDIR} ${WRKSRC}/xae_dir
> 	@${REINPLACE_CMD} -e 's|/usr/local/lib|${DATADIR}|g' \
> 		${WRKSRC}/aee.1  \
> 		${WRKSRC}/localize.c
>-		${CHMOD} 0544 ${WRKSRC}/create.mk.aee ${WRKSRC}/create.mk.xae ${WRKSRC}/install-sh
>+		${CHMOD} 0544 ${WRKSRC}/create.mk.aee \
>+		${WRKSRC}/create.mk.xae \
>+		${WRKSRC}/install-sh
> 
> do-install:
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
>@@ -47,8 +50,8 @@ do-install:
> 	${INSTALL_MAN} ${WRKSRC}/aee.1 ${STAGEDIR}${MANPREFIX}/man/man1
> 	${INSTALL_DATA} ${WRKSRC}/help.ae ${STAGEDIR}${DATADIR}
> 
>-do-install-XAE-on:
>-	${INSTALL_PROGRAM} ${WRKSRC}/xae ${STAGEDIR}${PREFIX}/bin
>-	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} xae rxae)
>-
>+#do-install-XAE-on:
>+#	${INSTALL_PROGRAM} ${WRKSRC}/xae ${STAGEDIR}${PREFIX}/bin
>+#	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} xae rxae)
>+#
> .include <bsd.port.mk>
>diff --git a/editors/aee/files/patch-Makefile b/editors/aee/files/patch-Makefile
>index 82b386a33ea0..db75c02d2c96 100644
>--- a/editors/aee/files/patch-Makefile
>+++ b/editors/aee/files/patch-Makefile
>@@ -1,6 +1,15 @@
>---- Makefile.orig	2001-04-22 06:46:45.000000000 +0200
>-+++ Makefile	2009-03-24 15:04:53.000000000 +0100
>-@@ -23,8 +23,8 @@
>+--- Makefile.orig	2021-06-21 14:27:15.028902000 -0700
>++++ Makefile	2021-06-21 14:30:08.752240000 -0700
>+@@ -12,7 +12,7 @@
>+ # object files, and the aee and xae binaries.
>+ #
>+ 
>+-main :	localaee buildaee 
>++main :	localaee buildaee
>+ 
>+ all :	both
>+ 
>+@@ -23,14 +23,14 @@
>  
>  xae :	localxae buildxae
>  
>@@ -11,3 +20,11 @@
>  
>  localaee:
>  	@./create.mk.aee
>+ 
>+-buildxae :	
>+-	(cd xae_dir; make -f make.xae)
>++buildxae :	localxae
>++	(cd xae_dir; $(MAKE) -f make.xae)
>+ 
>+ localxae:
>+ 	@./create.mk.xae

Flags:

portmaster: maintainer-approval+

Actions: View | Diff

Attachments on bug 256660: 226117