Attachment 9261 Details for Bug 19030 – jx.diff

[patch] jx.diff

jx.diff (text/plain; charset=us-ascii), 2.20 KB, created by Will Andrews on 2000-06-06 00:09:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Will Andrews

Created: 2000-06-06 00:09:15 UTC

Size: 2.20 KB

patch

obsolete

>diff -urN jx/Makefile jx.new/Makefile
>--- jx/Makefile	Mon Jun  5 13:16:30 2000
>+++ jx.new/Makefile	Mon Jun  5 18:40:08 2000
>@@ -1,6 +1,6 @@
> # New ports collection makefile for:	JX
>-# Date created:		30 July 1999
>-# Whom:			Davec <davec@unforgettable.com>
>+# Date created:				30 July 1999
>+# Whom:					Davec <davec@unforgettable.com>
> #
> # $FreeBSD$
> #
>@@ -21,25 +21,21 @@
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
>-USE_XLIB=	yes
>+USE_X_PREFIX=	yes
> USE_BISON=	yes
> USE_GMAKE=	yes
> MAKE_ENV=	JX_INSTALL_ROOT="${PREFIX}/bin" \
> 		JX_LIB_ROOT="${PREFIX}/lib" \
>-		X11PREFIX="${X11PREFIX}" \
>+		X11PREFIX="${X11BASE}" \
> 		PATH="${WRKSRC}/programs/makemake:${PATH}" \
> 		PORTCFLAGS="${CFLAGS}" \
> 		PORTCXXFLAGS="${CXXFLAGS}"
> PLIST_SUB=	LIBACE="${LIBACE}" \
> 		LIBJTOOL="${LIBJTOOL}" \
> 		LIBJX="${LIBJX}" \
>-		X11PREFIX="${X11PREFIX}"
>+		X11PREFIX="${X11BASE}"
> EXTRA_PATCHES=	${WRKDIR}/patch-aa ${WRKDIR}/patch-ab
> 
>-# Proper X11R6 Prefix
>-# Change it if you need to
>-X11PREFIX?=	${X11BASE}
>-
> # Installs dir with proper permissions
> INSTALL_DATA_DIR=	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755
> # the libraries
>@@ -102,7 +98,7 @@
> 
> pre-patch:
> .for i in ${POSTPATCH_PREPROCESS_FILES}
>-	@${SED} "s!X11PREFIX!${X11PREFIX}!g" ${FILESDIR}/${i} > ${WRKDIR}/${i}
>+	@${SED} "s!X11PREFIX!${X11BASE}!g" ${FILESDIR}/${i} > ${WRKDIR}/${i}
> .endfor
> 
> post-patch:
>@@ -215,10 +211,10 @@
> 	@${INSTALL_SCRIPT} ${WRKSRC}/programs/${i} ${PREFIX}/bin
> .endfor
> .for i in ${X11R6FILES}
>-	@${INSTALL_PROGRAM} ${WRKSRC}/programs/${i} ${X11PREFIX}/bin
>+	@${INSTALL_PROGRAM} ${WRKSRC}/programs/${i} ${X11BASE}/bin
> .endfor
> .for i in ${X11R6FILES_SCRIPT}
>-	@${INSTALL_SCRIPT} ${WRKSRC}/programs/${i} ${X11PREFIX}/bin
>+	@${INSTALL_SCRIPT} ${WRKSRC}/programs/${i} ${X11BASE}/bin
> .endfor
> 
> post-install:
>diff -urN jx/pkg/PLIST jx.new/pkg/PLIST
>--- jx/pkg/PLIST	Sun Jun  4 15:14:18 2000
>+++ jx.new/pkg/PLIST	Mon Jun  5 14:29:15 2000
>@@ -1310,8 +1310,7 @@
> @dirrm include/jcore
> @dirrm include/ace/CLASSIX
> @dirrm include/ace
>-@cwd %%X11PREFIX%%
> bin/jfdesign
> bin/jxlayout
>-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
>-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
>+@exec /sbin/ldconfig -m %B
>+@unexec /sbin/ldconfig -R

Actions: View | Diff

Attachments on bug 19030: 9260 | 9261