diff options
author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-03-29 22:04:10 +0000 |
---|---|---|
committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-03-29 22:04:10 +0000 |
commit | b8dc46699047e96ebaef85ee16d85671bcb4c6da (patch) | |
tree | 7931ae247b101ab7d118f5e03e8a2a127c17f6fb /net | |
parent | - Security Update (diff) |
Update to 1.1.13
Notes
Notes:
svn path=/head/; revision=77703
Diffstat (limited to 'net')
-rw-r--r-- | net/lmule/Makefile | 14 | ||||
-rw-r--r-- | net/lmule/distinfo | 2 | ||||
-rw-r--r-- | net/lmule/files/patch-Makefile.in | 13 | ||||
-rw-r--r-- | net/lmule/files/patch-configure | 11 | ||||
-rw-r--r-- | net/lmule/files/patch-src::wx::Makefile.in | 13 | ||||
-rw-r--r-- | net/lmule/files/patch-src::wx::xrc::Makefile.in | 39 | ||||
-rw-r--r-- | net/lmule/pkg-plist | 6 | ||||
-rw-r--r-- | net/xmule/Makefile | 14 | ||||
-rw-r--r-- | net/xmule/distinfo | 2 | ||||
-rw-r--r-- | net/xmule/files/patch-Makefile.in | 13 | ||||
-rw-r--r-- | net/xmule/files/patch-configure | 11 | ||||
-rw-r--r-- | net/xmule/files/patch-src::wx::Makefile.in | 13 | ||||
-rw-r--r-- | net/xmule/files/patch-src::wx::xrc::Makefile.in | 39 | ||||
-rw-r--r-- | net/xmule/pkg-plist | 6 |
14 files changed, 188 insertions, 8 deletions
diff --git a/net/lmule/Makefile b/net/lmule/Makefile index 20d26895dc99..d6af21799b1b 100644 --- a/net/lmule/Makefile +++ b/net/lmule/Makefile @@ -6,7 +6,7 @@ # PORTNAME= lmule -PORTVERSION= 1.1.12 +PORTVERSION= 1.1.13 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= lmule @@ -15,6 +15,7 @@ MAINTAINER= lioux@FreeBSD.org COMMENT= Port of eMule eDonkey P2P client using wxWindows class library LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \ + expat.4:${PORTSDIR}/textproc/expat2 \ wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget @@ -25,12 +26,13 @@ USE_GNOME= gnomehier \ gnomeprefix \ gtk12 USE_REINPLACE= yes +USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-included-gettext \ --with-libintl-prefix=${LOCALBASE} \ --with-wx-config=${WX_CONFIG} -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" WX_CONFIG?= "${X11BASE}/bin/wx-config" @@ -40,4 +42,10 @@ post-patch: -e 's|(Linux)|FreeBSD/\1|' \ ${WRKSRC}/src/*.cpp +pre-configure: + @${FIND} ${WRKSRC} -type f -name "Makefile.in" | \ + ${XARGS} -x -n 10 \ + ${REINPLACE_CMD} -E \ + -e 's!^(AUTOCONF|AUTOHEADER|AUTOMAKE|ACLOCAL).*$$!\1=${TRUE}!' + .include <bsd.port.mk> diff --git a/net/lmule/distinfo b/net/lmule/distinfo index d31df86334f4..63ce01641713 100644 --- a/net/lmule/distinfo +++ b/net/lmule/distinfo @@ -1 +1 @@ -MD5 (lmule-1.1.12.tar.gz) = 5500d7fe97576375b52c00699a87cda3 +MD5 (lmule-1.1.13.tar.gz) = 88a4c8db46d9ac14e58818920d8a7f58 diff --git a/net/lmule/files/patch-Makefile.in b/net/lmule/files/patch-Makefile.in new file mode 100644 index 000000000000..567c4866a400 --- /dev/null +++ b/net/lmule/files/patch-Makefile.in @@ -0,0 +1,13 @@ +--- Makefile.in.orig Sat Mar 29 14:15:55 2003 ++++ Makefile.in Sat Mar 29 15:30:59 2003 +@@ -70,8 +70,10 @@ + BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ ++CFLAGS = @CFLAGS@ + CPP = @CPP@ + CXX = @CXX@ ++CXXFLAGS = @CXXFLAGS@ + DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ + DISABLE_PROGRESS = @DISABLE_PROGRESS@ diff --git a/net/lmule/files/patch-configure b/net/lmule/files/patch-configure new file mode 100644 index 000000000000..d6a4608344df --- /dev/null +++ b/net/lmule/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sat Mar 29 14:13:57 2003 ++++ configure Sat Mar 29 14:14:04 2003 +@@ -1704,8 +1704,6 @@ + + # Checks for programs. + # hopefully this prevents -O2 +-CXXFLAGS="-g" +-CFLAGS="-g" + ac_ext=cc + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/net/lmule/files/patch-src::wx::Makefile.in b/net/lmule/files/patch-src::wx::Makefile.in new file mode 100644 index 000000000000..23c533311f1f --- /dev/null +++ b/net/lmule/files/patch-src::wx::Makefile.in @@ -0,0 +1,13 @@ +--- src/wx/Makefile.in.orig Sat Mar 29 16:39:22 2003 ++++ src/wx/Makefile.in Sat Mar 29 16:39:46 2003 +@@ -70,8 +70,10 @@ + BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ ++CFLAGS = @CFLAGS@ + CPP = @CPP@ + CXX = @CXX@ ++CXXFLAGS = @CXXFLAGS@ + DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ + DISABLE_PROGRESS = @DISABLE_PROGRESS@ diff --git a/net/lmule/files/patch-src::wx::xrc::Makefile.in b/net/lmule/files/patch-src::wx::xrc::Makefile.in new file mode 100644 index 000000000000..b5a03e1bff20 --- /dev/null +++ b/net/lmule/files/patch-src::wx::xrc::Makefile.in @@ -0,0 +1,39 @@ +--- src/wx/xrc/Makefile.in.orig Sat Mar 29 17:01:36 2003 ++++ src/wx/xrc/Makefile.in Sat Mar 29 17:02:07 2003 +@@ -70,8 +70,10 @@ + BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ ++CFLAGS = @CFLAGS@ + CPP = @CPP@ + CXX = @CXX@ ++CXXFLAGS = @CXXFLAGS@ + DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ + DISABLE_PROGRESS = @DISABLE_PROGRESS@ +@@ -285,7 +287,7 @@ + + + .cpp.o : +- $(CXX) -I../.. -c `wx-config --cxxflags` $< ++ $(CXX) $(CXXFLAGS) -I../.. -c `wx-config --cxxflags` $< + + all: $(LIBRARY) + +@@ -297,13 +299,13 @@ + rm -f *.o *.a + + xmlrole.o: +- $(CC) -c expat/xmltok/xmlrole.c ++ $(CC) $(CFLAGS) -c expat/xmltok/xmlrole.c + + xmltok.o: +- $(CC) -c expat/xmltok/xmltok.c ++ $(CC) $(CFLAGS) -c expat/xmltok/xmltok.c + + xmlparse.o: xmlrole.o xmltok.o +- $(CC) -Iexpat/xmltok -c expat/xmlparse/xmlparse.c ++ $(CC) $(CFLAGS) -Iexpat/xmltok -c expat/xmlparse/xmlparse.c + + xml.o: + $(CXX) -I../.. -Iexpat/xmlparse $(INCLUDES) -c `wx-config --cxxflags` xml.cpp diff --git a/net/lmule/pkg-plist b/net/lmule/pkg-plist index a20f046f2ecf..2db6df4eb592 100644 --- a/net/lmule/pkg-plist +++ b/net/lmule/pkg-plist @@ -3,12 +3,18 @@ share/gnome/applications/lmule.desktop share/gnome/pixmaps/lmule.xpm share/locale/de/LC_MESSAGES/lmule.mo share/locale/es/LC_MESSAGES/lmule.mo +share/locale/es_MX/LC_MESSAGES/lmule.mo share/locale/fr/LC_MESSAGES/lmule.mo +share/locale/pl/LC_MESSAGES/lmule.mo share/locale/tr/LC_MESSAGES/lmule.mo @unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/tr 2>/dev/null || true +@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true +@unexec rmdir %D/share/locale/pl 2>/dev/null || true @unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/fr 2>/dev/null || true +@unexec rmdir %D/share/locale/es_MX/LC_MESSAGES 2>/dev/null || true +@unexec rmdir %D/share/locale/es_MX 2>/dev/null || true @unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/es 2>/dev/null || true @unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true diff --git a/net/xmule/Makefile b/net/xmule/Makefile index 20d26895dc99..d6af21799b1b 100644 --- a/net/xmule/Makefile +++ b/net/xmule/Makefile @@ -6,7 +6,7 @@ # PORTNAME= lmule -PORTVERSION= 1.1.12 +PORTVERSION= 1.1.13 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= lmule @@ -15,6 +15,7 @@ MAINTAINER= lioux@FreeBSD.org COMMENT= Port of eMule eDonkey P2P client using wxWindows class library LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \ + expat.4:${PORTSDIR}/textproc/expat2 \ wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget @@ -25,12 +26,13 @@ USE_GNOME= gnomehier \ gnomeprefix \ gtk12 USE_REINPLACE= yes +USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-included-gettext \ --with-libintl-prefix=${LOCALBASE} \ --with-wx-config=${WX_CONFIG} -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" WX_CONFIG?= "${X11BASE}/bin/wx-config" @@ -40,4 +42,10 @@ post-patch: -e 's|(Linux)|FreeBSD/\1|' \ ${WRKSRC}/src/*.cpp +pre-configure: + @${FIND} ${WRKSRC} -type f -name "Makefile.in" | \ + ${XARGS} -x -n 10 \ + ${REINPLACE_CMD} -E \ + -e 's!^(AUTOCONF|AUTOHEADER|AUTOMAKE|ACLOCAL).*$$!\1=${TRUE}!' + .include <bsd.port.mk> diff --git a/net/xmule/distinfo b/net/xmule/distinfo index d31df86334f4..63ce01641713 100644 --- a/net/xmule/distinfo +++ b/net/xmule/distinfo @@ -1 +1 @@ -MD5 (lmule-1.1.12.tar.gz) = 5500d7fe97576375b52c00699a87cda3 +MD5 (lmule-1.1.13.tar.gz) = 88a4c8db46d9ac14e58818920d8a7f58 diff --git a/net/xmule/files/patch-Makefile.in b/net/xmule/files/patch-Makefile.in new file mode 100644 index 000000000000..567c4866a400 --- /dev/null +++ b/net/xmule/files/patch-Makefile.in @@ -0,0 +1,13 @@ +--- Makefile.in.orig Sat Mar 29 14:15:55 2003 ++++ Makefile.in Sat Mar 29 15:30:59 2003 +@@ -70,8 +70,10 @@ + BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ ++CFLAGS = @CFLAGS@ + CPP = @CPP@ + CXX = @CXX@ ++CXXFLAGS = @CXXFLAGS@ + DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ + DISABLE_PROGRESS = @DISABLE_PROGRESS@ diff --git a/net/xmule/files/patch-configure b/net/xmule/files/patch-configure new file mode 100644 index 000000000000..d6a4608344df --- /dev/null +++ b/net/xmule/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sat Mar 29 14:13:57 2003 ++++ configure Sat Mar 29 14:14:04 2003 +@@ -1704,8 +1704,6 @@ + + # Checks for programs. + # hopefully this prevents -O2 +-CXXFLAGS="-g" +-CFLAGS="-g" + ac_ext=cc + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/net/xmule/files/patch-src::wx::Makefile.in b/net/xmule/files/patch-src::wx::Makefile.in new file mode 100644 index 000000000000..23c533311f1f --- /dev/null +++ b/net/xmule/files/patch-src::wx::Makefile.in @@ -0,0 +1,13 @@ +--- src/wx/Makefile.in.orig Sat Mar 29 16:39:22 2003 ++++ src/wx/Makefile.in Sat Mar 29 16:39:46 2003 +@@ -70,8 +70,10 @@ + BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ ++CFLAGS = @CFLAGS@ + CPP = @CPP@ + CXX = @CXX@ ++CXXFLAGS = @CXXFLAGS@ + DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ + DISABLE_PROGRESS = @DISABLE_PROGRESS@ diff --git a/net/xmule/files/patch-src::wx::xrc::Makefile.in b/net/xmule/files/patch-src::wx::xrc::Makefile.in new file mode 100644 index 000000000000..b5a03e1bff20 --- /dev/null +++ b/net/xmule/files/patch-src::wx::xrc::Makefile.in @@ -0,0 +1,39 @@ +--- src/wx/xrc/Makefile.in.orig Sat Mar 29 17:01:36 2003 ++++ src/wx/xrc/Makefile.in Sat Mar 29 17:02:07 2003 +@@ -70,8 +70,10 @@ + BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ ++CFLAGS = @CFLAGS@ + CPP = @CPP@ + CXX = @CXX@ ++CXXFLAGS = @CXXFLAGS@ + DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ + DISABLE_PROGRESS = @DISABLE_PROGRESS@ +@@ -285,7 +287,7 @@ + + + .cpp.o : +- $(CXX) -I../.. -c `wx-config --cxxflags` $< ++ $(CXX) $(CXXFLAGS) -I../.. -c `wx-config --cxxflags` $< + + all: $(LIBRARY) + +@@ -297,13 +299,13 @@ + rm -f *.o *.a + + xmlrole.o: +- $(CC) -c expat/xmltok/xmlrole.c ++ $(CC) $(CFLAGS) -c expat/xmltok/xmlrole.c + + xmltok.o: +- $(CC) -c expat/xmltok/xmltok.c ++ $(CC) $(CFLAGS) -c expat/xmltok/xmltok.c + + xmlparse.o: xmlrole.o xmltok.o +- $(CC) -Iexpat/xmltok -c expat/xmlparse/xmlparse.c ++ $(CC) $(CFLAGS) -Iexpat/xmltok -c expat/xmlparse/xmlparse.c + + xml.o: + $(CXX) -I../.. -Iexpat/xmlparse $(INCLUDES) -c `wx-config --cxxflags` xml.cpp diff --git a/net/xmule/pkg-plist b/net/xmule/pkg-plist index a20f046f2ecf..2db6df4eb592 100644 --- a/net/xmule/pkg-plist +++ b/net/xmule/pkg-plist @@ -3,12 +3,18 @@ share/gnome/applications/lmule.desktop share/gnome/pixmaps/lmule.xpm share/locale/de/LC_MESSAGES/lmule.mo share/locale/es/LC_MESSAGES/lmule.mo +share/locale/es_MX/LC_MESSAGES/lmule.mo share/locale/fr/LC_MESSAGES/lmule.mo +share/locale/pl/LC_MESSAGES/lmule.mo share/locale/tr/LC_MESSAGES/lmule.mo @unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/tr 2>/dev/null || true +@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true +@unexec rmdir %D/share/locale/pl 2>/dev/null || true @unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/fr 2>/dev/null || true +@unexec rmdir %D/share/locale/es_MX/LC_MESSAGES 2>/dev/null || true +@unexec rmdir %D/share/locale/es_MX 2>/dev/null || true @unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/es 2>/dev/null || true @unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true |