diff options
-rw-r--r-- | x11-wm/windowmaker/Makefile | 43 | ||||
-rw-r--r-- | x11-wm/windowmaker/distinfo | 3 | ||||
-rw-r--r-- | x11-wm/windowmaker/files/LINGUAS | 1 | ||||
-rw-r--r-- | x11-wm/windowmaker/files/patch-bc | 20 | ||||
-rw-r--r-- | x11-wm/windowmaker/files/patch-bd | 14 | ||||
-rw-r--r-- | x11-wm/windowmaker/files/patch-be | 30 | ||||
-rw-r--r-- | x11-wm/windowmaker/files/patch-bf | 8 | ||||
-rw-r--r-- | x11-wm/windowmaker/files/patch-src_config.h.in | 7 | ||||
-rw-r--r-- | x11-wm/windowmaker/files/patch-util_wmaker.inst.in | 24 | ||||
-rw-r--r-- | x11-wm/windowmaker/pkg-plist | 36 |
10 files changed, 136 insertions, 50 deletions
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index 5cb1d7077455..223efa546197 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -6,13 +6,16 @@ # PORTNAME= windowmaker -PORTVERSION= 0.62.1 +PORTVERSION= 0.63.1 CATEGORIES= x11-wm windowmaker MASTER_SITES= ${MASTER_SITE_WINDOWMAKER} \ - http://jgo.local.net/cool_downloads/wm/ + http://jgo.local.net/cool_downloads/wm/ \ + ${MASTER_SITE_LOCAL:S,%SUBDIR%,sobomax,g} MASTER_SITE_SUBDIR= beta/srcs DISTNAME= WindowMaker-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + libwmfun-${PORTVERSION}${EXTRACT_SUFX} \ + ${DATAFILES} MAINTAINER= sobomax@FreeBSD.org @@ -21,7 +24,8 @@ LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ PropList.2:${PORTSDIR}/devel/libPropList \ - intl.1:${PORTSDIR}/devel/gettext + intl.1:${PORTSDIR}/devel/gettext \ + freetype.6:${PORTSDIR}/print/freetype2 USE_BZIP2= yes USE_PERL5= yes @@ -30,23 +34,26 @@ USE_XPM= yes WANT_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ENV= X11BASE=${X11BASE} LIBS=-L${LOCALBASE}/lib \ - CPPFLAGS=-I${LOCALBASE}/include \ - LINGUAS="cs da de el es fi fr gl hr it ja ko nl no pl pt ro ru se sk tr zh_CN zh_TW.Big5" +CONFIGURE_ENV= X11BASE=${X11BASE} \ + LIBS=-L${LOCALBASE}/lib \ + CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2" \ + LINGUAS="${LINGUAS}" CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \ - --with-nlsdir=${PREFIX}/share/locale \ - --with-libs-from="-L${LOCALBASE}/lib" \ - --with-incs-from="-I${LOCALBASE}/include" \ - --with-appspath="${PREFIX}/GNUstep/Apps" \ - --disable-debug + --with-nlsdir=${PREFIX}/share/locale \ + --with-libs-from="-L${LOCALBASE}/lib" \ + --with-incs-from="-I${LOCALBASE}/include" \ + --with-appspath="${PREFIX}/GNUstep/Apps" \ + --disable-debug -MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x \ - wdwrite.1x wmaker.1x wmsetbg.1x wsetfont.1x wxcopy.1x wxpaste.1x +MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \ + wmaker.1x wmsetbg.1x wsetfont.1x wxcopy.1x wxpaste.1x DATAFILES= WindowMaker-extra-0.1.tar.bz2 .include <bsd.port.pre.mk> +LINGUAS!= /bin/cat ${FILESDIR}/LINGUAS + .if defined(HAVE_GNOME) CONFIGURE_ARGS+= --enable-gnome .endif @@ -63,10 +70,6 @@ pre-extract: CONFIGURE_ARGS+= --enable-single-icon .endif -post-extract: - @cd ${WRKSRC} && \ - ${TAR} xfz libwmfun-0.0.3.tar.gz - post-patch: @perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c \ ${WRKSRC}/WindowMaker/Defaults/* @@ -80,4 +83,8 @@ post-install: ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET} ${MKDIR} ${PREFIX}/share/WindowMaker/Sounds +update-LINGUAS: extract + cd ${WRKSRC}/po && \ + ${ECHO} *.po | ${SED} 's|\.po||g' > ${FILESDIR}/LINGUAS + .include <bsd.port.post.mk> diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo index 5df7cc9af279..7ab9841bf4cd 100644 --- a/x11-wm/windowmaker/distinfo +++ b/x11-wm/windowmaker/distinfo @@ -1,2 +1,3 @@ -MD5 (WindowMaker-0.62.1.tar.bz2) = 9d2deac6de78af0766392803cb414c62 +MD5 (WindowMaker-0.63.1.tar.bz2) = 681de0bf984a370236f3f0e56848392b +MD5 (libwmfun-0.63.1.tar.bz2) = 9fb998465fafab4a8b6ab404285896e9 MD5 (WindowMaker-extra-0.1.tar.bz2) = e6fb381da0d207c320f58e7a1fea2a2b diff --git a/x11-wm/windowmaker/files/LINGUAS b/x11-wm/windowmaker/files/LINGUAS new file mode 100644 index 000000000000..5c816383846a --- /dev/null +++ b/x11-wm/windowmaker/files/LINGUAS @@ -0,0 +1 @@ +bg cs da de el es fi fr gl hr hu it ja ko nl no pl pt ro ru se sk tr zh_CN zh_TW.Big5 diff --git a/x11-wm/windowmaker/files/patch-bc b/x11-wm/windowmaker/files/patch-bc index d8bd380ede3b..81792bcdc0fc 100644 --- a/x11-wm/windowmaker/files/patch-bc +++ b/x11-wm/windowmaker/files/patch-bc @@ -1,22 +1,22 @@ ---- configure.orig Thu Mar 30 15:37:36 2000 -+++ configure Fri Mar 31 00:27:19 2000 -@@ -5866,7 +5866,8 @@ - WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile \ - WindowMaker/Themes/Makefile \ +--- configure.orig Thu Jan 4 12:10:11 2001 ++++ configure Thu Jan 4 12:30:57 2001 +@@ -5897,7 +5897,8 @@ + WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile \ + WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile \ WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \ - WPrefs.app/po/Makefile contrib/WindowMaker.spec src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + WPrefs.app/po/Makefile \ -+ libwmfun-0.0.3/libwmfun/Makefile contrib/WindowMaker.spec src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 ++ plugins/libwmfun/Makefile contrib/WindowMaker.spec src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF -@@ -5999,7 +6000,8 @@ - WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile \ - WindowMaker/Themes/Makefile \ +@@ -6030,7 +6031,8 @@ + WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile \ + WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile \ WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \ - WPrefs.app/po/Makefile contrib/WindowMaker.spec "} + WPrefs.app/po/Makefile \ -+ libwmfun-0.0.3/libwmfun/Makefile contrib/WindowMaker.spec "} ++ plugins/libwmfun/Makefile contrib/WindowMaker.spec "} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/x11-wm/windowmaker/files/patch-bd b/x11-wm/windowmaker/files/patch-bd index 7435bb53bafa..b475c82ba387 100644 --- a/x11-wm/windowmaker/files/patch-bd +++ b/x11-wm/windowmaker/files/patch-bd @@ -1,12 +1,12 @@ ---- Makefile.in.orig Tue Feb 15 16:03:27 2000 -+++ Makefile.in Tue Feb 15 15:22:24 2000 -@@ -92,7 +92,8 @@ - X_LIBRARY_PATH = @X_LIBRARY_PATH@ +--- Makefile.in 2001/01/04 10:32:11 1.1 ++++ Makefile.in 2001/01/04 10:32:58 +@@ -91,7 +91,8 @@ + supported_locales = @supported_locales@ wprefsdir = @wprefsdir@ -SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc contrib -+SUBDIRS = wrlib WINGs src util po WindowMaker wmlib WPrefs.app doc contrib \ -+ libwmfun-0.0.3/libwmfun ++SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc contrib \ ++ plugins/libwmfun - EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL Install acconfig.h INSTALL.pt mkpatch README.KDE README.GNOME WindowMaker.lsm.in docklib-0.2.tar.gz libwmfun-0.0.3.tar.gz + EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.WTFPL Install acconfig.h INSTALL.pt README.pt mkpatch README.KDE README.GNOME WindowMaker.lsm.in README.definable-cursor libwmfun-0.0.3.tar.gz diff --git a/x11-wm/windowmaker/files/patch-be b/x11-wm/windowmaker/files/patch-be index 4b055782f025..7c9a6c35411d 100644 --- a/x11-wm/windowmaker/files/patch-be +++ b/x11-wm/windowmaker/files/patch-be @@ -1,5 +1,5 @@ ---- libwmfun-0.0.3/libwmfun/Makefile.in.orig Tue Feb 15 16:04:35 2000 -+++ libwmfun-0.0.3/libwmfun/Makefile.in Tue Feb 15 15:44:31 2000 +--- plugins/libwmfun/Makefile.in.orig Thu Jan 4 12:16:06 2001 ++++ plugins/libwmfun/Makefile.in Fri Jan 5 12:47:05 2001 @@ -38,7 +38,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -9,7 +9,7 @@ ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ -@@ -69,6 +69,8 @@ +@@ -70,6 +70,8 @@ RANLIB = @RANLIB@ VERSION = @VERSION@ @@ -17,8 +17,17 @@ + lib_LTLIBRARIES = libwmfun.la - libwmfun_la_SOURCES = bilinear.c fade.c generic.c generic.h getopt.c getopt.h getopt1.c wave.c -@@ -104,12 +106,12 @@ + libwmfun_la_LDFLAGS = -version-info 1:0:1 +@@ -86,7 +88,7 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ +-libwmfun_la_LIBADD = ++libwmfun_la_LIBADD = -lfreetype + libwmfun_la_OBJECTS = bilinear.lo fade.lo generic.lo getopt.lo \ + getopt1.lo wave.lo drawstring.lo + CFLAGS = @CFLAGS@ +@@ -107,12 +109,12 @@ all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s @@ -36,4 +45,13 @@ +# && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - mostlyclean-libLTLIBRARIES: + config.h: stamp-h +@@ -275,7 +277,7 @@ + install: install-am + uninstall-am: uninstall-libLTLIBRARIES + uninstall: uninstall-am +-all-am: Makefile $(LTLIBRARIES) config.h ++all-am: Makefile $(LTLIBRARIES) + all-redirect: all-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/x11-wm/windowmaker/files/patch-bf b/x11-wm/windowmaker/files/patch-bf index 3863a4199df2..7d0f58251b09 100644 --- a/x11-wm/windowmaker/files/patch-bf +++ b/x11-wm/windowmaker/files/patch-bf @@ -1,10 +1,10 @@ ---- wrlib/Makefile.in.orig Fri Mar 31 00:37:27 2000 -+++ wrlib/Makefile.in Fri Mar 31 11:48:42 2000 -@@ -96,7 +96,7 @@ +--- wrlib/Makefile.in.orig Sun Jan 7 01:22:01 2001 ++++ wrlib/Makefile.in Mon Jan 8 01:20:22 2001 +@@ -97,7 +97,7 @@ lib_LTLIBRARIES = libwraster.la --libwraster_la_LDFLAGS = -version-info 2:0:0 +-libwraster_la_LDFLAGS = -version-info 2:1:0 +libwraster_la_LDFLAGS = -version-info 3:0:0 bin_SCRIPTS = get-wraster-flags diff --git a/x11-wm/windowmaker/files/patch-src_config.h.in b/x11-wm/windowmaker/files/patch-src_config.h.in new file mode 100644 index 000000000000..95f2aee6d0a0 --- /dev/null +++ b/x11-wm/windowmaker/files/patch-src_config.h.in @@ -0,0 +1,7 @@ +--- src/config.h.in 2001/01/05 10:30:03 1.1 ++++ src/config.h.in 2001/01/05 10:30:18 +@@ -206,3 +206,4 @@ + /* Version number of package */ + #undef VERSION + ++#define USE_FREETYPE diff --git a/x11-wm/windowmaker/files/patch-util_wmaker.inst.in b/x11-wm/windowmaker/files/patch-util_wmaker.inst.in new file mode 100644 index 000000000000..b8e4545d643c --- /dev/null +++ b/x11-wm/windowmaker/files/patch-util_wmaker.inst.in @@ -0,0 +1,24 @@ +--- util/wmaker.inst.in 2001/01/08 01:41:27 1.1 ++++ util/wmaker.inst.in 2001/01/08 01:48:25 +@@ -65,12 +65,18 @@ + elif [ "$file" = "WMRootMenu" ]; then + if [ "$LOCALE" ]; then + if [ -f $GLOBALDIR/plmenu.${LOCALE%_*} ]; then +- cp $GLOBALDIR/plmenu.${LOCALE%_*} $GSDIR/Defaults/WMRootMenu ++ sed -e "s|\$HOME/GNUstep|$GSDIR|g" \ ++ -e "s:#wmdatadir#:$GLOBALDIR:g" \ ++ $GLOBALDIR/plmenu.${LOCALE%_*} > $GSDIR/Defaults/WMRootMenu + else +- cp $GLOBALDIR/plmenu $GSDIR/Defaults/WMRootMenu ++ sed -e "s|\$HOME/GNUstep|$GSDIR|g" \ ++ -e "s:#wmdatadir#:$GLOBALDIR:g" \ ++ $GLOBALDIR/plmenu > $GSDIR/Defaults/WMRootMenu + fi + else +- cp $GLOBALDIR/plmenu $GSDIR/Defaults/WMRootMenu ++ sed -e "s|\$HOME/GNUstep|$GSDIR|g" \ ++ -e "s:#wmdatadir#:$GLOBALDIR:g" \ ++ $GLOBALDIR/plmenu > $GSDIR/Defaults/WMRootMenu + fi + else + if test "x$GNUSTEP_USER_ROOT" = "x"; then diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist index c2e616319dcd..6bfb95c1b1ab 100644 --- a/x11-wm/windowmaker/pkg-plist +++ b/x11-wm/windowmaker/pkg-plist @@ -75,9 +75,11 @@ bin/setstyle bin/wdwrite bin/wkdemenu.pl bin/wm-oldmenu2new +bin/wmagnify bin/wmaker bin/wmaker.inst bin/wmsetbg +bin/wmsetup bin/wsetfont bin/wxcopy bin/wxpaste @@ -86,17 +88,20 @@ etc/WindowMaker/WMRootMenu etc/WindowMaker/WMState etc/WindowMaker/WMWindowAttributes etc/WindowMaker/WindowMaker -include/WINGs.h -include/WINGsP.h +include/WINGs/WINGs.h +include/WINGs/WINGsP.h +include/WINGs/WUtil.h +include/WINGs/wtabledelegates.h +include/WINGs/wtableview.h include/WMaker.h -include/WUtil.h include/wraster.h +lib/libExtraWINGs.a lib/libWINGs.a lib/libWMaker.a lib/libWUtil.a lib/libwmfun.a lib/libwmfun.so -lib/libwmfun.so.0 +lib/libwmfun.so.1 lib/libwraster.a lib/libwraster.so lib/libwraster.so.3 @@ -133,6 +138,7 @@ share/WindowMaker/Icons/EscherTriangle.xpm share/WindowMaker/Icons/Fish5.dir.xpm share/WindowMaker/Icons/Football.xpm share/WindowMaker/Icons/FootballUS.xpm +share/WindowMaker/Icons/Ftp.png share/WindowMaker/Icons/GNUstep.tiff share/WindowMaker/Icons/GNUstep.xpm share/WindowMaker/Icons/GNUstep3D.tiff @@ -143,6 +149,7 @@ share/WindowMaker/Icons/GNUterm.tiff share/WindowMaker/Icons/GNUterm.xpm share/WindowMaker/Icons/Gear.xpm share/WindowMaker/Icons/Ghost.xpm +share/WindowMaker/Icons/GreenWilber.png share/WindowMaker/Icons/HP-16C-48.xpm share/WindowMaker/Icons/HandOpen.xpm share/WindowMaker/Icons/HandPointing.xpm @@ -150,19 +157,27 @@ share/WindowMaker/Icons/HandPointingLeft.xpm share/WindowMaker/Icons/HandPunch.xpm share/WindowMaker/Icons/HandReach.xpm share/WindowMaker/Icons/HeroSandwich.dir.xpm +share/WindowMaker/Icons/ICQ.png share/WindowMaker/Icons/LadyBug48x48.xpm share/WindowMaker/Icons/Microphone.xpm +share/WindowMaker/Icons/Mozilla.png +share/WindowMaker/Icons/Netscape.png share/WindowMaker/Icons/Netscape.xpm share/WindowMaker/Icons/NewsAgent.xpm share/WindowMaker/Icons/PDF.xpm share/WindowMaker/Icons/Padlock.xpm share/WindowMaker/Icons/Paint.xpm +share/WindowMaker/Icons/Pen.png +share/WindowMaker/Icons/Pencil.png share/WindowMaker/Icons/Pencils.24.xpm share/WindowMaker/Icons/Penguin.xpm share/WindowMaker/Icons/Radio.xpm +share/WindowMaker/Icons/Real.png share/WindowMaker/Icons/Reference.xpm share/WindowMaker/Icons/Rumi.xpm +share/WindowMaker/Icons/Shell.png share/WindowMaker/Icons/Snail.xpm +share/WindowMaker/Icons/Speaker.png share/WindowMaker/Icons/T2-Film.xpm share/WindowMaker/Icons/TagIcon.xpm share/WindowMaker/Icons/TapeIcon1.xpm @@ -176,6 +191,7 @@ share/WindowMaker/Icons/TrueDie48.xpm share/WindowMaker/Icons/WheelbarrowFull.xpm share/WindowMaker/Icons/WordEditor.xpm share/WindowMaker/Icons/Wrench-12bit.xpm +share/WindowMaker/Icons/XChat.png share/WindowMaker/Icons/bomb2.xpm share/WindowMaker/Icons/clip.tiff share/WindowMaker/Icons/clip.xpm @@ -243,7 +259,11 @@ share/WindowMaker/Styles/Golden.style share/WindowMaker/Styles/Green.style share/WindowMaker/Styles/GreyBlue.style share/WindowMaker/Styles/Gtk.style +share/WindowMaker/Styles/IRednBlue.style +share/WindowMaker/Styles/Interlace.style share/WindowMaker/Styles/LightBlue.style +share/WindowMaker/Styles/NewBlue.style +share/WindowMaker/Styles/NightSky.style share/WindowMaker/Styles/Pastel.style share/WindowMaker/Styles/Pink.style share/WindowMaker/Styles/Pumpkin.style @@ -275,6 +295,7 @@ share/WindowMaker/Themes/SteelBlueSilk.style share/WindowMaker/autostart.sh share/WindowMaker/exitscript.sh share/WindowMaker/menu +share/WindowMaker/menu.bg share/WindowMaker/menu.ca share/WindowMaker/menu.cz share/WindowMaker/menu.da @@ -294,6 +315,7 @@ share/WindowMaker/menu.nl share/WindowMaker/menu.no share/WindowMaker/menu.pl share/WindowMaker/menu.pt +share/WindowMaker/menu.ro share/WindowMaker/menu.ru share/WindowMaker/menu.se share/WindowMaker/menu.sl @@ -301,17 +323,22 @@ share/WindowMaker/menu.tr share/WindowMaker/menu.zh_CN share/WindowMaker/menu.zh_TW.Big5 share/WindowMaker/plmenu +share/WindowMaker/plmenu.bg share/WindowMaker/plmenu.da share/WindowMaker/plmenu.de +share/WindowMaker/plmenu.es share/WindowMaker/plmenu.fi share/WindowMaker/plmenu.fr share/WindowMaker/plmenu.hr share/WindowMaker/plmenu.it share/WindowMaker/plmenu.ko share/WindowMaker/plmenu.pl +share/WindowMaker/plmenu.ro share/WindowMaker/plmenu.zh_CN share/WindowMaker/wmmacros share/WindowMaker/xtree.dat +share/locale/bg/LC_MESSAGES/WPrefs.mo +share/locale/bg/LC_MESSAGES/WindowMaker.mo share/locale/cs/LC_MESSAGES/WPrefs.mo share/locale/cs/LC_MESSAGES/WindowMaker.mo share/locale/da/LC_MESSAGES/WindowMaker.mo @@ -362,6 +389,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/WindowMaker.mo @dirrm share/WindowMaker/Backgrounds @dirrm share/WindowMaker @dirrm share/WINGs +@dirrm include/WINGs @dirrm etc/WindowMaker @dirrm GNUstep/Apps/WPrefs.app/xpm @dirrm GNUstep/Apps/WPrefs.app/tiff |