[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RFC: move freetype1 include into freetype1/freetype
- To: ports_(_at_)_openbsd_(_dot_)_org
- Subject: RFC: move freetype1 include into freetype1/freetype
- From: Marc Espie <espie_(_at_)_nerim_(_dot_)_net>
- Date: Sun, 6 Apr 2003 20:36:46 +0200
- Mail-followup-to: ports_(_at_)_openbsd_(_dot_)_org
- Reply-to: espie_(_at_)_nerim_(_dot_)_net
Lately, some ports that want freetype2 will get confused.
This patch moves the freetype1 includes out of the way, and
fixes a few minor nits.
Index: chinese/bg5ps/Makefile
===================================================================
RCS file: /cvs/ports/chinese/bg5ps/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- chinese/bg5ps/Makefile 24 Oct 2002 23:52:29 -0000 1.11
+++ chinese/bg5ps/Makefile 6 Apr 2003 18:38:09 -0000
@@ -28,7 +28,11 @@ post-patch:
"s|/usr/bin/python|${LOCALBASE}/bin/python${PYTHON_VER}|" \
${WRKSRC}/bg5ps
-post-install:
+MAKE_FLAGS=CFLAGS="${CFLAGS} -I${LOCALBASE}/include/freetype1" LDFLAGS=-L${LOCALBASE}/lib
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKBUILD}/bg5ps ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKBUILD}/ttf2psm ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/lib/bg5ps
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bg5ps
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bg5ps
Index: chinese/bg5ps/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/chinese/bg5ps/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- chinese/bg5ps/patches/patch-Makefile 21 Jan 2001 15:11:33 -0000 1.1.1.1
+++ chinese/bg5ps/patches/patch-Makefile 6 Apr 2003 18:38:09 -0000
@@ -1,40 +1,15 @@
---- Makefile.orig Mon Feb 14 20:41:27 2000
-+++ Makefile Sun Jan 21 22:40:02 2001
-@@ -19,28 +19,24 @@
-
- CC = gcc
- INSTALL = install
--CFLAGS =
-+CFLAGS = -I${LOCALBASE}/include
- LIBS = -lttf -lm
--INCLUDEDIR =
-+LIBSDIR= -L${LOCALBASE}/lib
-
--prefix = /usr
--BINDIR = $(prefix)/bin
--ETCDIR = /etc/chinese/
-+PREFIX?= /usr/local
-+BINDIR = $(PREFIX)/bin
+--- Makefile.orig Sun Apr 6 16:03:35 2003
++++ Makefile Sun Apr 6 16:04:12 2003
+@@ -29,11 +29,8 @@ ETCDIR = /etc/chinese/
all: ttf2psm
- %.o : %.c
+-%.o : %.c
- $(CC) -c $(CFLAGS) $(INCLUDEDIR) $< -o $@
-+ $(CC) -c $(CFLAGS) $< -o $@
-
+-
ttf2psm: $(OBJS)
- $(CC) $(CFLAGS) $(INCLUDEDIR) $(LIBS) -o ttf2psm $(OBJS)
-+ $(CC) $(CFLAGS) $(LIBSDIR) $(LIBS) -o ttf2psm $(OBJS)
-
--install: all bg5ps bg5ps.conf
-- mkdir -p $(ETCDIR)
-- mkdir -p $(BINDIR)
-- $(INSTALL) -m644 bg5ps.conf $(ETCDIR)/bg5ps.conf
-- $(INSTALL) -m755 bg5ps $(BINDIR)
-- $(INSTALL) -m755 ttf2psm $(BINDIR)
-+install: all bg5ps
-+ install -m 755 bg5ps $(BINDIR)
-+ install -m 755 ttf2psm $(BINDIR)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o ttf2psm $(OBJS)
- clean:
- rm -rf *.o core ttf2psm *~
+ install: all bg5ps bg5ps.conf
+ mkdir -p $(ETCDIR)
Index: chinese/bg5ps/patches/patch-bg5ps
===================================================================
RCS file: /cvs/ports/chinese/bg5ps/patches/patch-bg5ps,v
retrieving revision 1.2
diff -u -p -r1.2 patch-bg5ps
--- chinese/bg5ps/patches/patch-bg5ps 7 Apr 2002 22:30:23 -0000 1.2
+++ chinese/bg5ps/patches/patch-bg5ps 6 Apr 2003 18:38:09 -0000
@@ -1,5 +1,11 @@
---- bg5ps.orig Mon Feb 14 15:46:43 2000
-+++ bg5ps Sat Apr 6 13:16:45 2002
+--- bg5ps.orig Mon Feb 14 21:46:43 2000
++++ bg5ps Sun Apr 6 15:59:34 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/local/bin/python2.1
+ ################################################################################
+ # bg5ps.py which use the ttf2ps program to convert the Big5 Coding chinese #
+ # text into printable postscript file. Since it uses true type font, the #
@@ -11,7 +11,7 @@
#
# Revision 1.5 2000/02/14 20:40:04 platin
Index: chinese/ttfm/Makefile
===================================================================
RCS file: /cvs/ports/chinese/ttfm/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- chinese/ttfm/Makefile 24 Oct 2002 23:52:29 -0000 1.11
+++ chinese/ttfm/Makefile 6 Apr 2003 18:38:09 -0000
@@ -18,7 +18,8 @@ MASTER_SITES= ftp://freebsd.sinica.edu.t
LIB_DEPENDS= ttf.1::print/freetype
-MAKE_FLAGS= CC="${CC}" CFLAGS='${CFLAGS} -Wall -I$$(FREETYPE_INCL)'
+MAKE_FLAGS= CC="${CC}" CFLAGS='${CFLAGS} -Wall -I$$(FREETYPE_INCL)' \
+ FREETYPE_INCL=${LOCALBASE}/include/freetype1
NO_REGRESS= Yes
Index: devel/libuta/Makefile
===================================================================
RCS file: /cvs/ports/devel/libuta/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- devel/libuta/Makefile 29 Dec 2002 20:19:11 -0000 1.11
+++ devel/libuta/Makefile 6 Apr 2003 18:38:09 -0000
@@ -31,7 +31,7 @@ USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype1 -I${LOCALBASE}/include/libpng" \
LDFLAGS="-L${LOCALBASE}/lib"
VMEM_WARNING= Yes
Index: graphics/ImageMagick/Makefile
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- graphics/ImageMagick/Makefile 4 Jan 2003 17:01:08 -0000 1.57
+++ graphics/ImageMagick/Makefile 6 Apr 2003 18:38:09 -0000
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --enable-static --enabl
--without-perl --without-modules --without-dps \
--without-fpx --without-hdf --without-lcms \
--without-ttf --without-wmf --without-threads
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/freetype -I${LOCALBASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/freetype1/freetype -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
Index: graphics/gd/Makefile
===================================================================
RCS file: /cvs/ports/graphics/gd/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- graphics/gd/Makefile 29 Dec 2002 20:08:46 -0000 1.36
+++ graphics/gd/Makefile 6 Apr 2003 18:38:09 -0000
@@ -23,7 +23,7 @@ PERMIT_DISTFILES_FTP= Yes
MAKE_FLAGS= COMPILER="${CC}" prefix="${PREFIX}" \
CFLAGS="${CFLAGS} -DHAVE_JPEG -DHAVE_LIBTTF" \
- INCLUDEDIRS="-I. -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/freetype -I${LOCALBASE}/include" \
+ INCLUDEDIRS="-I. -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/freetype1/freetype -I${LOCALBASE}/include" \
LIBS="-lgd -lm -lpng -lz -ljpeg -lttf" \
LIBDIRS="-L. -L${LOCALBASE}/lib"
FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR="${WRKINST}"
Index: misc/magicpoint/Makefile
===================================================================
RCS file: /cvs/ports/misc/magicpoint/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- misc/magicpoint/Makefile 27 Sep 2002 16:24:41 -0000 1.25
+++ misc/magicpoint/Makefile 6 Apr 2003 18:38:09 -0000
@@ -24,7 +24,7 @@ RUN_DEPENDS+= pnmscale::graphics/netpbm
MODULES= gettext
USE_X11= Yes
-CONFIGURE_STYLE=gnu imake
+CONFIGURE_STYLE=autoconf gnu imake
CONFIGURE_ARGS= --disable-vflib
CONFIGURE_ARGS+= --enable-gif
Index: misc/magicpoint/patches/patch-config_guess
===================================================================
RCS file: misc/magicpoint/patches/patch-config_guess
diff -N misc/magicpoint/patches/patch-config_guess
--- misc/magicpoint/patches/patch-config_guess 22 Jun 2001 02:04:29 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-config_guess,v 1.1 2001/06/22 02:04:29 kevlo Exp $
---- config.guess.orig Tue Jan 5 04:30:48 1999
-+++ config.guess Mon May 8 14:19:13 2000
-@@ -309,6 +309,9 @@ EOF
- *:FreeBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
-+ *:OpenBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ exit 0 ;;
- *:NetBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- exit 0 ;;
Index: misc/magicpoint/patches/patch-config_sub
===================================================================
RCS file: misc/magicpoint/patches/patch-config_sub
diff -N misc/magicpoint/patches/patch-config_sub
--- misc/magicpoint/patches/patch-config_sub 17 May 2000 01:25:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-config_sub,v 1.1 2000/05/17 01:25:54 espie Exp $
---- config.sub.orig Mon May 8 14:21:54 2000
-+++ config.sub Mon May 8 14:22:06 2000
-@@ -641,7 +641,7 @@ case $os in
- | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
- | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
- | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
-- | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
-+ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* )
Index: misc/magicpoint/patches/patch-configure_in
===================================================================
RCS file: misc/magicpoint/patches/patch-configure_in
diff -N misc/magicpoint/patches/patch-configure_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ misc/magicpoint/patches/patch-configure_in 6 Apr 2003 18:38:09 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.in.orig Sun Apr 6 16:18:59 2003
++++ configure.in Sun Apr 6 16:19:25 2003
+@@ -103,6 +103,8 @@ if test "$mgp_use_freetype" = "yes"; the
+ ac_cv_ft_include="$dir/include"
+ elif test -d $dir/include/freetype -a -f $dir/include/freetype/freetype.h; then
+ ac_cv_ft_include="$dir/include/freetype"
++ elif test -d $dir/include/freetype1/freetype -a -f $dir/include/freetype1/freetype/freetype.h; then
++ ac_cv_ft_include="$dir/include/freetype1/freetype"
+ fi
+ if test "$ac_cv_ft_lib" != "no" -a "$ac_cv_ft_include" != "no"; then
+ LIBS="-L$ac_cv_ft_lib $LIBS"
Index: print/freetype/Makefile
===================================================================
RCS file: /cvs/ports/print/freetype/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- print/freetype/Makefile 29 Dec 2002 19:49:41 -0000 1.26
+++ print/freetype/Makefile 6 Apr 2003 18:38:09 -0000
@@ -41,5 +41,7 @@ post-install:
${INSTALL_DATA_DIR} ${FT_DOC}/image
${INSTALL_DATA} ${SFT_DOC}/image/* ${FT_DOC}/image
cd ${SFT_DOC}; ${INSTALL_DATA} ${SRCTYPE} ${FT_DOC}
+ ${INSTALL_DATA_DIR} ${PREFIX}/include/freetype1
+ mv ${PREFIX}/include/freetype ${PREFIX}/include/freetype1
.include <bsd.port.mk>
Index: print/freetype/pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/freetype/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- print/freetype/pkg/PLIST 7 Mar 2001 22:06:44 -0000 1.9
+++ print/freetype/pkg/PLIST 6 Apr 2003 18:38:09 -0000
@@ -1,19 +1,20 @@
@comment $OpenBSD: PLIST,v 1.9 2001/03/07 22:06:44 brad Exp $
-include/freetype/freetype.h
-include/freetype/fterrid.h
-include/freetype/ftnameid.h
-include/freetype/ftxcmap.h
-include/freetype/ftxerr18.h
-include/freetype/ftxgasp.h
-include/freetype/ftxgdef.h
-include/freetype/ftxgpos.h
-include/freetype/ftxgsub.h
-include/freetype/ftxkern.h
-include/freetype/ftxopen.h
-include/freetype/ftxpost.h
-include/freetype/ftxsbit.h
-include/freetype/ftxwidth.h
+include/freetype1/freetype/freetype.h
+include/freetype1/freetype/fterrid.h
+include/freetype1/freetype/ftnameid.h
+include/freetype1/freetype/ftxcmap.h
+include/freetype1/freetype/ftxerr18.h
+include/freetype1/freetype/ftxgasp.h
+include/freetype1/freetype/ftxgdef.h
+include/freetype1/freetype/ftxgpos.h
+include/freetype1/freetype/ftxgsub.h
+include/freetype1/freetype/ftxkern.h
+include/freetype1/freetype/ftxopen.h
+include/freetype1/freetype/ftxpost.h
+include/freetype1/freetype/ftxsbit.h
+include/freetype1/freetype/ftxwidth.h
lib/libttf.a
lib/libttf.la
%%SHARED%%
+_(_at_)_dirrm include/freetype/freetype1
@dirrm include/freetype
Index: x11/enlightenment/Makefile
===================================================================
RCS file: /cvs/ports/x11/enlightenment/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- x11/enlightenment/Makefile 29 Dec 2002 20:31:41 -0000 1.30
+++ x11/enlightenment/Makefile 6 Apr 2003 18:38:09 -0000
@@ -27,7 +27,7 @@ USE_GMAKE= Yes
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --enable-fsstd
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype" \
+CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype1/freetype" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
.include <bsd.port.mk>
Index: x11/paragui/Makefile
===================================================================
RCS file: /cvs/ports/x11/paragui/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- x11/paragui/Makefile 5 Jan 2003 03:47:18 -0000 1.10
+++ x11/paragui/Makefile 6 Apr 2003 18:38:09 -0000
@@ -21,8 +21,7 @@ BUILD_DEPENDS= :zip-*:archivers/zip
LIB_DEPENDS= SDL::devel/sdl \
SDL_ttf::devel/sdl-ttf \
- SDL_image::devel/sdl-image \
- ttf::print/freetype
+ SDL_image::devel/sdl-image
# gcc3
MODULES= gcc3
Index: x11/paragui/patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/paragui/patches/patch-src_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_Makefile_in
--- x11/paragui/patches/patch-src_Makefile_in 11 Aug 2001 17:25:30 -0000 1.2
+++ x11/paragui/patches/patch-src_Makefile_in 6 Apr 2003 18:38:09 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2001/08/11 17:25:30 pvalchev Exp $
---- src/Makefile.in.orig Thu Aug 9 07:39:46 2001
-+++ src/Makefile.in Fri Aug 10 23:55:44 2001
-@@ -99,7 +99,7 @@ lib_LTLIBRARIES = libparagui.la
+--- src/Makefile.in.orig Thu Aug 9 15:39:46 2001
++++ src/Makefile.in Sun Apr 6 16:42:48 2003
+@@ -99,10 +99,10 @@ lib_LTLIBRARIES = libparagui.la
libparagui_la_SOURCES = pgrect.cpp pgrectlist.cpp pgwidgetlist.cpp pgdrawobject.cpp pglabel.cpp pgwidgetdnd.cpp pgwidget.cpp pgstaticframe.cpp pgmessageobject.cpp pggradientwidget.cpp pgbutton.cpp pgbuttongroup.cpp pgapplication.cpp pgscrollbar.cpp pgwindow.cpp pglineedit.cpp rendertextrect.cpp pgprogressbar.cpp pgradiobutton.cpp pgcheckbutton.cpp pgslider.cpp parastretch.cpp pgmsgmap.cpp pgdrawline.cpp pglistboxbaseitem.cpp pglistboxitem.cpp pglistbox.cpp pgcolumnitem.cpp pgdropdown.cpp pgsurfacecache.cpp pgeventobject.cpp pgpopupmenu.cpp pgmessagebox.cpp pgmaskedit.cpp pgspinnerbox.cpp pgnavigator.cpp
@@ -9,4 +9,8 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 20
+libparagui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- libparagui_la_LIBADD = -lttf -lSDL_ttf ../themes/libtheme.la ../expat/libexpat.la $(SDL_LIBS) $(IMAGE_LIBS) $(LIBSTDCPP)
+-libparagui_la_LIBADD = -lttf -lSDL_ttf ../themes/libtheme.la ../expat/libexpat.la $(SDL_LIBS) $(IMAGE_LIBS) $(LIBSTDCPP)
++libparagui_la_LIBADD = -lSDL_ttf ../themes/libtheme.la ../expat/libexpat.la $(SDL_LIBS) $(IMAGE_LIBS) $(LIBSTDCPP)
+
+
+ INCLUDES = $(SDL_CFLAGS) -I../themes -I../include
Index: x11/ttmkfdir/Makefile
===================================================================
RCS file: /cvs/ports/x11/ttmkfdir/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- x11/ttmkfdir/Makefile 29 Oct 2002 19:48:59 -0000 1.6
+++ x11/ttmkfdir/Makefile 6 Apr 2003 18:38:09 -0000
@@ -21,7 +21,7 @@ NO_REGRESS= Yes
do-build:
cd ${WRKSRC}; ${CC} ${CFLAGS} ttmkfdir.c \
- -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype \
+ -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype1/freetype \
-L${LOCALBASE}/lib -o ttmkfdir -lttf
do-install:
Index: x11/xmbdfed/Makefile
===================================================================
RCS file: /cvs/ports/x11/xmbdfed/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- x11/xmbdfed/Makefile 29 Oct 2002 19:49:00 -0000 1.12
+++ x11/xmbdfed/Makefile 6 Apr 2003 18:38:09 -0000
@@ -24,7 +24,7 @@ USE_MOTIF= any
MAKE_FLAGS= CC='${CC}' CFLAGS='${CFLAGS}' STATIC='' \
FTYPE_LIBS='-L${LOCALBASE}/lib -lttf' \
FTYPE_DEFS='-DHAVE_FREETYPE' \
- FTYPE_INCS='-I${LOCALBASE}/include/freetype' \
+ FTYPE_INCS='-I${LOCALBASE}/include/freetype1/freetype' \
HBFDEFS='-Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/bin/gunzip -c\""' \
INCS='-I${X11BASE}/include -I${LOCALBASE}/include $$(FTYPE_INCS)' \
LIBS='-L${X11BASE}/lib -L${LOCALBASE}/lib ${MOTIFLIB} -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext $$(FTYPE_LIBS)'
Visit your host, monkey.org