[Midnightbsd-cvs] mports: Makefile: Update for fake fixes.

ctriv at midnightbsd.org ctriv at midnightbsd.org
Thu Nov 15 12:10:09 EST 2007


Log Message:
-----------
Update for fake fixes.  This may be incorrect.  We are ignoring the presence
of the fake destdir in the binary.  I have tested xemacs, and it appears to
work correctly, but my testing was not rigorous.

Modified Files:
--------------
    mports/editors/xemacs:
        Makefile (r1.6 -> r1.7)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/editors/xemacs/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L editors/xemacs/Makefile -L editors/xemacs/Makefile -u -r1.6 -r1.7
--- editors/xemacs/Makefile
+++ editors/xemacs/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xemacs
 PORTVERSION=	${XEMACS_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
@@ -17,6 +17,7 @@
 
 MAINTAINER?=	ports at MidnightBSD.org
 COMMENT?=	This port tracks the stable version of the XEmacs text editor
+LICENSE=	gpl2
 
 CONFLICTS=	emacs-19.* emacs-21.* \
 		xemacs-devel-[0-9]* 
@@ -39,18 +40,23 @@
 		--with-database=berkdb \
 		${WITH_SCROLLBARS} ${WITH_DIALOGS} ${WITH_WIDGETS} \
 		${WITH_XFACE} ${WITH_OFFIX}
-MAKE_ARGS=	prefix=${PREFIX}
 MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
 		gnuserv.1 xemacs.1
 ALL_TARGET=	all dist
 
-FAKE_MAKEARGS+=	prefix=${FAKE_DESTDIR}${PREFIX}
+FAKE_OPTS=	prefixhack
+
+SKIP_FAKE_CHECK=	bin/xemacs-${XEMACS_VER} 
 
 PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} \
 		LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
 
 .include <bsd.port.pre.mk>
 
+FAKE_MAKEARGS+=	mandir=${FAKE_DESTDIR}${MANPREFIX}/man/man1 \
+		infodir=${FAKE_DESTDIR}${PREFIX}/lib/xemacs-${XEMACS_VER}/info
+
+
 # Undump and malloc do not behave on amd64 at the moment
 .if ${ARCH} == amd64
 CONFIGURE_ARGS+=	--with-system-malloc --pdump
@@ -74,7 +80,6 @@
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 CONFIGURE_ARGS+=	--with-png --with-jpeg --with-tiff
-USE_XORG=	xbitmaps xlib xpm
 USE_XLIB=	yes
 USE_XPM=	yes
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps
@@ -141,14 +146,5 @@
 .for f in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
 	${STRIP_CMD} ${PREFIX}/bin/${f}
 .endfor
-#.if !defined(WITHOUT_X11) && ${HAVE_GNOME:Mgnomehier}!=""
-#	${INSTALL_DATA} ${WRKDIR}/xemacs.desktop \
-#		${PREFIX}/share/gnome/applications
-#.endif
-# For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.
-# Do what PLIST does for pkg_add.
-	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp
-	${CHMOD} 755 ${PREFIX}/lib/xemacs/site-lisp
-	${RM} -f ${PREFIX}/bin/send-pr
-
+	
 .include <bsd.port.post.mk>


More information about the Midnightbsd-cvs mailing list