Attachment #119091 for bug #161558

Lines 20-25 Link Here

(-)dangerdeep/Makefile (+1 lines)
20	execinfo.1:${PORTSDIR}/devel/libexecinfo	20	execinfo.1:${PORTSDIR}/devel/libexecinfo
21	RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/maps/default.xml:${PORTSDIR}/games/dangerdeep-data	21	RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/maps/default.xml:${PORTSDIR}/games/dangerdeep-data
22		22
		23	MAKE_ENV= X11BASE=${LOCALBASE}
23	USE_GL= yes	24	USE_GL= yes
24	USE_SDL= sdl mixer image net	25	USE_SDL= sdl mixer image net
25		26

Lines 16-21 Link Here

(-)dtv/Makefile (+1 lines)
16		16
17	RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84	17	RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84
18		18
		19	MAKE_ENV= X11BASE=${LOCALBASE}
19	USE_XORG= xau x11 xext xxf86dga	20	USE_XORG= xau x11 xext xxf86dga
20	NOT_FOR_ARCHS= sparc64	21	NOT_FOR_ARCHS= sparc64
21		22

Lines 17-22 Link Here

(-)eyeclock/Makefile (+1 lines)
17	COMMENT= A clock with eyes following the mouse pointer	17	COMMENT= A clock with eyes following the mouse pointer
18		18
19	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	19	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
		20	MAKE_ENV= X11BASE=${LOCALBASE}
20	USE_XORG= x11 xau xdmcp xpm xt ice	21	USE_XORG= x11 xau xdmcp xpm xt ice
21		22
22	MAN1= eyeclock.1	23	MAN1= eyeclock.1

Lines 19-24 Link Here

(-)fxtv/Makefile (+1 lines)
19	LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \	19	LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
20	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d	20	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
21		21
		22	MAKE_ENV= X11BASE=${LOCALBASE}
22	USE_XORG= ice sm x11 xaw xext xmu xt xpm xxf86vm xxf86dga	23	USE_XORG= ice sm x11 xaw xext xmu xt xpm xxf86vm xxf86dga
23	USE_GMAKE= yes	24	USE_GMAKE= yes
24	MAKE_FLAGS= -e	25	MAKE_FLAGS= -e

Lines 15-20 Link Here

(-)ishido/Makefile (+1 lines)
15	MAINTAINER= samorodi@NUXI.com	15	MAINTAINER= samorodi@NUXI.com
16	COMMENT= Tile placement game	16	COMMENT= Tile placement game
17		17
		18	MAKE_ENV= X11BASE=${LOCALBASE}
18	USE_XORG= x11	19	USE_XORG= x11
19	MAN6= ishido.6	20	MAN6= ishido.6
20		21

Lines 14-19 Link Here

(-)nadar/Makefile (+1 lines)
14	MAINTAINER= hsakai@m8.ffn.ne.jp	14	MAINTAINER= hsakai@m8.ffn.ne.jp
15	COMMENT= A network tank battle game	15	COMMENT= A network tank battle game
16		16
		17	MAKE_ENV= X11BASE=${LOCALBASE}
17	USE_XORG= xpm	18	USE_XORG= xpm
18	MAKE_JOBS_UNSAFE= yes	19	MAKE_JOBS_UNSAFE= yes
19		20

Lines 15-20 Link Here

(-)nickleby/Makefile (+1 lines)
15		15
16	MAN1= nickleby.1	16	MAN1= nickleby.1
17	MANCOMPRESSED= yes	17	MANCOMPRESSED= yes
		18	MAKE_ENV= X11BASE=${LOCALBASE}
18	USE_XORG= x11	19	USE_XORG= x11
19		20
20	PLIST_FILES= bin/nickleby	21	PLIST_FILES= bin/nickleby

Lines 18-24 Link Here

(-)nxtvepg/Makefile (-1 / +1 lines)
18	NOT_FOR_ARCHS= sparc64	18	NOT_FOR_ARCHS= sparc64
19	USE_GMAKE= yes	19	USE_GMAKE= yes
20	USE_XORG= x11 xmu	20	USE_XORG= x11 xmu
21	MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC=${WRKSRC}	21	MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC=${WRKSRC} X11BASE=${LOCALBASE}
22		22
23	MAN1= nxtvepg.1 nxtvepgd.1	23	MAN1= nxtvepg.1 nxtvepgd.1
24	MYPORTDOCS= README TODO CHANGES manual.html	24	MYPORTDOCS= README TODO CHANGES manual.html

Lines 17-22 Link Here

(-)qnetchess/Makefile (+1 lines)
17	MAKEFILE= Makefile.FreeBSD	17	MAKEFILE= Makefile.FreeBSD
18	LOCALE_FILE= "${DATADIR}/${PORTNAME}_ru"	18	LOCALE_FILE= "${DATADIR}/${PORTNAME}_ru"
19		19
		20	MAKE_ENV= X11BASE=${LOCALBASE}
20	USE_BZIP2= yes	21	USE_BZIP2= yes
21	USE_QT_VER= 3	22	USE_QT_VER= 3
22		23

Lines 7-14 Link Here

(-)talloc/Makefile (-4 / +3 lines)
7		7
8	PORTNAME= talloc	8	PORTNAME= talloc
9	PORTVERSION= 2.0.7	9	PORTVERSION= 2.0.7
10	PORTREVISION= 0
11	PORTEPOCH= 0
12	CATEGORIES= devel	10	CATEGORIES= devel
13	MASTER_SITES= ftp://ftp.samba.org/pub/%SUBDIR%/ \	11	MASTER_SITES= ftp://ftp.samba.org/pub/%SUBDIR%/ \
14	ftp://ca.samba.org/pub/%SUBDIR%/ \	12	ftp://ca.samba.org/pub/%SUBDIR%/ \
Lines 18-23 Link Here
18	MAINTAINER= timur@FreeBSD.org	16	MAINTAINER= timur@FreeBSD.org
19	COMMENT= Hierarchical pool based memory allocator	17	COMMENT= Hierarchical pool based memory allocator
20		18
		19	LICENSE= LGPL3
		20
21	CONFLICTS= samba33-3.*	21	CONFLICTS= samba33-3.*
22		22
23	USE_PYTHON_BUILD= yes	23	USE_PYTHON_BUILD= yes
Lines 28-34 Link Here
28	CONFIGURE_LOG= bin/config.log	28	CONFIGURE_LOG= bin/config.log
29	USE_GNOME= pkgconfig	29	USE_GNOME= pkgconfig
30		30
31	LICENSE= LGPL3
32	MAKE_JOBS_SAFE= yes	31	MAKE_JOBS_SAFE= yes
33		32
34	PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig	33	PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
Lines 47-53 Link Here
47		46
48	CONFIGURE_ENV+= XSLTPROC="/usr/bin/true"	47	CONFIGURE_ENV+= XSLTPROC="/usr/bin/true"
49	CONFIGURE_ENV+= NOCOLOR=yes	48	CONFIGURE_ENV+= NOCOLOR=yes
50	MAKE_ENV+= NOCOLOR=yes	49	MAKE_ENV+= NOCOLOR=yes X11BASE=${LOCALBASE}
51		50
52	CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man	51	CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man
53		52

Lines 15-20 Link Here

(-)tetrons/Makefile (+1 lines)
15		15
16	MAKE_ARGS+= -DRANDOM	16	MAKE_ARGS+= -DRANDOM
17		17
		18	MAKE_ENV= X11BASE=${LOCALBASE}
18	USE_XORG= x11 xext xi	19	USE_XORG= x11 xext xi
19	PLIST_FILES= bin/tetrons	20	PLIST_FILES= bin/tetrons
20		21

Lines 18-24 Link Here

(-)tyrquake/Makefile (-1 / +1 lines)
18	USE_GL= yes	18	USE_GL= yes
19	USE_GMAKE= yes	19	USE_GMAKE= yes
20	MAKE_JOBS_SAFE= yes	20	MAKE_JOBS_SAFE= yes
21	MAKE_ENV= QBASEDIR="${Q1DIR}"	21	MAKE_ENV= QBASEDIR="${Q1DIR}" X11BASE=${LOCALBASE}
22		22
23	OPTIONS= OPTIMIZED_CFLAGS "Enable compilation optimizations" on \	23	OPTIONS= OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
24	X86_ASM "Enable x86 assembly code when possible" on	24	X86_ASM "Enable x86 assembly code when possible" on

Lines 19-25 Link Here

(-)wmbday/Makefile (-1 / +1 lines)
19		19
20	HAS_CONFIGURE= yes	20	HAS_CONFIGURE= yes
21	MAKEFILE= BSDmakefile	21	MAKEFILE= BSDmakefile
22	MAKE_ENV+= ${CONFIGURE_ENV}	22	MAKE_ENV+= ${CONFIGURE_ENV} ${LOCALBASE}
23		23
24	MAN1= wmbday.1	24	MAN1= wmbday.1
25	MANCOMPRESSED= yes	25	MANCOMPRESSED= yes

Lines 14-19 Link Here

(-)xblood/Makefile (+1 lines)
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15	COMMENT= Makes the root window bloody	15	COMMENT= Makes the root window bloody
16		16
		17	MAKE_ENV= X11BASE=${LOCALBASE}
17	USE_XORG= x11	18	USE_XORG= x11
18	MAN1= xblood.1	19	MAN1= xblood.1
19	MANCOMPRESSED= yes	20	MANCOMPRESSED= yes

Lines 14-19 Link Here

(-)xjumpx/Makefile (+1 lines)
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15	COMMENT= Improved version of xjump	15	COMMENT= Improved version of xjump
16		16
		17	MAKE_ENV= X11BASE=${LOCALBASE}
17	USE_XORG= xpm xaw	18	USE_XORG= xpm xaw
18		19
19	MAN1= xjumpx.1	20	MAN1= xjumpx.1

Lines 14-19 Link Here

(-)xkeywrap/Makefile (+1 lines)
14	MAINTAINER= sylvio@FreeBSD.org	14	MAINTAINER= sylvio@FreeBSD.org
15	COMMENT= Record, repeat, and play key sequence from keyboard	15	COMMENT= Record, repeat, and play key sequence from keyboard
16		16
		17	MAKE_ENV= X11BASE=${LOCALBASE}
17	USE_XORG= x11 xt	18	USE_XORG= x11 xt
18	MAN1= xkeywrap.1	19	MAN1= xkeywrap.1
19	MANCOMPRESSED= yes	20	MANCOMPRESSED= yes

Lines 3-9 Link Here

(-)code2000/pkg-plist (-2 / +2 lines)
3	%%FONTSDIR%%/code2000.ttf	3	%%FONTSDIR%%/code2000.ttf
4	%%FONTSDIR%%/fonts.dir	4	%%FONTSDIR%%/fonts.dir
5	%%FONTSDIR%%/fonts.scale	5	%%FONTSDIR%%/fonts.scale
6	@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% \|\| true	6	@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% \|\| true
7	@unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null \|\| true	7	@unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null \|\| true
8	@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% 2>/dev/null \|\| true	8	@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% 2>/dev/null \|\| true
9	@dirrm %%FONTSDIR%%	9	@dirrm %%FONTSDIR%%

Lines 1-7 Link Here

(-)ctwm/files/Imakefile.local-additional (-3 lines)
1		1
2	XCOMM We might actually prefer using something from X11BASE here instead,
3	XCOMM since that's where we technically install XPM stuff (though it's
4	XCOMM the same thing as USRLIBDIR)
5	USER_XPMLIBDIR = -L$(USRLIBDIR)	2	USER_XPMLIBDIR = -L$(USRLIBDIR)
6	USER_XPMINCDIR = -I$(INCROOT)	3	USER_XPMINCDIR = -I$(INCROOT)
7		4

Lines 21-28 Link Here

(-)djview4/Makefile (-2 / +2 lines)
21	USE_QT_VER= 4	21	USE_QT_VER= 4
22	QT_COMPONENTS= gui network rcc_build uic_build moc_build qmake_build	22	QT_COMPONENTS= gui network rcc_build uic_build moc_build qmake_build
23	QT_NONSTANDARD= yes	23	QT_NONSTANDARD= yes
24	CONFIGURE_ARGS= --x-includes="${X11BASE}/include" \	24	CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" \
25	--x-libraries="${X11BASE}/lib"	25	--x-libraries="${LOCALBASE}/lib"
26	CONFIGURE_ENV= QMAKE="${LOCALBASE}/bin/qmake-qt4" \	26	CONFIGURE_ENV= QMAKE="${LOCALBASE}/bin/qmake-qt4" \
27	QMAKESPEC="${QMAKESPEC}"	27	QMAKESPEC="${QMAKESPEC}"
28	LDFLAGS+= -L${LOCALBASE}/lib	28	LDFLAGS+= -L${LOCALBASE}/lib

Lines 31-38 Link Here

(-)dtc/Makefile (-2 / +2 lines)
31	${LOCALBASE}/sbin/chrootuid:${PORTSDIR}/security/chrootuid \	31	${LOCALBASE}/sbin/chrootuid:${PORTSDIR}/security/chrootuid \
32	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \	32	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \
33	${LOCALBASE}/share/fpdf/fpdf.php:${PORTSDIR}/print/fpdf \	33	${LOCALBASE}/share/fpdf/fpdf.php:${PORTSDIR}/print/fpdf \
34	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \	34	${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
35	${X11BASE}/lib/X11/fonts/webfonts/verdana.ttf:${PORTSDIR}/x11-fonts/webfonts \	35	${LOCALBASE}/lib/X11/fonts/webfonts/verdana.ttf:${PORTSDIR}/x11-fonts/webfonts \
36	${LOCALBASE}/bin/mhonarc:${PORTSDIR}/www/mhonarc \	36	${LOCALBASE}/bin/mhonarc:${PORTSDIR}/www/mhonarc \
37	${LOCALBASE}/bin/mlmmj-list:${PORTSDIR}/mail/mlmmj \	37	${LOCALBASE}/bin/mlmmj-list:${PORTSDIR}/mail/mlmmj \
38	${LOCALBASE}/bin/ncftpput:${PORTSDIR}/ftp/ncftp3 \	38	${LOCALBASE}/bin/ncftpput:${PORTSDIR}/ftp/ncftp3 \

Lines 127-134 Link Here

(-)ghostscript7/Makefile (-2 / +2 lines)
127	. endif	127	. endif
128	USE_XORG= xt xext	128	USE_XORG= xt xext
129	CONFIGURE_ARGS+=--with-x \	129	CONFIGURE_ARGS+=--with-x \
130	--x-includes=${X11BASE}/include \	130	--x-includes=${LOCALBASE}/include \
131	--x-libraries=${X11BASE}/lib	131	--x-libraries=${LOCALBASE}/lib
132	CONFLICTS_INSTALL+= ghostscript7-nox11-[0-9]*	132	CONFLICTS_INSTALL+= ghostscript7-nox11-[0-9]*
133	.else	133	.else
134	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nox11	134	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nox11

Lines 115-122 Link Here

(-)ghostscript8/files/Makefile.drivers_post (-2 / +2 lines)
115	.if defined(_X11_DEVS)	115	.if defined(_X11_DEVS)
116	USE_XORG= xt xext	116	USE_XORG= xt xext
117	CONFIGURE_ARGS+=--with-x \	117	CONFIGURE_ARGS+=--with-x \
118	--x-includes=${X11BASE}/include \	118	--x-includes=${LOCALBASE}/include \
119	--x-libraries=${X11BASE}/lib	119	--x-libraries=${LOCALBASE}/lib
120	CONFLICTS_INSTALL+= ghostscript8-nox11-[0-9]*	120	CONFLICTS_INSTALL+= ghostscript8-nox11-[0-9]*
121	.if defined(WITH_GTK)	121	.if defined(WITH_GTK)
122	USE_GNOME= atk gdkpixbuf2 glib20 gtk20	122	USE_GNOME= atk gdkpixbuf2 glib20 gtk20

Lines 116-123 Link Here

(-)ghostscript9/files/Makefile.drivers_post (-2 / +2 lines)
116	USE_XORG= xt xext	116	USE_XORG= xt xext
117	X11BITS= ""	117	X11BITS= ""
118	CONFIGURE_ARGS+=--with-x \	118	CONFIGURE_ARGS+=--with-x \
119	--x-includes=${X11BASE}/include \	119	--x-includes=${LOCALBASE}/include \
120	--x-libraries=${X11BASE}/lib	120	--x-libraries=${LOCALBASE}/lib
121	CONFLICTS_INSTALL+= ghostscript9-nox11-[0-9]*	121	CONFLICTS_INSTALL+= ghostscript9-nox11-[0-9]*
122	.if defined(WITH_GTK)	122	.if defined(WITH_GTK)
123	USE_GNOME= atk gdkpixbuf2 glib20 gtk20	123	USE_GNOME= atk gdkpixbuf2 glib20 gtk20

Lines 36-42 Link Here

(-)glfw/Makefile (-1 / +1 lines)
36		36
37	post-patch:	37	post-patch:
38	@${REINPLACE_CMD} -e \	38	@${REINPLACE_CMD} -e \
39	's\|/usr/X11R6\|${X11BASE}\| ; \	39	's\|/usr/X11R6\|${LOCALBASE}\| ; \
40	/CFLAGS_THREAD/s\|"-pthread"\|"${PTHREAD_CFLAGS}"\| ; \	40	/CFLAGS_THREAD/s\|"-pthread"\|"${PTHREAD_CFLAGS}"\| ; \
41	/LFLAGS_THREAD/s\|"-pthread"\|"${PTHREAD_LIBS}"\|' ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	41	/LFLAGS_THREAD/s\|"-pthread"\|"${PTHREAD_LIBS}"\|' ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
42	@${REINPLACE_CMD} -e \	42	@${REINPLACE_CMD} -e \

Lines 36-42 Link Here

(-)gpac-libgpac/Makefile (-1 / +1 lines)
36	CFLAGS+= -I${LOCALBASE}/include	36	CFLAGS+= -I${LOCALBASE}/include
37	LDFLAGS+= -L${LOCALBASE}/lib	37	LDFLAGS+= -L${LOCALBASE}/lib
38		38
39	CONFIGURE_ARGS= --cc="${CC}" --X11-path="${X11BASE}" \	39	CONFIGURE_ARGS= --cc="${CC}" --X11-path="${LOCALBASE}" \
40	--extra-cflags="${CFLAGS}" --extra-ldflags="${LDFLAGS}" \	40	--extra-cflags="${CFLAGS}" --extra-ldflags="${LDFLAGS}" \
41	--enable-pic \	41	--enable-pic \
42	--use-js=no --use-a52=no --use-faad=no --use-ffmpeg=no \	42	--use-js=no --use-a52=no --use-faad=no --use-ffmpeg=no \

Lines 39-45 Link Here

(-)kmflcomp/Makefile (-1 / +1 lines)
39	post-patch:	39	post-patch:
40	@${REINPLACE_CMD} -e 's\|^install-data-am: install-kmflcompdocDATA\|install-data-am:\|' \	40	@${REINPLACE_CMD} -e 's\|^install-data-am: install-kmflcompdocDATA\|install-data-am:\|' \
41	${WRKSRC}/Makefile.in	41	${WRKSRC}/Makefile.in
42	@${REINPLACE_CMD} -e 's\|-L/usr/X11R6/lib\|-L${X11BASE}/lib\|' \	42	@${REINPLACE_CMD} -e 's\|-L/usr/X11R6/lib\|-L${LOCALBASE}/lib\|' \
43	${WRKSRC}/kmfl_compiler/Makefile.in	43	${WRKSRC}/kmfl_compiler/Makefile.in
44	@${REINPLACE_CMD} -E 's,(VERSION= *)"0\.9\.7",\1"0.9.9",' \	44	@${REINPLACE_CMD} -E 's,(VERSION= *)"0\.9\.7",\1"0.9.9",' \
45	${WRKSRC}/kmfl_compiler/kmfl_compiler.c	45	${WRKSRC}/kmfl_compiler/kmfl_compiler.c

Lines 129-137 Link Here

(-)linux-mplayer-plugin/Makefile.npapi (-2 / +2 lines)
129	.endfor	129	.endfor
130		130
131	NPAPI_APPS?= ${USE_NPAPI_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:Nopera} \	131	NPAPI_APPS?= ${USE_NPAPI_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:Nopera} \
132	${USE_NPAPI_EXP:S.^.${X11BASE}/lib/.:S.$./plugins.:Nopera} \	132	${USE_NPAPI_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:Nopera} \
133	${USE_NPAPI_EXP:S.^.${LOCALBASE}/share/.:S.$./plugins.:M/opera} \	133	${USE_NPAPI_EXP:S.^.${LOCALBASE}/share/.:S.$./plugins.:M/opera} \
134	${USE_NPAPI_EXP:S.^.${X11BASE}/share/.:S.$./plugins.:M/opera}	134	${USE_NPAPI_EXP:S.^.${LOCALBASE}/share/.:S.$./plugins.:M/opera}
135	NPAPI_SLDIRS_ALL= ${NPAPI_APPS_ALL:S.^.${NPAPI_SLDIR}/.}	135	NPAPI_SLDIRS_ALL= ${NPAPI_APPS_ALL:S.^.${NPAPI_SLDIR}/.}
136	NPAPI_SLDIRS= ${USE_NPAPI_EXP:S.^.${NPAPI_SLDIR}/.}	136	NPAPI_SLDIRS= ${USE_NPAPI_EXP:S.^.${NPAPI_SLDIR}/.}
137	NPAPI_LINKFARMS= ${NPAPI_APPS} ${NPAPI_SLDIRS}	137	NPAPI_LINKFARMS= ${NPAPI_APPS} ${NPAPI_SLDIRS}

Lines 168-174 Link Here

(-)linux_base-f10/Makefile (-1 / +1 lines)
168	#	168	#
169	# Create a good ld.so.conf and touch ld.so.cache	169	# Create a good ld.so.conf and touch ld.so.cache
170	#	170	#
171	@${ECHO_CMD} -e '/lib\n/usr/lib\n${X11BASE}/lib' >> \	171	@${ECHO_CMD} -e '/lib\n/usr/lib\n${LOCALBASE}/lib' >> \
172	${WRKSRC}/etc/ld.so.conf	172	${WRKSRC}/etc/ld.so.conf
173	@${TOUCH} ${WRKSRC}/etc/ld.so.cache	173	@${TOUCH} ${WRKSRC}/etc/ld.so.cache
174	#	174	#

Lines 145-151 Link Here

(-)linux_base-fc4/Makefile (-1 / +1 lines)
145	#	145	#
146	# Create a good ld.so.conf and touch ld.so.cache	146	# Create a good ld.so.conf and touch ld.so.cache
147	#	147	#
148	@${ECHO_CMD} -e '/lib\n/usr/lib\n${X11BASE}/lib' >> \	148	@${ECHO_CMD} -e '/lib\n/usr/lib\n${LOCALBASE}/lib' >> \
149	${WRKSRC}/etc/ld.so.conf	149	${WRKSRC}/etc/ld.so.conf
150	@${TOUCH} ${WRKSRC}/etc/ld.so.cache	150	@${TOUCH} ${WRKSRC}/etc/ld.so.cache
151	#	151	#

Lines 22-25 Link Here

(-)linuxlibertine/pkg-plist (-1 / +1 lines)
22	%%PORTDOCS%%@dirrm %%DOCSDIR%%	22	%%PORTDOCS%%@dirrm %%DOCSDIR%%
23	@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null \|\| /usr/bin/true	23	@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null \|\| /usr/bin/true
24	@dirrm %%FONTSDIR%%	24	@dirrm %%FONTSDIR%%
25	@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% \|\| /usr/bin/true	25	@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% \|\| /usr/bin/true





# I will remove WITH_PLUGINS knob.
.if		defined(WITH_REALPLAYER)
RUN_DEPENDS+=	${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.so:${PORTSDIR}/multimedia/linux-realplayer
WITH_PLUGINS=	1
.endif


post-build:
	@${SED} -e 's,%%PREFIX%%,${PREFIX},' \
		-e 's,%%LOCALBASE%%,${LOCALBASE},' \
		-e 's,%%X11BASE%%,${LOCALBASE},' \
		-e 's,%%LTHREADSHMAJOR%%,${LTHREADSHMAJOR},' \
		-e 's,%%LIBMAPCONF%%,${LIBMAPCONF},' \
		< ${.CURDIR}/pkg-message > ${PKGMESSAGE}


.if		defined(WITH_PLUGINS)
pre-install:
	@${MKDIR} ${LOCALBASE}/lib/browser_linux_plugins
.if		defined(WITH_REALPLAYER)
	@${LN} -sf ${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.so \
		${LOCALBASE}/lib/browser_linux_plugins/
	@${LN} -sf ${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.xpt \
		${LOCALBASE}/lib/browser_linux_plugins/
.endif
.endif


Lines 12-22 Link Here

(-)linuxpluginwrapper/pkg-plist (-6 / +6 lines)
12	%%EXAMPLESDIR%%/libmap.conf-FreeBSD5-stable	12	%%EXAMPLESDIR%%/libmap.conf-FreeBSD5-stable
13	%%EXAMPLESDIR%%/libmap.conf-FreeBSD5-current	13	%%EXAMPLESDIR%%/libmap.conf-FreeBSD5-current
14	%%EXAMPLESDIR%%/libmap.conf-FreeBSD4.x	14	%%EXAMPLESDIR%%/libmap.conf-FreeBSD4.x
15	@unexec /bin/rm -f %%X11BASE%%/lib/browser_linux_plugins/nphelix.so	15	@unexec /bin/rm -f %%LOCALBASE%%/lib/browser_linux_plugins/nphelix.so
16	@unexec /bin/rm -f %%X11BASE%%/lib/browser_linux_plugins/nphelix.xpt	16	@unexec /bin/rm -f %%LOCALBASE%%/lib/browser_linux_plugins/nphelix.xpt
17	@unexec /bin/rmdir %%X11BASE%%/lib/browser_linux_plugins 2>/dev/null \|\| true	17	@unexec /bin/rmdir %%LOCALBASE%%/lib/browser_linux_plugins 2>/dev/null \|\| true
18	@exec /bin/mkdir -p %%X11BASE%%/lib/browser_linux_plugins 2>/dev/null \|\| true	18	@exec /bin/mkdir -p %%LOCALBASE%%/lib/browser_linux_plugins 2>/dev/null \|\| true
19	@exec /bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.so %%X11BASE%%/lib/browser_linux_plugins/	19	@exec /bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.so %%LOCALBASE%%/lib/browser_linux_plugins/
20	@exec /bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.xpt %%X11BASE%%/lib/browser_linux_plugins/	20	@exec /bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.xpt %%LOCALBASE%%/lib/browser_linux_plugins/
21	@dirrm lib/pluginwrapper	21	@dirrm lib/pluginwrapper
22	@dirrm %%EXAMPLESDIR%%	22	@dirrm %%EXAMPLESDIR%%

Lines 25-28 Link Here

(-)moveable-type-fonts/pkg-plist (-1 / +1 lines)
25	%%FONTSDIR%%/raleway_thin.ttf	25	%%FONTSDIR%%/raleway_thin.ttf
26	@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null \|\| /usr/bin/true	26	@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null \|\| /usr/bin/true
27	@dirrm %%FONTSDIR%%	27	@dirrm %%FONTSDIR%%
28	@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% \|\| /usr/bin/true	28	@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% \|\| /usr/bin/true

Lines 76-82 Link Here

(-)mpich2/Makefile (-1 / +1 lines)
76	WITHOUT_JAVA= yes	76	WITHOUT_JAVA= yes
77	PLIST_SUB+= X11="@comment "	77	PLIST_SUB+= X11="@comment "
78	.else	78	.else
79	CONFIGURE_ARGS+= --x-includes=${X11BASE}/include --x-libraries==${X11BASE}/lib	79	CONFIGURE_ARGS+= --x-includes=${LOCALBASE}/include --x-libraries==${LOCALBASE}/lib
80	USE_XORG= x11 xt	80	USE_XORG= x11 xt
81	PLIST_SUB+= X11=${PLX11}	81	PLIST_SUB+= X11=${PLX11}
82	.endif	82	.endif

Lines 101-107 Link Here

(-)plan9port/Makefile (-1 / +1 lines)
101	post-patch:	101	post-patch:
102	@${FIND} ${WRKSRC}/man -type f -regex ".*\.[0-9?]$\" \	102	@${FIND} ${WRKSRC}/man -type f -regex ".*\.[0-9?]$\" \
103	\| ${XARGS} ${REINPLACE_CMD} -e 's\|\\\*9\|${PLAN9}\|'	103	\| ${XARGS} ${REINPLACE_CMD} -e 's\|\\\*9\|${PLAN9}\|'
104	@${REINPLACE_CMD} -e 's\|X11=/usr/X11R6\|X11=${X11BASE}\|' \	104	@${REINPLACE_CMD} -e 's\|X11=/usr/X11R6\|X11=${LOCALBASE}\|' \
105	${WRKSRC}/bin/9l ${WRKSRC}/src/cmd/devdraw/mkwsysrules.sh	105	${WRKSRC}/bin/9l ${WRKSRC}/src/cmd/devdraw/mkwsysrules.sh
106	@${REINPLACE_CMD} -e 's\|/lib/font/bit\|${PLAN9}/font\|' \	106	@${REINPLACE_CMD} -e 's\|/lib/font/bit\|${PLAN9}/font\|' \
107	${WRKSRC}/src/cmd/acme/acme.c	107	${WRKSRC}/src/cmd/acme/acme.c




# Various directory definitions and variables to control them.
# You rarely need to redefine any of these except WRKSRC and NO_WRKSUBDIR.
#
# X11BASE		- Where X11 ports install things.
#				  Default: ${LOCALBASE}
# LOCALBASE		- Where non-X11 ports install things.
#				  Default: /usr/local
# LINUXBASE		- Where Linux ports install things.

# by individual Makefiles or local system make configuration.
PORTSDIR?=		/usr/ports
LOCALBASE?=		/usr/local
X11BASE?=		${LOCALBASE}
LINUXBASE?=		/compat/linux
DISTDIR?=		${PORTSDIR}/distfiles
_DISTDIR?=		${DISTDIR}/${DIST_SUBDIR}

.include "${PORTSDIR}/Mk/bsd.linux-apps.mk"
.endif

.if ${X11BASE} != ${LOCALBASE}
.BEGIN:
	@${ECHO_MSG} "X11BASE is now deprecated.  Unset X11BASE in make.conf and try again."
	@${FALSE}
.endif

.if defined(USE_XORG) || defined(XORG_CAT)
.include "${PORTSDIR}/Mk/bsd.xorg.mk"
.endif

BUILD_WRKSRC?=	${WRKSRC}
INSTALL_WRKSRC?=${WRKSRC}

PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} 
SUB_LIST+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
		DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \
		WWWDIR=${WWWDIR} ETCDIR=${ETCDIR}



.if defined(USE_DISPLAY) && !defined(DISPLAY)
BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
	${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \
	${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT} \
	${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
	xkbcomp:${PORTSDIR}/x11/xkbcomp
.if !defined(PACKAGE_BUILDING)
CONFIGURE_ENV+=	DISPLAY="localhost:1001"

.	if defined(USE_LINUX)
RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-xorg-libs
.	else
BUILD_DEPENDS+=	${LOCALBASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
RUN_DEPENDS+=	${LOCALBASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
.	endif
.endif

.if defined(USE_XLIB) || defined(USE_XORG)
# Add explicit X options to avoid problems with false positives in configure
.if defined(GNU_CONFIGURE)
CONFIGURE_ARGS+=--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
.endif
.endif


MAKE_FLAGS?=	-f
MAKEFILE?=		Makefile
MAKE_ENV+=		PREFIX=${PREFIX} \
			LOCALBASE=${LOCALBASE} \
			MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" \
			CC="${CC}" CFLAGS="${CFLAGS}" \
			CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \

# where pkg_add records its dirty deeds.
PKG_DBDIR?=		/var/db/pkg

MOTIFLIB?=	-L${LOCALBASE}/lib -lXm -lXp

ALL_TARGET?=		all
INSTALL_TARGET?=	install

SCRIPTS_ENV+=	CURDIR=${MASTERDIR} DISTDIR=${DISTDIR} \
		  WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \
		  SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \
		  PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} 
		  X11BASE=${X11BASE}

.if defined(BATCH)
SCRIPTS_ENV+=	BATCH=yes

	  DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} \
	  PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
	  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
	  BUILD_DEPENDS="${BUILD_DEPENDS}" RUN_DEPENDS="${RUN_DEPENDS}" \
	  CONFLICTS="${CONFLICTS}" \
	${ALL_HOOK}
.endif

.endif
.if (${PREFIX} != "/usr")
	@${ECHO_CMD} "@unexec if [ -f %D/${INFO_PATH}/dir ]; then if sed -e '1,/Menu:/d' %D/${INFO_PATH}/dir | grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST}
.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE})
	@${ECHO_CMD} "@unexec rmdir %D/${INFO_PATH} 2>/dev/null || true" >> ${TMPPLIST}
.endif
.endif

# deinstall-time
.if !target(add-plist-post)
add-plist-post:
.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
	@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST}
.else
	@${DO_NADA}

Lines 5-11 Link Here

(-)qt4-pgsql-plugin/files/Makefile.bsd (-1 / +1 lines)
5	-I${QT_INCDIR} \	5	-I${QT_INCDIR} \
6	-I${QT_INCDIR}/Qt \	6	-I${QT_INCDIR}/Qt \
7	-I${LOCALBASE}/include/postgresql/server \	7	-I${LOCALBASE}/include/postgresql/server \
8	-I${LOCALBASE}/include -I${X11BASE}/include \	8	-I${LOCALBASE}/include \
9	${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \	9	${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
10	-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \	10	-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
11	-D_LARGEFILE_SOURCE -DQT_SHARED	11	-D_LARGEFILE_SOURCE -DQT_SHARED

Lines 37-46 Link Here

(-)scrotwm/Makefile (-3 / +3 lines)
37	@${REINPLACE_CMD} -e 's\|/etc/\|${PREFIX}/etc/\|g' ${WRKSRC}/scrotwm.*	37	@${REINPLACE_CMD} -e 's\|/etc/\|${PREFIX}/etc/\|g' ${WRKSRC}/scrotwm.*
38		38
39	do-build:	39	do-build:
40	${CC} ${CFLAGS} -I${X11BASE}/include \	40	${CC} ${CFLAGS} -I${LOCALBASE}/include \
41	-I${WRKSRC}/linux -lutil -L${X11BASE}/lib -lX11 -lXrandr -lXtst \	41	-I${WRKSRC}/linux -lutil -L${LOCALBASE}/lib -lX11 -lXrandr -lXtst \
42	-o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c	42	-o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
43	${CC} ${CFLAGS} -I${X11BASE}/include -shared -fPIC \	43	${CC} ${CFLAGS} -I${LOCALBASE}/include -shared -fPIC \
44	-o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c	44	-o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c
45		45
46	do-install:	46	do-install:

Lines 117-127 Link Here

(-)timidity++/Makefile.interface (-3 / +3 lines)
117	${INSTALL_DATA} ${WRKSRC}/interface/timidity.el ${PREFIX}/${ELISPDIR}	117	${INSTALL_DATA} ${WRKSRC}/interface/timidity.el ${PREFIX}/${ELISPDIR}
118	.endif	118	.endif
119	.if ${INTERFACE} == "xaw"	119	.if ${INTERFACE} == "xaw"
120	@${MKDIR} ${X11BASE}/lib/X11/${EUCJP_LOCALE}/app-defaults	120	@${MKDIR} ${LOCALBASE}/lib/X11/${EUCJP_LOCALE}/app-defaults
121	${INSTALL_DATA} ${WRKSRC}/TiMidity.ad \	121	${INSTALL_DATA} ${WRKSRC}/TiMidity.ad \
122	${X11BASE}/lib/X11/app-defaults/TiMidity	122	${LOCALBASE}/lib/X11/app-defaults/TiMidity
123	${INSTALL_DATA} ${WRKSRC}/TiMidity-uj.ad \	123	${INSTALL_DATA} ${WRKSRC}/TiMidity-uj.ad \
124	${X11BASE}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity	124	${LOCALBASE}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity
125	.endif	125	.endif
126	.if defined(LINK)	126	.if defined(LINK)
127	${LN} -sf ${PREFIX}/bin/timidity ${PREFIX}/bin/${LINK}	127	${LN} -sf ${PREFIX}/bin/timidity ${PREFIX}/bin/${LINK}

Lines 16-22 Link Here

(-)timidity++-motif/Makefile (-1 / +1 lines)
16		16
17	post-configure:	17	post-configure:
18	@${MV} ${WRKSRC}/interface/Makefile ${WRKSRC}/interface/Makefile.orig	18	@${MV} ${WRKSRC}/interface/Makefile ${WRKSRC}/interface/Makefile.orig
19	@${SED} -e 's^m_so_libs = $$^m_so_libs = -L${X11BASE}/lib ${MOTIFLIB} -lXt -lXext -lSM -lICE -lX11 ^' \	19	@${SED} -e 's^m_so_libs = $$^m_so_libs = -L${LOCALBASE}/lib ${MOTIFLIB} -lXt -lXext -lSM -lICE -lX11 ^' \
20	-e 's^dynamic_targets = $$^dynamic_targets = interface_m.so^' \	20	-e 's^dynamic_targets = $$^dynamic_targets = interface_m.so^' \
21	${WRKSRC}/interface/Makefile.orig > ${WRKSRC}/interface/Makefile	21	${WRKSRC}/interface/Makefile.orig > ${WRKSRC}/interface/Makefile
22		22

Lines 1-4 Link Here

(-)timidity++-xaw/pkg-plist (-2 / +2 lines)
1	@cwd %%X11BASE%%	1	@cwd %%LOCALBASE%%
2	lib/X11/app-defaults/TiMidity	2	lib/X11/app-defaults/TiMidity
3	lib/X11/%%EUCJP_LOCALE%%/app-defaults/TiMidity	3	lib/X11/%%EUCJP_LOCALE%%/app-defaults/TiMidity
4	@cwd %%REALPREFIX%%	4	@cwd %%REALPREFIX%%
Lines 18-23 Link Here
18	%%PORTDOCS%%%%DOCSDIR%%/README.xaw	18	%%PORTDOCS%%%%DOCSDIR%%/README.xaw
19	%%PORTDOCS%%share/doc/ja/timidity++/README.xaw	19	%%PORTDOCS%%share/doc/ja/timidity++/README.xaw
20	@dirrm %%TIMID_LIBDIR%%/bitmaps	20	@dirrm %%TIMID_LIBDIR%%/bitmaps
21	@cwd %%X11BASE%%	21	@cwd %%LOCALBASE%%
22	@dirrmtry lib/X11/%%EUCJP_LOCALE%%/app-defaults	22	@dirrmtry lib/X11/%%EUCJP_LOCALE%%/app-defaults
23	@dirrmtry lib/X11/%%EUCJP_LOCALE%%	23	@dirrmtry lib/X11/%%EUCJP_LOCALE%%

Lines 54-60 Link Here

(-)vnc/Makefile (-1 / +1 lines)
54		54
55	RUN_DEPENDS+= xauth:${PORTSDIR}/x11/xauth \	55	RUN_DEPENDS+= xauth:${PORTSDIR}/x11/xauth \
56	${PREFIX}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${X_FONTS_MISC_PORT} \	56	${PREFIX}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${X_FONTS_MISC_PORT} \
57	${X11BASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT}	57	${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT}
58		58
59	USE_PERL5= yes	59	USE_PERL5= yes
60		60

Lines 44-50 Link Here

(-)xephem/Makefile (-1 / +1 lines)
44		44
45	post-patch:	45	post-patch:
46	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|' \	46	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|' \
47	-e 's\|/usr/X11R6\|${X11BASE}\|g' \	47	-e 's\|/usr/X11R6\|${LOCALBASE}\|g' \
48	${WRKSRC}/Makefile	48	${WRKSRC}/Makefile
49	@${FIND} ${WRKSRC}/../.. -name Makefile -type f \| \	49	@${FIND} ${WRKSRC}/../.. -name Makefile -type f \| \
50	${XARGS} ${REINPLACE_CMD} -e 's\|CC =\|CC?=\|g ; \	50	${XARGS} ${REINPLACE_CMD} -e 's\|CC =\|CC?=\|g ; \

Lines 33-39 Link Here

(-)xmlcatmgr/Makefile (-1 / +1 lines)
33		33
34	post-build:	34	post-build:
35	( ${ECHO} '#!/bin/sh'; \	35	( ${ECHO} '#!/bin/sh'; \
36	${ECHO} 'PATH=$${PATH}:/bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin'; \	36	${ECHO} 'PATH=$${PATH}:/bin:/usr/bin:${LOCALBASE}/bin:${LOCALBASE}/bin'; \
37	${ECHO} 'export PATH;'; \	37	${ECHO} 'export PATH;'; \
38	) > ${COMMONVARS}	38	) > ${COMMONVARS}
39	.for V in XMLCATMGR CATALOG_MASTER_SGML CATALOG_MASTER_XML CATALOG_PORTS_SGML CATALOG_PORTS_XML	39	.for V in XMLCATMGR CATALOG_MASTER_SGML CATALOG_MASTER_XML CATALOG_PORTS_SGML CATALOG_PORTS_XML




X11BASE=/usr/X11R6
LOCALBASE=${LOCALBASE:-/usr/local}

if [ ${LOCALBASE} -ef ${LOCALBASE} ]; then
	echo "Spamming files in /etc..."
else
	exit 0

# periodic.conf
local_periodic=`. /etc/defaults/periodic.conf && source_periodic_confs ; echo ${local_periodic}`
for lp in ${local_periodic}; do
	if (expr ${lp} : "^${LOCALBASE}" >/dev/null); then
		continue
	else
		new_periodic="${new_periodic} ${lp}"
	fi
done
if [ "${local_periodic}x" != "${new_periodic## }x" ]; then
	echo "==> Removing ${LOCALBASE}/etc/periodic from periodic setup..."
	echo "# added by xorg-libraries port" >> /etc/periodic.conf
	echo "local_periodic=\"${new_periodic## }\"" >> /etc/periodic.conf
	ppath_done=1
fi

# manpath.config
if (PATH="/sbin:/bin:/usr/sbin:/usr/bin" manpath -q | grep -q "${LOCALBASE}");then	echo "==> Removing ${LOCALBASE}/man from MANPATH..."
	sed -i ".bak.xorg" -e "s,^[^#]*${LOCALBASE}.*$,# (disabled by xorg-libraries port) &," \
	    /etc/manpath.config
	mpath_done=1
fi

# rc.conf
rcdirs=`. /etc/defaults/rc.conf && source_rc_confs && echo ${local_startup}`
for rd in ${rcdirs}; do
	if (expr ${rd} : "${LOCALBASE}" >/dev/null); then
		continue
	else
		new_rcdirs="${new_rcdirs} ${rd}"
	fi
done
if [ "${rcdirs}x" != "${new_rcdirs## }x" ]; then
	echo "==> Removing ${LOCALBASE} from rc sequence..."
	echo "# added by xorg-libraries port" >> /etc/rc.conf
	echo "local_startup=\"${new_rcdirs## }\"" >> /etc/rc.conf
	rcconf_done=1

Lines 67-73 Link Here

(-)xscreensaver/Makefile (-1 / +1 lines)
67	.endif	67	.endif
68		68
69	.if defined(WITH_FIREF)	69	.if defined(WITH_FIREF)
70	RUN_DEPENDS+= ${X11BASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies	70	RUN_DEPENDS+= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies
71	.endif	71	.endif
72	.if defined(WITH_XAOS1)	72	.if defined(WITH_XAOS1)
73	RUN_DEPENDS+= xaos:${PORTSDIR}/graphics/xaos	73	RUN_DEPENDS+= xaos:${PORTSDIR}/graphics/xaos

Return to bug 161558

Lines 535-542 Link Here

(-)ports/Mk/bsd.port.mk (-24 / +14 lines)
535	# Various directory definitions and variables to control them.	535	# Various directory definitions and variables to control them.
536	# You rarely need to redefine any of these except WRKSRC and NO_WRKSUBDIR.	536	# You rarely need to redefine any of these except WRKSRC and NO_WRKSUBDIR.
537	#	537	#
538	# X11BASE - Where X11 ports install things.
539	# Default: ${LOCALBASE}
540	# LOCALBASE - Where non-X11 ports install things.	538	# LOCALBASE - Where non-X11 ports install things.
541	# Default: /usr/local	539	# Default: /usr/local
542	# LINUXBASE - Where Linux ports install things.	540	# LINUXBASE - Where Linux ports install things.
Lines 1120-1126 Link Here
1120	# by individual Makefiles or local system make configuration.	1118	# by individual Makefiles or local system make configuration.
1121	PORTSDIR?= /usr/ports	1119	PORTSDIR?= /usr/ports
1122	LOCALBASE?= /usr/local	1120	LOCALBASE?= /usr/local
1123	X11BASE?= ${LOCALBASE}
1124	LINUXBASE?= /compat/linux	1121	LINUXBASE?= /compat/linux
1125	DISTDIR?= ${PORTSDIR}/distfiles	1122	DISTDIR?= ${PORTSDIR}/distfiles
1126	_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}	1123	_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}
Lines 1369-1380 Link Here
1369	.include "${PORTSDIR}/Mk/bsd.linux-apps.mk"	1366	.include "${PORTSDIR}/Mk/bsd.linux-apps.mk"
1370	.endif	1367	.endif
1371		1368
1372	.if ${X11BASE} != ${LOCALBASE}
1373	.BEGIN:
1374	@${ECHO_MSG} "X11BASE is now deprecated. Unset X11BASE in make.conf and try again."
1375	@${FALSE}
1376	.endif
1377
1378	.if defined(USE_XORG) \|\| defined(XORG_CAT)	1369	.if defined(USE_XORG) \|\| defined(XORG_CAT)
1379	.include "${PORTSDIR}/Mk/bsd.xorg.mk"	1370	.include "${PORTSDIR}/Mk/bsd.xorg.mk"
1380	.endif	1371	.endif
Lines 1564-1571 Link Here
1564	BUILD_WRKSRC?= ${WRKSRC}	1555	BUILD_WRKSRC?= ${WRKSRC}
1565	INSTALL_WRKSRC?=${WRKSRC}	1556	INSTALL_WRKSRC?=${WRKSRC}
1566		1557
1567	PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}	1558	PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE}
1568	SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \	1559	SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
1569	DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \	1560	DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \
1570	WWWDIR=${WWWDIR} ETCDIR=${ETCDIR}	1561	WWWDIR=${WWWDIR} ETCDIR=${ETCDIR}
1571		1562
Lines 1938-1946 Link Here
1938		1929
1939	.if defined(USE_DISPLAY) && !defined(DISPLAY)	1930	.if defined(USE_DISPLAY) && !defined(DISPLAY)
1940	BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \	1931	BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
1941	${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \	1932	${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \
1942	${X11BASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT} \	1933	${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT} \
1943	${X11BASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \	1934	${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
1944	xkbcomp:${PORTSDIR}/x11/xkbcomp	1935	xkbcomp:${PORTSDIR}/x11/xkbcomp
1945	.if !defined(PACKAGE_BUILDING)	1936	.if !defined(PACKAGE_BUILDING)
1946	CONFIGURE_ENV+= DISPLAY="localhost:1001"	1937	CONFIGURE_ENV+= DISPLAY="localhost:1001"
Lines 2100-2114 Link Here
2100	. if defined(USE_LINUX)	2091	. if defined(USE_LINUX)
2101	RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-xorg-libs	2092	RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-xorg-libs
2102	. else	2093	. else
2103	BUILD_DEPENDS+= ${X11BASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}	2094	BUILD_DEPENDS+= ${LOCALBASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
2104	RUN_DEPENDS+= ${X11BASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}	2095	RUN_DEPENDS+= ${LOCALBASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
2105	. endif	2096	. endif
2106	.endif	2097	.endif
2107		2098
2108	.if defined(USE_XLIB) \|\| defined(USE_XORG)	2099	.if defined(USE_XLIB) \|\| defined(USE_XORG)
2109	# Add explicit X options to avoid problems with false positives in configure	2100	# Add explicit X options to avoid problems with false positives in configure
2110	.if defined(GNU_CONFIGURE)	2101	.if defined(GNU_CONFIGURE)
2111	CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include	2102	CONFIGURE_ARGS+=--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
2112	.endif	2103	.endif
2113	.endif	2104	.endif
2114		2105
Lines 2196-2202 Link Here
2196	MAKE_FLAGS?= -f	2187	MAKE_FLAGS?= -f
2197	MAKEFILE?= Makefile	2188	MAKEFILE?= Makefile
2198	MAKE_ENV+= PREFIX=${PREFIX} \	2189	MAKE_ENV+= PREFIX=${PREFIX} \
2199	LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \	2190	LOCALBASE=${LOCALBASE} \
2200	MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" \	2191	MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" \
2201	CC="${CC}" CFLAGS="${CFLAGS}" \	2192	CC="${CC}" CFLAGS="${CFLAGS}" \
2202	CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \	2193	CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \
Lines 2438-2444 Link Here
2438	# where pkg_add records its dirty deeds.	2429	# where pkg_add records its dirty deeds.
2439	PKG_DBDIR?= /var/db/pkg	2430	PKG_DBDIR?= /var/db/pkg
2440		2431
2441	MOTIFLIB?= -L${X11BASE}/lib -lXm -lXp	2432	MOTIFLIB?= -L${LOCALBASE}/lib -lXm -lXp
2442		2433
2443	ALL_TARGET?= all	2434	ALL_TARGET?= all
2444	INSTALL_TARGET?= install	2435	INSTALL_TARGET?= install
Lines 2949-2956 Link Here
2949	SCRIPTS_ENV+= CURDIR=${MASTERDIR} DISTDIR=${DISTDIR} \	2940	SCRIPTS_ENV+= CURDIR=${MASTERDIR} DISTDIR=${DISTDIR} \
2950	WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \	2941	WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \
2951	SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \	2942	SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \
2952	PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \	2943	PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
2953	X11BASE=${X11BASE}
2954		2944
2955	.if defined(BATCH)	2945	.if defined(BATCH)
2956	SCRIPTS_ENV+= BATCH=yes	2946	SCRIPTS_ENV+= BATCH=yes
Lines 3259-3265 Link Here
3259	DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} \	3249	DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} \
3260	PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \	3250	PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
3261	FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \	3251	FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
3262	BUILD_DEPENDS="${BUILD_DEPENDS}" RUN_DEPENDS="${RUN_DEPENDS}" X11BASE=${X11BASE} \	3252	BUILD_DEPENDS="${BUILD_DEPENDS}" RUN_DEPENDS="${RUN_DEPENDS}" \
3263	CONFLICTS="${CONFLICTS}" \	3253	CONFLICTS="${CONFLICTS}" \
3264	${ALL_HOOK}	3254	${ALL_HOOK}
3265	.endif	3255	.endif
Lines 5760-5766 Link Here
5760	.endif	5750	.endif
5761	.if (${PREFIX} != "/usr")	5751	.if (${PREFIX} != "/usr")
5762	@${ECHO_CMD} "@unexec if [ -f %D/${INFO_PATH}/dir ]; then if sed -e '1,/Menu:/d' %D/${INFO_PATH}/dir \| grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST}	5752	@${ECHO_CMD} "@unexec if [ -f %D/${INFO_PATH}/dir ]; then if sed -e '1,/Menu:/d' %D/${INFO_PATH}/dir \| grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST}
5763	.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE})	5753	.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE})
5764	@${ECHO_CMD} "@unexec rmdir %D/${INFO_PATH} 2>/dev/null \|\| true" >> ${TMPPLIST}	5754	@${ECHO_CMD} "@unexec rmdir %D/${INFO_PATH} 2>/dev/null \|\| true" >> ${TMPPLIST}
5765	.endif	5755	.endif
5766	.endif	5756	.endif
Lines 5771-5777 Link Here
5771	# deinstall-time	5761	# deinstall-time
5772	.if !target(add-plist-post)	5762	.if !target(add-plist-post)
5773	add-plist-post:	5763	add-plist-post:
5774	.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")	5764	.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
5775	@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null \|\| true" >> ${TMPPLIST}	5765	@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null \|\| true" >> ${TMPPLIST}
5776	.else	5766	.else
5777	@${DO_NADA}	5767	@${DO_NADA}

Lines 29-35 Link Here

(-)linuxpluginwrapper/Makefile (-7 / +7 lines)
29		29
30	# I will remove WITH_PLUGINS knob.	30	# I will remove WITH_PLUGINS knob.
31	.if defined(WITH_REALPLAYER)	31	.if defined(WITH_REALPLAYER)
32	RUN_DEPENDS+= ${X11BASE}/lib/linux-mozilla/plugins/nphelix.so:${PORTSDIR}/multimedia/linux-realplayer	32	RUN_DEPENDS+= ${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.so:${PORTSDIR}/multimedia/linux-realplayer
33	WITH_PLUGINS= 1	33	WITH_PLUGINS= 1
34	.endif	34	.endif
35		35
Lines 53-59 Link Here
53	post-build:	53	post-build:
54	@${SED} -e 's,%%PREFIX%%,${PREFIX},' \	54	@${SED} -e 's,%%PREFIX%%,${PREFIX},' \
55	-e 's,%%LOCALBASE%%,${LOCALBASE},' \	55	-e 's,%%LOCALBASE%%,${LOCALBASE},' \
56	-e 's,%%X11BASE%%,${X11BASE},' \	56	-e 's,%%X11BASE%%,${LOCALBASE},' \
57	-e 's,%%LTHREADSHMAJOR%%,${LTHREADSHMAJOR},' \	57	-e 's,%%LTHREADSHMAJOR%%,${LTHREADSHMAJOR},' \
58	-e 's,%%LIBMAPCONF%%,${LIBMAPCONF},' \	58	-e 's,%%LIBMAPCONF%%,${LIBMAPCONF},' \
59	< ${.CURDIR}/pkg-message > ${PKGMESSAGE}	59	< ${.CURDIR}/pkg-message > ${PKGMESSAGE}
Lines 63-74 Link Here
63		63
64	.if defined(WITH_PLUGINS)	64	.if defined(WITH_PLUGINS)
65	pre-install:	65	pre-install:
66	@${MKDIR} ${X11BASE}/lib/browser_linux_plugins	66	@${MKDIR} ${LOCALBASE}/lib/browser_linux_plugins
67	.if defined(WITH_REALPLAYER)	67	.if defined(WITH_REALPLAYER)
68	@${LN} -sf ${X11BASE}/lib/linux-mozilla/plugins/nphelix.so \	68	@${LN} -sf ${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.so \
69	${X11BASE}/lib/browser_linux_plugins/	69	${LOCALBASE}/lib/browser_linux_plugins/
70	@${LN} -sf ${X11BASE}/lib/linux-mozilla/plugins/nphelix.xpt \	70	@${LN} -sf ${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.xpt \
71	${X11BASE}/lib/browser_linux_plugins/	71	${LOCALBASE}/lib/browser_linux_plugins/
72	.endif	72	.endif
73	.endif	73	.endif
74		74

Lines 7-13 Link Here

(-)xorg-libraries/pkg-install (-7 / +7 lines)
7	X11BASE=/usr/X11R6	7	X11BASE=/usr/X11R6
8	LOCALBASE=${LOCALBASE:-/usr/local}	8	LOCALBASE=${LOCALBASE:-/usr/local}
9		9
10	if [ ${X11BASE} -ef ${LOCALBASE} ]; then	10	if [ ${LOCALBASE} -ef ${LOCALBASE} ]; then
11	echo "Spamming files in /etc..."	11	echo "Spamming files in /etc..."
12	else	12	else
13	exit 0	13	exit 0
Lines 16-37 Link Here
16	# periodic.conf	16	# periodic.conf
17	local_periodic=`. /etc/defaults/periodic.conf && source_periodic_confs ; echo ${local_periodic}`	17	local_periodic=`. /etc/defaults/periodic.conf && source_periodic_confs ; echo ${local_periodic}`
18	for lp in ${local_periodic}; do	18	for lp in ${local_periodic}; do
19	if (expr ${lp} : "^${X11BASE}" >/dev/null); then	19	if (expr ${lp} : "^${LOCALBASE}" >/dev/null); then
20	continue	20	continue
21	else	21	else
22	new_periodic="${new_periodic} ${lp}"	22	new_periodic="${new_periodic} ${lp}"
23	fi	23	fi
24	done	24	done
25	if [ "${local_periodic}x" != "${new_periodic## }x" ]; then	25	if [ "${local_periodic}x" != "${new_periodic## }x" ]; then
26	echo "==> Removing ${X11BASE}/etc/periodic from periodic setup..."	26	echo "==> Removing ${LOCALBASE}/etc/periodic from periodic setup..."
27	echo "# added by xorg-libraries port" >> /etc/periodic.conf	27	echo "# added by xorg-libraries port" >> /etc/periodic.conf
28	echo "local_periodic=\"${new_periodic## }\"" >> /etc/periodic.conf	28	echo "local_periodic=\"${new_periodic## }\"" >> /etc/periodic.conf
29	ppath_done=1	29	ppath_done=1
30	fi	30	fi
31		31
32	# manpath.config	32	# manpath.config
33	if (PATH="/sbin:/bin:/usr/sbin:/usr/bin" manpath -q \| grep -q "${X11BASE}");then echo "==> Removing ${X11BASE}/man from MANPATH..."	33	if (PATH="/sbin:/bin:/usr/sbin:/usr/bin" manpath -q \| grep -q "${LOCALBASE}");then echo "==> Removing ${LOCALBASE}/man from MANPATH..."
34	sed -i ".bak.xorg" -e "s,^[^#]${X11BASE}.$,# (disabled by xorg-libraries port) &," \	34	sed -i ".bak.xorg" -e "s,^[^#]${LOCALBASE}.$,# (disabled by xorg-libraries port) &," \
35	/etc/manpath.config	35	/etc/manpath.config
36	mpath_done=1	36	mpath_done=1
37	fi	37	fi
Lines 39-52 Link Here
39	# rc.conf	39	# rc.conf
40	rcdirs=`. /etc/defaults/rc.conf && source_rc_confs && echo ${local_startup}`	40	rcdirs=`. /etc/defaults/rc.conf && source_rc_confs && echo ${local_startup}`
41	for rd in ${rcdirs}; do	41	for rd in ${rcdirs}; do
42	if (expr ${rd} : "${X11BASE}" >/dev/null); then	42	if (expr ${rd} : "${LOCALBASE}" >/dev/null); then
43	continue	43	continue
44	else	44	else
45	new_rcdirs="${new_rcdirs} ${rd}"	45	new_rcdirs="${new_rcdirs} ${rd}"
46	fi	46	fi
47	done	47	done
48	if [ "${rcdirs}x" != "${new_rcdirs## }x" ]; then	48	if [ "${rcdirs}x" != "${new_rcdirs## }x" ]; then
49	echo "==> Removing ${X11BASE} from rc sequence..."	49	echo "==> Removing ${LOCALBASE} from rc sequence..."
50	echo "# added by xorg-libraries port" >> /etc/rc.conf	50	echo "# added by xorg-libraries port" >> /etc/rc.conf
51	echo "local_startup=\"${new_rcdirs## }\"" >> /etc/rc.conf	51	echo "local_startup=\"${new_rcdirs## }\"" >> /etc/rc.conf
52	rcconf_done=1	52	rcconf_done=1