Attachment #35820 for bug #57705

View | Details | Raw Unified | Return to bug 57705
Collapse All | Expand All




#

PORTNAME=	lyx
PORTVERSION=	1.3.3
PORTREVISION=	1
CATEGORIES=	print
MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \

USE_PERL5=	yes
USE_PYTHON=	yes
USE_GMAKE=	yes
USE_LIBTOOL_VER=	14
USE_REINPLACE=	yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
		--with-extra-inc="${LOCALBASE}/include"

.if defined(WITH_QT)
USE_QT_VER=	3
CONFIGURE_ARGS+=	--with-frontend=qt
QTCPPFLAGS+=	${PTHREAD_CFLAGS}
QTCFGLIBS+=	${PTHREAD_LIBS}
.else
LIB_DEPENDS+=	forms.1:${PORTSDIR}/x11-toolkits/xforms
USE_XPM=	yes

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 500035
CFLAGS+=	-Wno-non-template-friend -ftemplate-depth-30
.if defined(WITH_QT)
CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
		CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
.endif
.endif

pre-everything::

	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ISPELL=yes\""
	@${ECHO_MSG}
.endif

post-patch:
	@${REINPLACE_CMD} -E -e \
		's|CFLAGS=$$|#CFLAGS=|' \
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}

.include <bsd.port.post.mk>

Line 1 Link Here

(-)print/lyx/distinfo (-1 / +1 lines)
1	MD5 (lyx-1.3.2.tar.bz2) = e33cf84f7c5be4ab9bbcc6ea587d4fdc	1	MD5 (lyx-1.3.3.tar.bz2) = 0f22124b000feb3c471096a1031d3722




share/locale/tr/LC_MESSAGES/lyx.mo
share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/CREDITS
%%DATADIR%%/bind/aqua.bind
%%DATADIR%%/bind/broadway.bind
%%DATADIR%%/bind/cua.bind
%%DATADIR%%/bind/cyrkeys.bind

%%DATADIR%%/examples/fr_Foils.lyx
%%DATADIR%%/examples/fr_ListesPuces.lyx
%%DATADIR%%/examples/fr_Minipage.lyx
%%DATADIR%%/examples/fr_MultiColonnes.lyx
%%DATADIR%%/examples/fr_exemple_brut.lyx
%%DATADIR%%/examples/fr_exemple_lyxifie.lyx
%%DATADIR%%/examples/fr_mathed.lyx
%%DATADIR%%/examples/fr_multicol.lyx
%%DATADIR%%/examples/fr_splash.lyx
%%DATADIR%%/examples/he_example_raw.lyx
%%DATADIR%%/examples/he_he_example_lyxified.lyx

%%DATADIR%%/layouts/ltugboat.layout
%%DATADIR%%/layouts/lyxmacros.inc
%%DATADIR%%/layouts/manpage.layout
%%DATADIR%%/layouts/memoir.layout
%%DATADIR%%/layouts/mwart.layout
%%DATADIR%%/layouts/mwbk.layout
%%DATADIR%%/layouts/mwrep.layout

%%DATADIR%%/templates/g-brief-de.lyx
%%DATADIR%%/templates/g-brief-en.lyx
%%DATADIR%%/templates/hollywood.lyx
%%DATADIR%%/templates/ijmpd.lyx
%%DATADIR%%/templates/kluwer.lyx
%%DATADIR%%/templates/koma-letter2.lyx
%%DATADIR%%/templates/latex8.lyx
%%DATADIR%%/templates/letter.lyx
%%DATADIR%%/templates/linuxdoc_article.lyx

%%DATADIR%%/tex/revtex.cls
%%DATADIR%%/textclass.lst
%%DATADIR%%/ui/default.ui
%%DATADIR%%/xfonts/PSres.upr
%%DATADIR%%/xfonts/cmex10.pfb
%%DATADIR%%/xfonts/cmmi10.pfb
%%DATADIR%%/xfonts/cmr10.pfb

Return to bug 57705

Lines 6-13 Link Here

(-)print/lyx/Makefile (-15 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= lyx	8	PORTNAME= lyx
9	PORTVERSION= 1.3.2	9	PORTVERSION= 1.3.3
10	PORTREVISION= 1
11	CATEGORIES= print	10	CATEGORIES= print
12	MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \	11	MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
13	ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \	12	ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
Lines 26-33 Link Here
26	USE_PERL5= yes	25	USE_PERL5= yes
27	USE_PYTHON= yes	26	USE_PYTHON= yes
28	USE_GMAKE= yes	27	USE_GMAKE= yes
29	GNU_CONFIGURE= yes	28	USE_LIBTOOL_VER= 14
30	USE_REINPLACE= yes
31	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	29	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
32	CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \	30	CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
33	--with-extra-inc="${LOCALBASE}/include"	31	--with-extra-inc="${LOCALBASE}/include"
Lines 38-43 Link Here
38	.if defined(WITH_QT)	36	.if defined(WITH_QT)
39	USE_QT_VER= 3	37	USE_QT_VER= 3
40	CONFIGURE_ARGS+= --with-frontend=qt	38	CONFIGURE_ARGS+= --with-frontend=qt
		39	QTCPPFLAGS+= ${PTHREAD_CFLAGS}
		40	QTCFGLIBS+= ${PTHREAD_LIBS}
41	.else	41	.else
42	LIB_DEPENDS+= forms.1:${PORTSDIR}/x11-toolkits/xforms	42	LIB_DEPENDS+= forms.1:${PORTSDIR}/x11-toolkits/xforms
43	USE_XPM= yes	43	USE_XPM= yes
Lines 57-68 Link Here
57	.include <bsd.port.pre.mk>	57	.include <bsd.port.pre.mk>
58		58
59	.if ${OSVERSION} < 500035	59	.if ${OSVERSION} < 500035
60	CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -Wno-non-template-friend -ftemplate-depth-30"	60	CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30
61	.if defined(WITH_QT)
62	CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
63	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
64	CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
65	.endif
66	.endif	61	.endif
67		62
68	pre-everything::	63	pre-everything::
Lines 86-95 Link Here
86	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ISPELL=yes\""	81	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ISPELL=yes\""
87	@${ECHO_MSG}	82	@${ECHO_MSG}
88	.endif	83	.endif
89
90	post-patch:
91	@${REINPLACE_CMD} -E -e \
92	's\|CFLAGS=$$\|#CFLAGS=\|' \
93	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
94		84
95	.include <bsd.port.post.mk>	85	.include <bsd.port.post.mk>

Lines 26-31 Link Here

(-)print/lyx/pkg-plist (-2 / +6 lines)
26	share/locale/tr/LC_MESSAGES/lyx.mo	26	share/locale/tr/LC_MESSAGES/lyx.mo
27	share/locale/wa/LC_MESSAGES/lyx.mo	27	share/locale/wa/LC_MESSAGES/lyx.mo
28	%%DATADIR%%/CREDITS	28	%%DATADIR%%/CREDITS
		29	%%DATADIR%%/bind/aqua.bind
29	%%DATADIR%%/bind/broadway.bind	30	%%DATADIR%%/bind/broadway.bind
30	%%DATADIR%%/bind/cua.bind	31	%%DATADIR%%/bind/cua.bind
31	%%DATADIR%%/bind/cyrkeys.bind	32	%%DATADIR%%/bind/cyrkeys.bind
Lines 155-164 Link Here
155	%%DATADIR%%/examples/fr_Foils.lyx	156	%%DATADIR%%/examples/fr_Foils.lyx
156	%%DATADIR%%/examples/fr_ListesPuces.lyx	157	%%DATADIR%%/examples/fr_ListesPuces.lyx
157	%%DATADIR%%/examples/fr_Minipage.lyx	158	%%DATADIR%%/examples/fr_Minipage.lyx
158	%%DATADIR%%/examples/fr_MultiColonnes.lyx
159	%%DATADIR%%/examples/fr_exemple_brut.lyx	159	%%DATADIR%%/examples/fr_exemple_brut.lyx
160	%%DATADIR%%/examples/fr_exemple_lyxifie.lyx	160	%%DATADIR%%/examples/fr_exemple_lyxifie.lyx
161	%%DATADIR%%/examples/fr_mathed.lyx	161	%%DATADIR%%/examples/fr_mathed.lyx
		162	%%DATADIR%%/examples/fr_multicol.lyx
162	%%DATADIR%%/examples/fr_splash.lyx	163	%%DATADIR%%/examples/fr_splash.lyx
163	%%DATADIR%%/examples/he_example_raw.lyx	164	%%DATADIR%%/examples/he_example_raw.lyx
164	%%DATADIR%%/examples/he_he_example_lyxified.lyx	165	%%DATADIR%%/examples/he_he_example_lyxified.lyx
Lines 804-809 Link Here
804	%%DATADIR%%/layouts/ltugboat.layout	805	%%DATADIR%%/layouts/ltugboat.layout
805	%%DATADIR%%/layouts/lyxmacros.inc	806	%%DATADIR%%/layouts/lyxmacros.inc
806	%%DATADIR%%/layouts/manpage.layout	807	%%DATADIR%%/layouts/manpage.layout
		808	%%DATADIR%%/layouts/memoir.layout
807	%%DATADIR%%/layouts/mwart.layout	809	%%DATADIR%%/layouts/mwart.layout
808	%%DATADIR%%/layouts/mwbk.layout	810	%%DATADIR%%/layouts/mwbk.layout
809	%%DATADIR%%/layouts/mwrep.layout	811	%%DATADIR%%/layouts/mwrep.layout
Lines 889-896 Link Here
889	%%DATADIR%%/templates/g-brief-de.lyx	891	%%DATADIR%%/templates/g-brief-de.lyx
890	%%DATADIR%%/templates/g-brief-en.lyx	892	%%DATADIR%%/templates/g-brief-en.lyx
891	%%DATADIR%%/templates/hollywood.lyx	893	%%DATADIR%%/templates/hollywood.lyx
892	%%DATADIR%%/templates/koma-letter2.lyx	894	%%DATADIR%%/templates/ijmpd.lyx
893	%%DATADIR%%/templates/kluwer.lyx	895	%%DATADIR%%/templates/kluwer.lyx
		896	%%DATADIR%%/templates/koma-letter2.lyx
894	%%DATADIR%%/templates/latex8.lyx	897	%%DATADIR%%/templates/latex8.lyx
895	%%DATADIR%%/templates/letter.lyx	898	%%DATADIR%%/templates/letter.lyx
896	%%DATADIR%%/templates/linuxdoc_article.lyx	899	%%DATADIR%%/templates/linuxdoc_article.lyx
Lines 905-910 Link Here
905	%%DATADIR%%/tex/revtex.cls	908	%%DATADIR%%/tex/revtex.cls
906	%%DATADIR%%/textclass.lst	909	%%DATADIR%%/textclass.lst
907	%%DATADIR%%/ui/default.ui	910	%%DATADIR%%/ui/default.ui
		911	%%DATADIR%%/xfonts/PSres.upr
908	%%DATADIR%%/xfonts/cmex10.pfb	912	%%DATADIR%%/xfonts/cmex10.pfb
909	%%DATADIR%%/xfonts/cmmi10.pfb	913	%%DATADIR%%/xfonts/cmmi10.pfb
910	%%DATADIR%%/xfonts/cmr10.pfb	914	%%DATADIR%%/xfonts/cmr10.pfb