[Midnightbsd-cvs] mports: Makefile: Switch to LOCALBASE, USE_XORG

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Jun 18 13:55:35 EDT 2008


Log Message:
-----------
Switch to LOCALBASE, USE_XORG

Modified Files:
--------------
    mports/www/nspluginwrapper:
        Makefile (r1.3 -> r1.4)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/nspluginwrapper/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L www/nspluginwrapper/Makefile -L www/nspluginwrapper/Makefile -u -r1.3 -r1.4
--- www/nspluginwrapper/Makefile
+++ www/nspluginwrapper/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	nspluginwrapper
 PORTVERSION=	0.9.91.5
+PORTREVISION=	1
 CATEGORIES=	www linux emulators
 MASTER_SITES=	http://gwenole.beauchesne.info/projects/nspluginwrapper/files/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${RPMFILE}
@@ -24,6 +25,7 @@
 
 ONLY_FOR_ARCHS=	i386 amd64
 
+USE_XORG=	x11 xlib
 USE_BZIP2=	yes
 USE_LINUX=	yes
 USE_XLIB=	yes
@@ -36,7 +38,7 @@
 HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} --target-os=linux --target-cpu=i386 \
-		--with-x11-prefix=${X11BASE} --with-cc=${CC} --with-cxx=${CXX} \
+		--with-x11-prefix=${LOCALBASE} --with-cc=${CC} --with-cxx=${CXX} \
 		--host=${ARCH}-portbld-freebsd6.0
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
@@ -52,16 +54,11 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,x86_64,amd64,g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/configure
 
 post-install:
 	${MKDIR} ${LIBDIR}/i386/linux
 	${INSTALL_SCRIPT} ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/* \
 	     ${LIBDIR}/i386/linux/
 
-.include <bsd.port.pre.mk>
-
-BUILD_DEPENDS+=	${X11BASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
-RUN_DEPENDS+=	${X11BASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>


More information about the Midnightbsd-cvs mailing list