diff options
| author | vanilla <vanilla@FreeBSD.org> | 2017-03-05 23:03:25 +0800 |
|---|---|---|
| committer | vanilla <vanilla@FreeBSD.org> | 2017-03-05 23:03:25 +0800 |
| commit | 4e3e7819ddc9b63d9696dbb67e30656644348a35 (patch) | |
| tree | 1f4ba1352667141d89b160d4d7bf3e102304fa37 /chinese | |
| parent | 1a3dcda89ab5ee9bf8306144605bcc89fec1947a (diff) | |
| download | freebsd-ports-gnome-4e3e7819ddc9b63d9696dbb67e30656644348a35.tar.gz freebsd-ports-gnome-4e3e7819ddc9b63d9696dbb67e30656644348a35.tar.zst freebsd-ports-gnome-4e3e7819ddc9b63d9696dbb67e30656644348a35.zip | |
Revert patch-Makefile to fix building with DOCS on.
Diffstat (limited to 'chinese')
| -rw-r--r-- | chinese/gcin/Makefile | 1 | ||||
| -rw-r--r-- | chinese/gcin/files/patch-Makefile | 28 |
2 files changed, 10 insertions, 19 deletions
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile index 6ab28de2554a..6d8ffd6ab0f7 100644 --- a/chinese/gcin/Makefile +++ b/chinese/gcin/Makefile @@ -68,6 +68,7 @@ post-patch: ${WRKSRC}/scripts/utf8-edit @${REINPLACE_CMD} -e '/make/ d' ${WRKSRC}/IMdkit/lib/Makefile @${REINPLACE_CMD} -e 's,/usr/X11R6/lib,${LOCALBASE}/lib,' ${WRKSRC}/im-client/Makefile + post-patch-DOCS-off: @${REINPLACE_CMD} '/install.*DOC_DIR/d' ${WRKSRC}/Makefile diff --git a/chinese/gcin/files/patch-Makefile b/chinese/gcin/files/patch-Makefile index 68c5731387cc..f97b3bc273c4 100644 --- a/chinese/gcin/files/patch-Makefile +++ b/chinese/gcin/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2014-01-26 06:41:39 UTC -+++ Makefile +--- Makefile.orig 2014-01-26 14:41:39.000000000 +0800 ++++ Makefile 2014-04-12 10:55:35.584554559 +0800 @@ -4,8 +4,11 @@ include config.mak include suffixes-rule @@ -38,13 +38,13 @@ gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) - $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB) -+ $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB) ++ $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L%%PREFIX%%/$(LIB) rm -f core.* vgcore.* ln -sf $@ $@.test gcin-nocur: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) - $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB) -+ $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB) ++ $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L%%PREFIX%%/$(LIB) rm -f core.* -tslearn: $(OBJS_TSLEARN) @@ -86,7 +86,7 @@ $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_message) -L./im-client -lgcin-im-client $(LDFLAGS) pin-juyin: $(OBJS_pin_juyin) -@@ -223,22 +231,18 @@ install: +@@ -223,12 +231,12 @@ install: $(MAKE) -C data install $(MAKE) -C im-client install $(MAKE) -C gtk-im install @@ -97,22 +97,12 @@ if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im install; fi - if [ $(prefix) = /usr/local ]; then \ - install -m 644 gcin.png /usr/share/icons/hicolor/64x64/apps; \ -- install -d $(DOC_DIR); \ -- install -m 644 README.html Changelog.html $(DOC_DIR); \ + if [ $(prefix) = /nonstaged ]; then \ + install -m 644 gcin.png $(prefix)/share/icons/hicolor/64x64/apps; \ + install -d $(DOC_DIR); \ + install -m 644 README.html Changelog.html $(DOC_DIR); \ install $(PROGS) $(bindir); \ - rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \ - rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \ - rm -f $(bindir)/ts-contribute-en; ln -sf ts-edit $(bindir)/ts-contribute-en; \ - rm -f $(bindir)/ts-edit-en; ln -sf ts-edit $(bindir)/ts-edit-en; \ - else \ -- install -d $(DOC_DIR_i); \ -- install -m 644 README.html Changelog.html $(DOC_DIR_i); \ - install -s $(PROGS) $(bindir); \ - rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \ - rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \ -@@ -246,6 +250,7 @@ install: +@@ -246,6 +254,7 @@ install: rm -f $(bindir)/ts-edit-en; ln -sf ts-edit $(bindir)/ts-edit-en; \ fi $(MAKE) -C scripts install @@ -120,7 +110,7 @@ $(MAKE) -C menu install if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po install; fi -@@ -279,4 +284,4 @@ gcin-fedora.spec: gcin-fedora.spec.in VE +@@ -279,4 +288,4 @@ gcin-fedora.spec: gcin-fedora.spec.in VE rm -f $@ sed -e "s/__gcin_version__/$(GCIN_VERSION)/" < $< > $@ |