diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-07-02 15:03:17 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-07-02 15:03:17 +0000 |
commit | ccbde9b1103901f197d4740a195d16d1c922d1c6 (patch) | |
tree | d503bcacccefa84333665eb2f57259673d5dc054 /x11-wm | |
parent | Update to 0.2.4. (diff) |
Update to 0.80.1.
Notes
Notes:
svn path=/head/; revision=62343
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/windowmaker/Makefile | 12 | ||||
-rw-r--r-- | x11-wm/windowmaker/distinfo | 2 | ||||
-rw-r--r-- | x11-wm/windowmaker/files/LINGUAS | 2 | ||||
-rw-r--r-- | x11-wm/windowmaker/files/patch-WINGs::findfile.c | 22 | ||||
-rw-r--r-- | x11-wm/windowmaker/files/patch-WPrefs.app::po::Makefile.in | 15 | ||||
-rw-r--r-- | x11-wm/windowmaker/files/patch-configure | 13 | ||||
-rw-r--r-- | x11-wm/windowmaker/files/patch-ltmain.sh | 28 | ||||
-rw-r--r-- | x11-wm/windowmaker/files/patch-po::Makefile.in | 15 | ||||
-rw-r--r-- | x11-wm/windowmaker/pkg-plist | 3 |
9 files changed, 54 insertions, 58 deletions
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index 537ead3138aa..5204c88ee3d9 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -6,8 +6,7 @@ # PORTNAME= windowmaker -PORTVERSION= 0.80.0 -PORTREVISION= 1 +PORTVERSION= 0.80.1 CATEGORIES= x11-wm windowmaker MASTER_SITES= ${MASTER_SITE_WINDOWMAKER} MASTER_SITE_SUBDIR= source/release @@ -26,9 +25,10 @@ USE_BZIP2= yes USE_PERL5= yes USE_X_PREFIX= yes USE_XPM= yes +USE_REINPLACE= yes WANT_GNOME= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ENV= X11BASE=${X11BASE} \ LIBS="-L${LOCALBASE}/lib -lintl" \ CPPFLAGS="-I${LOCALBASE}/include" \ @@ -62,9 +62,9 @@ pre-extract: .endif post-patch: - @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c - @${PERL} -pi -e "s|%%PERL%%|${PERL}|g" ${WRKSRC}/util/wm-oldmenu2new - @${PERL} -pi -e "s|/usr/local/GNUstep|${PREFIX}/GNUstep|g" \ + @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c + @${REINPLACE_CMD} -e "s|%%PERL%%|${PERL}|g" ${WRKSRC}/util/wm-oldmenu2new + @${REINPLACE_CMD} -e "s|/usr/local/GNUstep|${PREFIX}/GNUstep|g" \ ${WRKSRC}/WindowMaker/*menu* post-install: diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo index a172ff2c1882..eb4e9862a512 100644 --- a/x11-wm/windowmaker/distinfo +++ b/x11-wm/windowmaker/distinfo @@ -1 +1 @@ -MD5 (WindowMaker-0.80.0.tar.bz2) = e08180af7413b5b5f9c1cfd559a5c550 +MD5 (WindowMaker-0.80.1.tar.bz2) = ec28fe39e1e80432d69fb9e237ebaef7 diff --git a/x11-wm/windowmaker/files/LINGUAS b/x11-wm/windowmaker/files/LINGUAS index 4354c8c3642e..f5a51c114030 100644 --- a/x11-wm/windowmaker/files/LINGUAS +++ b/x11-wm/windowmaker/files/LINGUAS @@ -1 +1 @@ -bg cs da de el es et fi fr gl hr hu it ja ko nl no pl pt ro ru sk sv tr zh_CN zh_TW.Big5 +bg cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW.Big5 diff --git a/x11-wm/windowmaker/files/patch-WINGs::findfile.c b/x11-wm/windowmaker/files/patch-WINGs::findfile.c deleted file mode 100644 index a3215ab44678..000000000000 --- a/x11-wm/windowmaker/files/patch-WINGs::findfile.c +++ /dev/null @@ -1,22 +0,0 @@ - -$FreeBSD$ - ---- WINGs/findfile.c.orig Thu Oct 4 06:39:17 2001 -+++ WINGs/findfile.c Thu Oct 25 11:14:56 2001 -@@ -1,5 +1,5 @@ - /* -- * Window Maker miscelaneous function library -+ * Window Maker miscellaneous function library - * - * Copyright (c) 1997 Alfredo K. Kojima - * -@@ -226,7 +226,8 @@ - } - wfree(fullpath); - } -- tmp=&(tmp[len+1]); -+ tmp=&(tmp[len]); -+ if (*tmp==':') tmp++; - if (*tmp==0) break; - } - return NULL; diff --git a/x11-wm/windowmaker/files/patch-WPrefs.app::po::Makefile.in b/x11-wm/windowmaker/files/patch-WPrefs.app::po::Makefile.in new file mode 100644 index 000000000000..ea90921c33a9 --- /dev/null +++ b/x11-wm/windowmaker/files/patch-WPrefs.app::po::Makefile.in @@ -0,0 +1,15 @@ + +$FreeBSD$ + +--- WPrefs.app/po/Makefile.in 2002/07/02 13:43:18 1.1 ++++ WPrefs.app/po/Makefile.in 2002/07/02 13:43:38 +@@ -218,6 +218,9 @@ + .po.mo: + msgfmt -o $@ $< + ++zh_TW.Big5.mo: zh_TW.Big5.po ++ OLD_PO_FILE_INPUT=1 msgfmt -o $@ $< ++ + WPrefs.pot: $(POTFILES) + xgettext --default-domain=WPrefs \ + --add-comments --keyword=_ $(POTFILES) diff --git a/x11-wm/windowmaker/files/patch-configure b/x11-wm/windowmaker/files/patch-configure new file mode 100644 index 000000000000..d0da9e652dff --- /dev/null +++ b/x11-wm/windowmaker/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/07/02 13:53:17 1.1 ++++ configure 2002/07/02 13:53:27 +@@ -7196,6 +7196,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/x11-wm/windowmaker/files/patch-ltmain.sh b/x11-wm/windowmaker/files/patch-ltmain.sh deleted file mode 100644 index 98cb05e4ddb3..000000000000 --- a/x11-wm/windowmaker/files/patch-ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh 2001/08/27 09:51:26 1.1 -+++ ltmain.sh 2001/08/27 09:51:42 -@@ -2408,6 +2408,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4175,10 +4178,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/x11-wm/windowmaker/files/patch-po::Makefile.in b/x11-wm/windowmaker/files/patch-po::Makefile.in new file mode 100644 index 000000000000..cb8a29c51ad7 --- /dev/null +++ b/x11-wm/windowmaker/files/patch-po::Makefile.in @@ -0,0 +1,15 @@ + +$FreeBSD$ + +--- po/Makefile.in 2002/07/02 13:39:31 1.1 ++++ po/Makefile.in 2002/07/02 13:42:52 +@@ -219,6 +219,9 @@ + .po.mo: + msgfmt -o $@ $< + ++zh_TW.Big5.mo: zh_TW.Big5.po ++ OLD_PO_FILE_INPUT=1 msgfmt -o $@ $< ++ + WindowMaker.pot: $(POTFILES) + xgettext --default-domain=WindowMaker \ + --add-comments --keyword=_ $(POTFILES) diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist index 35d944c71fd1..da88c9f6d53e 100644 --- a/x11-wm/windowmaker/pkg-plist +++ b/x11-wm/windowmaker/pkg-plist @@ -127,6 +127,7 @@ share/WindowMaker/Icons/GNUterm.tiff share/WindowMaker/Icons/GNUterm.xpm share/WindowMaker/Icons/GreenWilber.png share/WindowMaker/Icons/ICQ.png +share/WindowMaker/Icons/Jabber.png share/WindowMaker/Icons/Mozilla.png share/WindowMaker/Icons/Netscape.png share/WindowMaker/Icons/Pen.png @@ -275,6 +276,7 @@ share/locale/cs/LC_MESSAGES/WINGs.mo share/locale/cs/LC_MESSAGES/WPrefs.mo share/locale/cs/LC_MESSAGES/WindowMaker.mo share/locale/da/LC_MESSAGES/WindowMaker.mo +share/locale/de/LC_MESSAGES/WINGs.mo share/locale/de/LC_MESSAGES/WPrefs.mo share/locale/de/LC_MESSAGES/WindowMaker.mo share/locale/el/LC_MESSAGES/WindowMaker.mo @@ -297,6 +299,7 @@ share/locale/ja/LC_MESSAGES/WPrefs.mo share/locale/ja/LC_MESSAGES/WindowMaker.mo share/locale/ko/LC_MESSAGES/WPrefs.mo share/locale/ko/LC_MESSAGES/WindowMaker.mo +share/locale/ms/LC_MESSAGES/WindowMaker.mo share/locale/nl/LC_MESSAGES/WindowMaker.mo share/locale/no/LC_MESSAGES/WindowMaker.mo share/locale/pl/LC_MESSAGES/WindowMaker.mo |