Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Dec 2006 00:56:01 +0800 (CST)
From:      Rong-En Fan <rafan@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        troll@digitalspark.net
Subject:   ports/106072: [PATCH] emulators/vMac: Respect X11BASE, NOPORTDOCS
Message-ID:  <200611301656.kAUGu1hx018593@svm.csie.ntu.edu.tw>
Resent-Message-ID: <200611301700.kAUH0brt091602@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         106072
>Category:       ports
>Synopsis:       [PATCH] emulators/vMac: Respect X11BASE, NOPORTDOCS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 30 17:00:37 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Rong-En Fan
>Release:        FreeBSD 6.2-PRERELEASE amd64
>Organization:
NTU CSIE
>Environment:
>Description:
- Respect X11BASE
  Use GNU_CONFIGURE and correct X_CLFAGS usage in Makefile
- Respect NOPORTDOCS
- Remove unnecessary variables

Port maintainer (troll@digitalspark.net) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- vMac-0.1.9.3_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/emulators/vMac/Makefile,v
retrieving revision 1.8
diff -u -u -r1.8 Makefile
--- Makefile	4 Feb 2004 05:20:08 -0000	1.8
+++ Makefile	30 Nov 2006 16:54:17 -0000
@@ -16,30 +16,31 @@
 MAINTAINER=		troll@digitalspark.net
 COMMENT=	Emulates a MacPlus machine!  Runs MacOS versions up to 7.5.5
 
-MAKEFILE=		Makefile
 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GMAKE=	 	yes
-HAS_CONFIGURE=		yes
+GNU_CONFIGURE=		yes
 USE_XLIB=		yes
 
 pre-patch:
-	(cd ${WRKSRC} && sh ${FILESDIR}/dos2unx gemulator.c)
+	(cd ${WRKSRC} && ${SH} ${FILESDIR}/dos2unx gemulator.c)
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vMac \
 	    ${PREFIX}/bin
 	@${STRIP_CMD} ${PREFIX}/bin/vMac
-	@ ${MKDIR} ${PREFIX}/share/doc/vMac
+.if !defined(NOPORTDOCS)
+	@ ${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CREDITS \
-	    ${PREFIX}/share/doc/vMac
+	    ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/INSTALL \
-	    ${PREFIX}/share/doc/vMac
+	    ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE \
-	    ${PREFIX}/share/doc/vMac
+	    ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README \
-	    ${PREFIX}/share/doc/vMac
+	    ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.rom \
-	    ${PREFIX}/share/doc/vMac
+	    ${DOCSDIR}
+.endif
 	@${CAT} ${PKGMESSAGE} | ${SED} -e s:/usr/local:${PREFIX}:
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/emulators/vMac/pkg-plist,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 pkg-plist
--- pkg-plist	29 Aug 1999 05:51:19 -0000	1.1.1.1
+++ pkg-plist	30 Nov 2006 16:54:17 -0000
@@ -1,7 +1,7 @@
 bin/vMac
-share/doc/vMac/CREDITS
-share/doc/vMac/INSTALL
-share/doc/vMac/LICENSE
-share/doc/vMac/README
-share/doc/vMac/README.rom
-@dirrm share/doc/vMac
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.rom
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: files/patch-aa
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/emulators/vMac/files/patch-aa,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 patch-aa
--- files/patch-aa	29 Aug 1999 05:51:18 -0000	1.1.1.1
+++ files/patch-aa	30 Nov 2006 16:54:17 -0000
@@ -44,7 +44,7 @@
  .SUFFIXES: .o .c .h .m .i .S
  
 -INCLUDES=-I@top_srcdir@/Hardware/ -I@top_srcdir@/Includes -I$(X_CFLAGS) -I/usr/local/include -I.
-+INCLUDES=-I@top_srcdir@/Hardware/ -I@top_srcdir@/Includes -I$(X_CFLAGS) -I/usr/local/include -I. -I/usr/X11R6/include/
++INCLUDES=-I@top_srcdir@/Hardware/ -I@top_srcdir@/Includes $(X_CFLAGS) -I/usr/local/include -I.
  
  OBJS =	custom.o main.o prefs.o	debug.o	gemulator.o \
  	$(GFXOBJS)
@@ -142,7 +142,7 @@
 + .SUFFIXES: .o .c .h .m .i .S
 + 
 +-INCLUDES=-I@top_srcdir@/Hardware/ -I@top_srcdir@/Includes -I$(X_CFLAGS) -I/usr/local/include -I.
-++INCLUDES=-I@top_srcdir@/Hardware/ -I@top_srcdir@/Includes -I$(X_CFLAGS) -I/usr/local/include -I. -I/usr/X11R6/include/
+++INCLUDES=-I@top_srcdir@/Hardware/ -I@top_srcdir@/Includes $(X_CFLAGS) -I/usr/local/include -I.
 + 
 + OBJS =	custom.o main.o prefs.o	debug.o	gemulator.o \
 + 	$(GFXOBJS)
--- vMac-0.1.9.3_1.patch ends here ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611301656.kAUGu1hx018593>