cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move freetype1 includes in a separate subdirectory.

Browse Source
This commit is contained in:
espie 2003-04-19 13:30:47 +00:00
parent cbd207471f
commit 338b4b5036
18 changed files with 81 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
chinese/bg5ps/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2002/10/24 23:52:29 naddy Exp $
# $OpenBSD: Makefile,v 1.12 2003/04/19 13:30:47 espie Exp $
COMMENT= "convert Big5/GB encoded files to postscript"
@ -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

41
chinese/bg5ps/patches/patch-Makefile
View File

@ -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)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(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)
clean:
rm -rf *.o core ttf2psm *~
install: all bg5ps bg5ps.conf
mkdir -p $(ETCDIR)

10
chinese/bg5ps/patches/patch-bg5ps
View File

@ -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

5
chinese/ttfm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2002/10/24 23:52:29 naddy Exp $
# $OpenBSD: Makefile,v 1.12 2003/04/19 13:30:47 espie Exp $
COMMENT= "big5/gb enhanced truetype font manager"
@ -18,7 +18,8 @@ MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/keith/ttfm/ \
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

4
devel/libuta/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2002/12/29 20:19:11 fgsch Exp $
# $OpenBSD: Makefile,v 1.12 2003/04/19 13:30:47 espie Exp $
COMMENT= "graphical user interface library for C++"
@ -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

4
graphics/ImageMagick/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.57 2003/01/04 17:01:08 lebel Exp $
# $OpenBSD: Makefile,v 1.58 2003/04/19 13:30:47 espie Exp $
COMMENT= "display and manipulate images under X11"
@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --enable-static --enable-lzw --enable-16bit-pixel \
--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>

4
graphics/gd/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.36 2002/12/29 20:08:46 fgsch Exp $
# $OpenBSD: Makefile,v 1.37 2003/04/19 13:30:47 espie Exp $
# $FreeBSD: Makefile,v 1.5 1998/06/25 03:13:16 vanilla Exp $
COMMENT= "graphics library for fast PNG creation"
@ -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}"

4
misc/magicpoint/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2002/09/27 16:24:41 pvalchev Exp $
# $OpenBSD: Makefile,v 1.26 2003/04/19 13:30:47 espie Exp $
COMMENT= "X11-based presentation tool"
@ -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

13
misc/magicpoint/patches/patch-config_guess
View File

@ -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 ;;

12
misc/magicpoint/patches/patch-config_sub
View File

@ -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* )

12
misc/magicpoint/patches/patch-configure_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure_in,v 1.1 2003/04/19 13:30:47 espie Exp $
--- 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"

4
print/freetype/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.27 2003/03/18 00:48:22 pvalchev Exp $
# $OpenBSD: Makefile,v 1.28 2003/04/19 13:30:47 espie Exp $
# $FreeBSD: Makefile,v 1.6 1998/06/21 02:42:33 jseger Exp $
COMMENT= "free and portable TrueType font rendering engine"
@ -42,5 +42,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>

31
print/freetype/pkg/PLIST
View File

@ -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
@comment $OpenBSD: PLIST,v 1.10 2003/04/19 13:30:47 espie Exp $
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%%
@dirrm include/freetype/freetype1
@dirrm include/freetype

4
x11/enlightenment/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.30 2002/12/29 20:31:41 fgsch Exp $
# $OpenBSD: Makefile,v 1.31 2003/04/19 13:30:47 espie Exp $
COMMENT= "themed window manager"
@ -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>

5
x11/paragui/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2003/01/05 03:47:18 lebel Exp $
# $OpenBSD: Makefile,v 1.11 2003/04/19 13:30:47 espie Exp $
COMMENT= "cross-platform high-level application framework"
@ -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

14
x11/paragui/patches/patch-src_Makefile_in
View File

@ -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
$OpenBSD: patch-src_Makefile_in,v 1.3 2003/04/19 13:30:47 espie Exp $
--- 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 2001/08/11 17:25:30 pvalchev Exp $
+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

4
x11/ttmkfdir/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2002/10/29 19:48:59 naddy Exp $
# $OpenBSD: Makefile,v 1.7 2003/04/19 13:30:47 espie Exp $
COMMENT= "create fonts.scale file for the TrueType font server"
@ -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:

4
x11/xmbdfed/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2002/10/29 19:49:00 naddy Exp $
# $OpenBSD: Makefile,v 1.13 2003/04/19 13:30:47 espie Exp $
COMMENT= "Motif tool for editing X11 bitmap fonts"
@ -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)'