diff options
author | Jim Mock <jim@FreeBSD.org> | 2002-07-02 23:05:55 +0000 |
---|---|---|
committer | Jim Mock <jim@FreeBSD.org> | 2002-07-02 23:05:55 +0000 |
commit | fb9dec87342618d3dafe01ebff10bbb9322e253c (patch) | |
tree | 2d7bbea94068dd1ad0ec5ce4b1a097435e0519ea /net | |
parent | Do not require Gcc 3.1 to compile -- or we have an infinate loop on RELENG_4. (diff) |
Fix LIB_DEPENDS, support USE_REINPLACE, move modules to lib/everybuddy.
While I'm here, nuke the empty patches that were still lying around.
PR: 40118
Submitted by: KATO Tsuguru <tkato@prontomail.com>
Notes
Notes:
svn path=/head/; revision=62367
Diffstat (limited to 'net')
-rw-r--r-- | net/ayttm/Makefile | 42 | ||||
-rw-r--r-- | net/ayttm/files/patch-aa | 0 | ||||
-rw-r--r-- | net/ayttm/files/patch-ab | 11 | ||||
-rw-r--r-- | net/ayttm/files/patch-ae | 0 | ||||
-rw-r--r-- | net/ayttm/files/patch-ag | 0 | ||||
-rw-r--r-- | net/ayttm/files/patch-configure | 10 | ||||
-rw-r--r-- | net/ayttm/pkg-comment | 2 | ||||
-rw-r--r-- | net/ayttm/pkg-plist | 92 | ||||
-rw-r--r-- | net/everybuddy/Makefile | 42 | ||||
-rw-r--r-- | net/everybuddy/files/patch-aa | 0 | ||||
-rw-r--r-- | net/everybuddy/files/patch-ab | 11 | ||||
-rw-r--r-- | net/everybuddy/files/patch-ae | 0 | ||||
-rw-r--r-- | net/everybuddy/files/patch-ag | 0 | ||||
-rw-r--r-- | net/everybuddy/files/patch-configure | 10 | ||||
-rw-r--r-- | net/everybuddy/pkg-comment | 2 | ||||
-rw-r--r-- | net/everybuddy/pkg-plist | 92 |
16 files changed, 132 insertions, 182 deletions
diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile index 21a4cf41551e..f919950174ab 100644 --- a/net/ayttm/Makefile +++ b/net/ayttm/Makefile @@ -7,22 +7,48 @@ PORTNAME= everybuddy PORTVERSION= 0.4.2 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.everybuddy.com/files/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/beta/} MAINTAINER= jim@FreeBSD.org +LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \ + iconv.3:${PORTSDIR}/converters/libiconv + USE_X_PREFIX= yes -USE_GMAKE= yes USE_GTK= yes -GNU_CONFIGURE= yes +WANT_ESOUND= yes +USE_REINPLACE= yes +USE_GMAKE= yes +USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -laudiofile" +CONFIGURE_ARGS= --disable-arts -LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext MAN1= everybuddy.1 -# no idea why config.h isn't created, but an empty one seems to work OK -post-patch: - touch ${WRKSRC}/config.h +.include <bsd.port.pre.mk> + +.if defined(HAVE_ESOUND) +USE_ESOUND= yes +.else +CONFIGURE_ARGS+= --disable-esd +.endif + +pre-patch: + @${REINPLACE_CMD} -e \ + 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \ + s|-lpthreads|${PTHREAD_LIBS:S/"//g}|g; \ + s|-D_REENTRANT -Wall -g|-D_REENTRANT ${PTHREAD_CFLAGS}|g' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|share/everybuddy/modules|/lib/everybuddy/modules|g' \ + ${WRKSRC}/src/config.sh.in + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|^Utilitiesdir|#Utilitiesdir|g; \ + s|^Utilities_DATA|#Utilities_DATA|g; \ + s|[(]datadir[)]/everybuddy|(prefix)/lib/everybuddy|g; \ + s|-module|-module -avoid-version|g' -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net/ayttm/files/patch-aa b/net/ayttm/files/patch-aa deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/net/ayttm/files/patch-aa +++ /dev/null diff --git a/net/ayttm/files/patch-ab b/net/ayttm/files/patch-ab deleted file mode 100644 index 89d2f4f6e236..000000000000 --- a/net/ayttm/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.old Wed May 29 19:50:21 2002 -+++ configure Wed May 29 19:50:29 2002 -@@ -9178,7 +9178,7 @@ - CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include" - - EB_CFLAGS="$CFLAGS -I../" --EB_LIBS="$LIBS -L../libproxy -lproxy" -+EB_LIBS="$LIBS -L../libproxy -lproxy -lintl" - EB_LDADD="$LDADD" - - EB_CFLAGS="$EB_CFLAGS -D_REENTRANT -Wall -g " diff --git a/net/ayttm/files/patch-ae b/net/ayttm/files/patch-ae deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/net/ayttm/files/patch-ae +++ /dev/null diff --git a/net/ayttm/files/patch-ag b/net/ayttm/files/patch-ag deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/net/ayttm/files/patch-ag +++ /dev/null diff --git a/net/ayttm/files/patch-configure b/net/ayttm/files/patch-configure new file mode 100644 index 000000000000..f38e9730d772 --- /dev/null +++ b/net/ayttm/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig Fri May 17 09:04:56 2002 ++++ configure Thu May 30 01:12:46 2002 +@@ -5451,6 +5451,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/net/ayttm/pkg-comment b/net/ayttm/pkg-comment index f051e0feb880..008ed1484b41 100644 --- a/net/ayttm/pkg-comment +++ b/net/ayttm/pkg-comment @@ -1 +1 @@ -A "chat" program that combines AIM, ICQ, Yahoo, MSN, Jabber and IRC into one +A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one diff --git a/net/ayttm/pkg-plist b/net/ayttm/pkg-plist index 1964f55e1c02..f42c5237836e 100644 --- a/net/ayttm/pkg-plist +++ b/net/ayttm/pkg-plist @@ -1,78 +1,28 @@ +bin/contact-update.pl bin/everybuddy bin/update.pl -bin/contact-update.pl -lib/charset.alias -share/pixmaps/ebicon.png +lib/everybuddy/modules/aim-toc.so +lib/everybuddy/modules/autotrans.so +lib/everybuddy/modules/icq.so +lib/everybuddy/modules/import_gaim.so +lib/everybuddy/modules/import_gnomeicu.so +lib/everybuddy/modules/importicq.so +lib/everybuddy/modules/importlicq.so +lib/everybuddy/modules/irc.so +lib/everybuddy/modules/jabber.so +lib/everybuddy/modules/middle.so +lib/everybuddy/modules/msn2.so +lib/everybuddy/modules/notes.so +lib/everybuddy/modules/rainbow.so +lib/everybuddy/modules/smileys2.so +lib/everybuddy/modules/smileysc.so +lib/everybuddy/modules/yahoo2.so share/locale/fr/LC_MESSAGES/everybuddy.mo -share/locale/locale.alias share/sounds/everybuddy/BuddyArrive.au share/sounds/everybuddy/BuddyLeave.au -share/sounds/everybuddy/Send.au share/sounds/everybuddy/Receive.au -share/everybuddy/modules/aim-toc.so.0 -share/everybuddy/modules/aim-toc.so -share/everybuddy/modules/aim-toc.la -share/everybuddy/modules/aim-toc.a -share/everybuddy/modules/icq.so.0 -share/everybuddy/modules/icq.so -share/everybuddy/modules/icq.la -share/everybuddy/modules/icq.a -share/everybuddy/modules/irc.so.0 -share/everybuddy/modules/irc.so -share/everybuddy/modules/irc.la -share/everybuddy/modules/irc.a -share/everybuddy/modules/jabber.so.0 -share/everybuddy/modules/jabber.so -share/everybuddy/modules/jabber.la -share/everybuddy/modules/jabber.a -share/everybuddy/modules/msn2.so.0 -share/everybuddy/modules/msn2.so -share/everybuddy/modules/msn2.la -share/everybuddy/modules/msn2.a -share/everybuddy/modules/yahoo2.so.0 -share/everybuddy/modules/yahoo2.so -share/everybuddy/modules/yahoo2.la -share/everybuddy/modules/yahoo2.a -share/everybuddy/modules/import_gaim.so.0 -share/everybuddy/modules/import_gaim.so -share/everybuddy/modules/import_gaim.la -share/everybuddy/modules/import_gaim.a -share/everybuddy/modules/import_gnomeicu.so.0 -share/everybuddy/modules/import_gnomeicu.so -share/everybuddy/modules/import_gnomeicu.la -share/everybuddy/modules/import_gnomeicu.a -share/everybuddy/modules/importlicq.so.0 -share/everybuddy/modules/importlicq.so -share/everybuddy/modules/importlicq.la -share/everybuddy/modules/importlicq.a -share/everybuddy/modules/importicq.so.0 -share/everybuddy/modules/importicq.so -share/everybuddy/modules/importicq.la -share/everybuddy/modules/importicq.a -share/everybuddy/modules/smileys2.so.0 -share/everybuddy/modules/smileys2.so -share/everybuddy/modules/smileys2.la -share/everybuddy/modules/smileys2.a -share/everybuddy/modules/smileysc.so.0 -share/everybuddy/modules/smileysc.so -share/everybuddy/modules/smileysc.la -share/everybuddy/modules/smileysc.a -share/everybuddy/modules/notes.so.0 -share/everybuddy/modules/notes.so -share/everybuddy/modules/notes.la -share/everybuddy/modules/notes.a -share/everybuddy/modules/middle.so.0 -share/everybuddy/modules/middle.so -share/everybuddy/modules/middle.la -share/everybuddy/modules/middle.a -share/everybuddy/modules/rainbow.so.0 -share/everybuddy/modules/rainbow.so -share/everybuddy/modules/rainbow.la -share/everybuddy/modules/rainbow.a -share/everybuddy/modules/autotrans.so.0 -share/everybuddy/modules/autotrans.so -share/everybuddy/modules/autotrans.la -share/everybuddy/modules/autotrans.a +share/sounds/everybuddy/Send.au @dirrm share/sounds/everybuddy -@dirrm share/everybuddy/modules -@dirrm share/everybuddy +@unexec rmdir %D/share/sounds 2>/dev/null || true +@dirrm lib/everybuddy/modules +@dirrm lib/everybuddy diff --git a/net/everybuddy/Makefile b/net/everybuddy/Makefile index 21a4cf41551e..f919950174ab 100644 --- a/net/everybuddy/Makefile +++ b/net/everybuddy/Makefile @@ -7,22 +7,48 @@ PORTNAME= everybuddy PORTVERSION= 0.4.2 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.everybuddy.com/files/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/beta/} MAINTAINER= jim@FreeBSD.org +LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \ + iconv.3:${PORTSDIR}/converters/libiconv + USE_X_PREFIX= yes -USE_GMAKE= yes USE_GTK= yes -GNU_CONFIGURE= yes +WANT_ESOUND= yes +USE_REINPLACE= yes +USE_GMAKE= yes +USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -laudiofile" +CONFIGURE_ARGS= --disable-arts -LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext MAN1= everybuddy.1 -# no idea why config.h isn't created, but an empty one seems to work OK -post-patch: - touch ${WRKSRC}/config.h +.include <bsd.port.pre.mk> + +.if defined(HAVE_ESOUND) +USE_ESOUND= yes +.else +CONFIGURE_ARGS+= --disable-esd +.endif + +pre-patch: + @${REINPLACE_CMD} -e \ + 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \ + s|-lpthreads|${PTHREAD_LIBS:S/"//g}|g; \ + s|-D_REENTRANT -Wall -g|-D_REENTRANT ${PTHREAD_CFLAGS}|g' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|share/everybuddy/modules|/lib/everybuddy/modules|g' \ + ${WRKSRC}/src/config.sh.in + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|^Utilitiesdir|#Utilitiesdir|g; \ + s|^Utilities_DATA|#Utilities_DATA|g; \ + s|[(]datadir[)]/everybuddy|(prefix)/lib/everybuddy|g; \ + s|-module|-module -avoid-version|g' -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net/everybuddy/files/patch-aa b/net/everybuddy/files/patch-aa deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/net/everybuddy/files/patch-aa +++ /dev/null diff --git a/net/everybuddy/files/patch-ab b/net/everybuddy/files/patch-ab deleted file mode 100644 index 89d2f4f6e236..000000000000 --- a/net/everybuddy/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.old Wed May 29 19:50:21 2002 -+++ configure Wed May 29 19:50:29 2002 -@@ -9178,7 +9178,7 @@ - CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include" - - EB_CFLAGS="$CFLAGS -I../" --EB_LIBS="$LIBS -L../libproxy -lproxy" -+EB_LIBS="$LIBS -L../libproxy -lproxy -lintl" - EB_LDADD="$LDADD" - - EB_CFLAGS="$EB_CFLAGS -D_REENTRANT -Wall -g " diff --git a/net/everybuddy/files/patch-ae b/net/everybuddy/files/patch-ae deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/net/everybuddy/files/patch-ae +++ /dev/null diff --git a/net/everybuddy/files/patch-ag b/net/everybuddy/files/patch-ag deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/net/everybuddy/files/patch-ag +++ /dev/null diff --git a/net/everybuddy/files/patch-configure b/net/everybuddy/files/patch-configure new file mode 100644 index 000000000000..f38e9730d772 --- /dev/null +++ b/net/everybuddy/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig Fri May 17 09:04:56 2002 ++++ configure Thu May 30 01:12:46 2002 +@@ -5451,6 +5451,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/net/everybuddy/pkg-comment b/net/everybuddy/pkg-comment index f051e0feb880..008ed1484b41 100644 --- a/net/everybuddy/pkg-comment +++ b/net/everybuddy/pkg-comment @@ -1 +1 @@ -A "chat" program that combines AIM, ICQ, Yahoo, MSN, Jabber and IRC into one +A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one diff --git a/net/everybuddy/pkg-plist b/net/everybuddy/pkg-plist index 1964f55e1c02..f42c5237836e 100644 --- a/net/everybuddy/pkg-plist +++ b/net/everybuddy/pkg-plist @@ -1,78 +1,28 @@ +bin/contact-update.pl bin/everybuddy bin/update.pl -bin/contact-update.pl -lib/charset.alias -share/pixmaps/ebicon.png +lib/everybuddy/modules/aim-toc.so +lib/everybuddy/modules/autotrans.so +lib/everybuddy/modules/icq.so +lib/everybuddy/modules/import_gaim.so +lib/everybuddy/modules/import_gnomeicu.so +lib/everybuddy/modules/importicq.so +lib/everybuddy/modules/importlicq.so +lib/everybuddy/modules/irc.so +lib/everybuddy/modules/jabber.so +lib/everybuddy/modules/middle.so +lib/everybuddy/modules/msn2.so +lib/everybuddy/modules/notes.so +lib/everybuddy/modules/rainbow.so +lib/everybuddy/modules/smileys2.so +lib/everybuddy/modules/smileysc.so +lib/everybuddy/modules/yahoo2.so share/locale/fr/LC_MESSAGES/everybuddy.mo -share/locale/locale.alias share/sounds/everybuddy/BuddyArrive.au share/sounds/everybuddy/BuddyLeave.au -share/sounds/everybuddy/Send.au share/sounds/everybuddy/Receive.au -share/everybuddy/modules/aim-toc.so.0 -share/everybuddy/modules/aim-toc.so -share/everybuddy/modules/aim-toc.la -share/everybuddy/modules/aim-toc.a -share/everybuddy/modules/icq.so.0 -share/everybuddy/modules/icq.so -share/everybuddy/modules/icq.la -share/everybuddy/modules/icq.a -share/everybuddy/modules/irc.so.0 -share/everybuddy/modules/irc.so -share/everybuddy/modules/irc.la -share/everybuddy/modules/irc.a -share/everybuddy/modules/jabber.so.0 -share/everybuddy/modules/jabber.so -share/everybuddy/modules/jabber.la -share/everybuddy/modules/jabber.a -share/everybuddy/modules/msn2.so.0 -share/everybuddy/modules/msn2.so -share/everybuddy/modules/msn2.la -share/everybuddy/modules/msn2.a -share/everybuddy/modules/yahoo2.so.0 -share/everybuddy/modules/yahoo2.so -share/everybuddy/modules/yahoo2.la -share/everybuddy/modules/yahoo2.a -share/everybuddy/modules/import_gaim.so.0 -share/everybuddy/modules/import_gaim.so -share/everybuddy/modules/import_gaim.la -share/everybuddy/modules/import_gaim.a -share/everybuddy/modules/import_gnomeicu.so.0 -share/everybuddy/modules/import_gnomeicu.so -share/everybuddy/modules/import_gnomeicu.la -share/everybuddy/modules/import_gnomeicu.a -share/everybuddy/modules/importlicq.so.0 -share/everybuddy/modules/importlicq.so -share/everybuddy/modules/importlicq.la -share/everybuddy/modules/importlicq.a -share/everybuddy/modules/importicq.so.0 -share/everybuddy/modules/importicq.so -share/everybuddy/modules/importicq.la -share/everybuddy/modules/importicq.a -share/everybuddy/modules/smileys2.so.0 -share/everybuddy/modules/smileys2.so -share/everybuddy/modules/smileys2.la -share/everybuddy/modules/smileys2.a -share/everybuddy/modules/smileysc.so.0 -share/everybuddy/modules/smileysc.so -share/everybuddy/modules/smileysc.la -share/everybuddy/modules/smileysc.a -share/everybuddy/modules/notes.so.0 -share/everybuddy/modules/notes.so -share/everybuddy/modules/notes.la -share/everybuddy/modules/notes.a -share/everybuddy/modules/middle.so.0 -share/everybuddy/modules/middle.so -share/everybuddy/modules/middle.la -share/everybuddy/modules/middle.a -share/everybuddy/modules/rainbow.so.0 -share/everybuddy/modules/rainbow.so -share/everybuddy/modules/rainbow.la -share/everybuddy/modules/rainbow.a -share/everybuddy/modules/autotrans.so.0 -share/everybuddy/modules/autotrans.so -share/everybuddy/modules/autotrans.la -share/everybuddy/modules/autotrans.a +share/sounds/everybuddy/Send.au @dirrm share/sounds/everybuddy -@dirrm share/everybuddy/modules -@dirrm share/everybuddy +@unexec rmdir %D/share/sounds 2>/dev/null || true +@dirrm lib/everybuddy/modules +@dirrm lib/everybuddy |