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

- respect CC and CFLAGS

Browse Source 
- use DESTDIR consistently -> stays inside fake area now
- regen useful patches
This commit is contained in:
sturm 2004-01-06 20:58:43 +00:00
parent 14e1f01e2c
commit 7a3b3c0c7c
6 changed files with 22 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
chinese/xcin/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2003/03/31 12:40:11 sturm Exp $
# $OpenBSD: Makefile,v 1.15 2004/01/06 20:58:43 sturm Exp $
COMMENT= "chinese input utility for X"
@ -13,6 +13,7 @@ HOMEPAGE= http://xcin.linux.org.tw/
MAINTAINER= Kevin Lo <kevlo@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -22,11 +23,13 @@ RUN_DEPENDS= ::chinese/taipeifonts
USE_X11= Yes
CONFIGURE_STYLE= gnu old
CONFIGURE_STYLE=gnu old dest
CONFIGURE_ARGS= --os=OpenBSD --no-menu
NO_REGRESS= Yes
MAKE_FLAGS= CC='${CC}' CFLAGS='${CFLAGS}'
CINS= cj.cin cj.tab cj.tab.rev phone.tab phone.cin phone.tab phone.tab.rev \
pinyin.cin pinyin.tab pinyin.tab.rev array30.cin array30.tab \
array30.tab.rev zmdbosh.cin zmdbosh.tab zmdbosh.tab.rev
@ -38,7 +41,7 @@ BINS= cin2tab et.kbm et26.kbm hsu.kbm lphrase phs_out pho.sel1st \
post-configure:
mv ${WRKSRC}/config.status ${WRKSRC}/config.status.orig
sed -e '/OPT_XCIN_CFONT/s/=.*/=-taipei-ming-medium-r-normal--16-160-75-75-c-160-big5-0/' -e '/OPT_XCIN_EFONT/s/=.*/=8x16/' -e '/PATH_XCIN_DIR/s!=.*!=/usr/local/lib/xcin!' ${WRKSRC}/config.status.orig > ${WRKSRC}/config.status
sed -e '/OPT_XCIN_CFONT/s/=.*/=-taipei-ming-medium-r-normal--16-160-75-75-c-160-big5-0/' -e '/OPT_XCIN_EFONT/s/=.*/=8x16/' ${WRKSRC}/config.status.orig > ${WRKSRC}/config.status
post-extract:
mv ${WRKSRC}/script/os_def/FreeBSD ${WRKSRC}/script/os_def/FreeBSD.orig

11
chinese/xcin/patches/patch-aa
View File

@ -1,11 +0,0 @@
--- script/configure.menu.orig Wed May 31 22:15:04 2000
+++ script/configure.menu Wed May 31 22:16:17 2000
@@ -266,7 +266,7 @@
{
PATH_XCIN_PREFIX=$1
PATH_XCIN_BIN=$PATH_XCIN_PREFIX/bin
- PATH_XCIN_DIR=$PATH_XCIN_PREFIX/lib/xcin
+ PATH_XCIN_DIR=$PATH_XCIN_PREFIX/lib/X11/xcin
PATH_XCIN_MAN=$PATH_XCIN_PREFIX/man
}

48
chinese/xcin/patches/patch-ab
View File

@ -1,48 +0,0 @@
--- src/Makefile.in.orig Wed Feb 24 01:30:33 1999
+++ src/Makefile.in Fri Jun 16 00:15:23 2000
@@ -60,7 +60,7 @@
sample.phs.out: phs_out sample.phs
./phs_out sample.phs
tsin_pin.map: pin2tsin pin_pho
- ./pin2tsin pin_pho
+ ./pin2tsin pin_pho &
tsin.rel: tsa2rel tsin.rel.src
./tsa2rel tsin.rel.src > tsin.rel
@@ -152,29 +152,29 @@
install_xcin: xcin $(KBMS) $(INPUT0) tsintab
if [ ! -d $(PATH_XCIN_BIN) ]; then $(INSTALL_DIR) $(PATH_XCIN_BIN); fi
- $(INSTALL) xcin $(PATH_XCIN_BIN)
- echo $(PATH_XCIN_BIN)/xcin >> filelist
+ $(INSTALL_PROGRAM) xcin $(DESTDIR)$(PATH_XCIN_BIN)
+ echo $(DESTDIR)$(PATH_XCIN_BIN)/xcin >> filelist
if [ ! -d $(PATH_XCIN_DIR) ]; then $(INSTALL_DIR) $(PATH_XCIN_DIR); fi
for f in $(TSINTABS) $(KBMS) $(INPUT0) voca.box; do\
- cp $$f $(PATH_XCIN_DIR); echo $(PATH_XCIN_DIR)/$$f >> filelist;\
+ cp $$f $(DESTDIR)$(PATH_XCIN_DIR); echo $(DESTDIR)$(PATH_XCIN_DIR)/$$f >> filelist;\
done
install_cin2tab: cin2tab
if [ ! -d $(PATH_XCIN_DIR) ]; then $(INSTALL_DIR) $(PATH_XCIN_DIR); fi
- $(INSTALL) cin2tab $(PATH_XCIN_DIR)
- echo $(PATH_XCIN_DIR)/cin2tab >> filelist
+ $(INSTALL_PROGRAM) cin2tab $(DESTDIR)$(PATH_XCIN_DIR)
+ echo $(DESTDIR)$(PATH_XCIN_DIR)/cin2tab >> filelist
install_tsintools: tsintools
if [ ! -d $(PATH_XCIN_DIR) ]; then $(INSTALL_DIR) $(PATH_XCIN_DIR); fi
for f in $(TSINTOOLS); do\
- $(INSTALL) $$f $(PATH_XCIN_DIR); echo $(PATH_XCIN_DIR)/$$f >> filelist;\
+ $(INSTALL_PROGRAM) $$f $(DESTDIR)$(PATH_XCIN_DIR); echo $(DESTDIR)$(PATH_XCIN_DIR)/$$f >> filelist;\
done
install_tsintabsrc:
if [ ! -d $(PATH_XCIN_DIR) ]; then $(INSTALL_DIR) $(PATH_XCIN_DIR); fi
for f in $(TSINTABSRC); do\
- cp $$f $(PATH_XCIN_DIR); echo $(PATH_XCIN_DIR)/$$f >> filelist;\
+ cp $$f $(DESTDIR)$(PATH_XCIN_DIR); echo $(DESTDIR)$(PATH_XCIN_DIR)/$$f >> filelist;\
done
clean:

26
chinese/xcin/patches/patch-ad
View File

@ -1,26 +0,0 @@
--- doc/Makefile.in.orig Wed Feb 24 16:30:33 1999
+++ doc/Makefile.in Tue Jun 27 18:35:25 2000
@@ -6,18 +6,18 @@
install:
if [ ! -d $(PATH_XCIN_MAN) ]; then $(INSTALL_DIR) $(PATH_XCIN_MAN); fi
- if [ ! -d $(PATH_XCIN_MAN)/man1 ]; then $(INSTALL_DIR) $(PATH_XCIN_MAN)/man1; fi
+ if [ ! -d $(PATH_XCIN_MAN)/man1 ]; then $(INSTALL_DIR) $(DESTDIR)$(PATH_XCIN_MAN)/man1; fi
for f in $(MANS); do \
- $(INSTALL_DATA) man/$$f $(PATH_XCIN_MAN)/man1; \
+ $(INSTALL_DATA) man/$$f $(DESTDIR)$(PATH_XCIN_MAN)/man1; \
echo $(PATH_XCIN_MAN)/man1/$$f >> filelist; \
done
- if [ ! -d $(PATH_XCIN_DIR)/docs ]; then $(INSTALL_DIR) $(PATH_XCIN_DIR)/docs; fi
+ if [ ! -d $(DESTDIR)$(PATH_XCIN_DIR)/docs ]; then $(INSTALL_DIR) $(DESTDIR)$(PATH_XCIN_DIR)/docs; fi
for f in $(HOWTO); do \
- $(INSTALL_DATA) howto/$$f $(PATH_XCIN_DIR)/docs; \
+ $(INSTALL_DATA) howto/$$f $(DESTDIR)$(PATH_XCIN_DIR)/docs; \
echo $(PATH_XCIN_DIR)/docs/$$f >> filelist; \
done
for f in $(MISC); do \
- $(INSTALL_DATA) misc/$$f $(PATH_XCIN_DIR)/docs; \
+ $(INSTALL_DATA) misc/$$f $(DESTDIR)$(PATH_XCIN_DIR)/docs; \
echo $(PATH_XCIN_DIR)/docs/$$f >> filelist; \
done

13
chinese/xcin/patches/patch-ac → chinese/xcin/patches/patch-input_tab_Makefile_in
View File

@ -1,6 +1,7 @@
--- input_tab/Makefile.in.orig Wed May 31 22:42:23 2000
+++ input_tab/Makefile.in Thu Jun 1 01:42:46 2000
@@ -15,13 +15,28 @@
$OpenBSD: patch-input_tab_Makefile_in,v 1.1 2004/01/06 20:58:43 sturm Exp $
--- input_tab/Makefile.in.orig 1999-02-24 09:30:34.000000000 +0100
+++ input_tab/Makefile.in 2004-01-06 21:35:17.000000000 +0100
@@ -15,8 +15,23 @@ cin2tab:
(cd ../src; make cin2tab)
ln -s ../src/cin2tab .
@ -26,9 +27,3 @@
install: all
if [ ! -d $(PATH_XCIN_DIR) ]; then $(INSTALL_DIR) $(PATH_XCIN_DIR); fi
for f in $(install_tabs); do\
- cp $$f $(PATH_XCIN_DIR); echo $(PATH_XCIN_DIR)/$$f >> filelist;\
+ cp $$f $(DESTDIR)$(PATH_XCIN_DIR); echo $(DESTDIR)$(PATH_XCIN_DIR)/$$f >> filelist;\
done
clean:

12
chinese/xcin/patches/patch-src_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2004/01/06 20:58:43 sturm Exp $
--- src/Makefile.in.orig 1999-02-24 09:30:33.000000000 +0100
+++ src/Makefile.in 2004-01-06 21:33:55.000000000 +0100
@@ -60,7 +60,7 @@ pho.sel1st: d1st pho1st
sample.phs.out: phs_out sample.phs
./phs_out sample.phs
tsin_pin.map: pin2tsin pin_pho
- ./pin2tsin pin_pho
+ ./pin2tsin pin_pho &
tsin.rel: tsa2rel tsin.rel.src
./tsa2rel tsin.rel.src > tsin.rel