diff options
| author | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 07:22:56 +0000 |
|---|---|---|
| committer | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 07:22:56 +0000 |
| commit | 7b4c77811e89d7fc1131ca6e63df3e719bc86b1d (patch) | |
| tree | 9695733a1620c4c290c86f161a4f1b73160ed39a | |
| parent | Implement USE_GNOME, part 2. (diff) | |
Implement WANT_GNOME.
Notes
Notes:
svn path=/head/; revision=33430
100 files changed, 2771 insertions, 2337 deletions
diff --git a/audio/extace/Makefile b/audio/extace/Makefile index de54804f2d01..1de4d59ca929 100644 --- a/audio/extace/Makefile +++ b/audio/extace/Makefile @@ -13,22 +13,24 @@ MASTER_SITE_SUBDIR= eXtace MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib \ - esd.2:${PORTSDIR}/audio/esound \ - fftw.2:${PORTSDIR}/math/fftw +LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw USE_X_PREFIX= yes +USE_IMLIB= yes +USE_ESOUND= yes +WANT_GNOME= yes USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LIBFFTW" \ + LIBS="-L${LOCALBASE}/lib" -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -ESD_CONFIG?= ${LOCALBASE}/bin/esd-config +.include <bsd.port.pre.mk> -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - ESD_CONFIG="${ESD_CONFIG}" \ - LIBS="-L${LOCALBASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LIBFFTW" +.if defined(HAVE_GNOME) +USE_GNOME= yes +.endif -.include <bsd.port.mk> +pre-patch: + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g' + +.include <bsd.port.post.mk> diff --git a/audio/extace/files/patch-ab b/audio/extace/files/patch-ab new file mode 100644 index 000000000000..c72137e89ac4 --- /dev/null +++ b/audio/extace/files/patch-ab @@ -0,0 +1,29 @@ +--- extace/Makefile.in.orig Fri Jun 2 23:30:29 2000 ++++ extace/Makefile.in Fri Jun 2 23:32:26 2000 +@@ -108,7 +108,9 @@ + + EXTRA_DIST = extace.desktop README NEWS TODO + ++.ifdef HAVE_GNOME + Multimedia_DATA = extace.desktop ++.endif + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = +@@ -237,7 +239,6 @@ + + install-MultimediaDATA: $(Multimedia_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(Multimediadir) + @list='$(Multimedia_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Multimediadir)/$$p"; \ +@@ -340,7 +341,7 @@ + install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(Multimediadir) ++ $(mkinstalldirs) $(DESTDIR)$(bindir) + + + mostlyclean-generic: diff --git a/audio/extace/pkg-plist b/audio/extace/pkg-plist index 073ecc938785..4ce717d85627 100644 --- a/audio/extace/pkg-plist +++ b/audio/extace/pkg-plist @@ -1,5 +1,2 @@ bin/extace -share/gnome/apps/Multimedia/extace.desktop -@unexec rmdir %D/share/gnome/apps/Multimedia 2>/dev/null || true -@unexec rmdir %D/share/gnome/apps 2>/dev/null || true -@unexec rmdir %D/share/gnome 2>/dev/null || true +%%GNOME:%%share/gnome/apps/Multimedia/extace.desktop diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile index c12fbb353e23..a69ce5774f00 100644 --- a/audio/soundtracker/Makefile +++ b/audio/soundtracker/Makefile @@ -12,32 +12,28 @@ MASTER_SITES= ftp://ftp.soundtracker.org/pub/soundtracker/v0.5/ MAINTAINER= kzentner@u.washington.edu -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -.if defined(USE_GNOME) -LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GNU_CONFIGURE= YES - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - USE_X_PREFIX= yes - -.if defined(USE_GNOME) -CONFIGURE_ARGS+= --enable-gnome -PLIST_SUB+= GNOME:="" -PLIST= ${PKGDIR}/PLIST.gnome +USE_GTK= yes +USE_ESOUND= yes +WANT_GNOME= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" + +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--enable-gnome .else -CONFIGURE_ARGS+= --disable-gnome -PLIST_SUB+= GNOME:="@comment " +CONFIGURE_ARGS+=--disable-gnome .endif -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" - -post-install: - @strip ${PREFIX}/bin/soundtracker +pre-patch: + @${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile index d872d512f1e7..62f686710c26 100644 --- a/audio/xhippo/Makefile +++ b/audio/xhippo/Makefile @@ -14,13 +14,17 @@ MASTER_SITES= http://zenchaos.netpedia.net/software/ \ MAINTAINER= rod@zort.on.ca RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_XLIB= yes +USE_GTK= yes +WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" + +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +.endif post-install: ${INSTALL_DATA} ${WRKSRC}/xhippo.config ${PREFIX}/etc/xhippo.config.default @@ -29,4 +33,4 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile index df7550bffb6a..6663c0359fa5 100644 --- a/audio/xmms/Makefile +++ b/audio/xmms/Makefile @@ -22,70 +22,59 @@ PATCH_SITE_SUBDIR= sobomax MAINTAINER= esk@ira.uka.de -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - glib12.3:${PORTSDIR}/devel/glib12 \ - xml.5:${PORTSDIR}/textproc/libxml +LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml -USE_X_PREFIX= yes -USE_LIBTOOL= yes +USE_X_PREFIX= yes +USE_GTK= yes +WANT_ESOUND= yes +WANT_GNOME= yes +USE_LIBTOOL= yes LIBTOOLFILES= configure libxmms/configure -INSTALLS_SHLIB= yes +INSTALLS_SHLIB= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" \ + HAVE_MIKMOD=${HAVE_MIKMOD} + +.include <bsd.port.pre.mk> .if !defined(WITHOUT_MIKMOD) LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod -HAVE_MIKMOD_OVERRIDE= +HAVE_MIKMOD= yes PLIST_SUB+= MIKMODPLUGIN:="" .else -HAVE_MIKMOD_OVERRIDE= yes PLIST_SUB+= MIKMODPLUGIN:="@comment " .endif -.if !defined(WITHOUT_ESD) -LIB_DEPENDS+= esd.2:${PORTSDIR}/audio/esound -HAVE_ESD_OVERRIDE= -PLIST_SUB+= ESDPLUGIN:="" +.if defined(HAVE_GNOME) +USE_GNOME= yes .else -HAVE_ESD_OVERRIDE= yes -PLIST_SUB+= ESDPLUGIN:="@comment " +CONFIGURE_ARGS= --without-gnome .endif -.if defined(WITH_GNOME) -LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs \ - panel_applet.4:${PORTSDIR}/x11/gnomecore -CONFIGURE_ARGS+= --with-gnome -PLIST_SUB+= GNOME:="" +.if defined(HAVE_ESOUND) +USE_ESOUND= yes +PLIST_SUB+= ESDPLUGIN:="" .else -CONFIGURE_ARGS+= --without-gnome -PLIST_SUB+= GNOME:="@comment " +PLIST_SUB+= ESDPLUGIN:="@comment " .endif -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - -CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - HAVE_ESD_OVERRIDE="${HAVE_ESD_OVERRIDE}" \ - HAVE_MIKMOD_OVERRIDE="${HAVE_MIKMOD_OVERRIDE}" - -.include <bsd.port.pre.mk> - .if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 PATCHFILES= xmms-${PORTVERSION}-3dnow.patch.gz CONFIGURE_ARGS+= --enable-3dnow .endif +.if defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021 +post-extract: + (cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \ + cd ${WRKSRC}/Visualization/blur_scope && ${MV} blur_8.s blur_8.S); + ${PERL} -pi.bak -e 's:\.s :\.S :g' ${WRKSRC}/Input/mpg123/Makefile.in + ${PERL} -pi.bak -e 's:blur_8.s:blur_8.S:g' \ + ${WRKSRC}/Visualization/blur_scope/Makefile.in +.endif + pre-extract: -.if !defined(WITH_GNOME) || !defined(WITHOUT_ESD) || !defined(WITHOUT_MIKMOD) || \ - ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 ) +.if !defined(WITHOUT_MIKMOD) || ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 ) @${ECHO_MSG} -.if !defined(WITH_GNOME) - @${ECHO_MSG} "You can add support for GNOME by defining WITH_GNOME." -.endif -.if !defined(WITHOUT_ESD) - @${ECHO_MSG} "You can disable support for ESD sound daemon by defining WITHOUT_ESD." -.endif .if !defined(WITHOUT_MIKMOD) @${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD." .endif @@ -95,16 +84,12 @@ pre-extract: @${ECHO_MSG} .endif -.if defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021 -post-extract: - (cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \ - cd ${WRKSRC}/Visualization/blur_scope && ${MV} blur_8.s blur_8.S); - ${PERL} -pi.bak -e 's:\.s :\.S :g' ${WRKSRC}/Input/mpg123/Makefile.in - ${PERL} -pi.bak -e 's:blur_8.s:blur_8.S:g' \ - ${WRKSRC}/Visualization/blur_scope/Makefile.in -.endif - pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/aclocal|\$\(prefix\)/share/aclocal|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' .include <bsd.port.post.mk> diff --git a/audio/xmms/files/patch-ab b/audio/xmms/files/patch-ab index a9842709cd22..a4895b94c00e 100644 --- a/audio/xmms/files/patch-ab +++ b/audio/xmms/files/patch-ab @@ -1,19 +1,11 @@ -*** Visualization/Makefile.in.org Wed Jun 14 13:21:50 2000 ---- Visualization/Makefile.in Wed Jun 14 13:22:09 2000 -*************** -*** 148,154 **** - sidplay_library = @sidplay_library@ - xmmsdir = @xmmsdir@ - -! SUBDIRS = blur_scope sanalyzer opengl_spectrum - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = ---- 148,154 ---- - sidplay_library = @sidplay_library@ - xmmsdir = @xmmsdir@ - -! SUBDIRS = blur_scope sanalyzer - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = +--- Visualization/Makefile.in.orig Mon Jan 31 10:44:44 2000 ++++ Visualization/Makefile.in Sun Feb 27 01:37:39 2000 +@@ -125,7 +125,7 @@ + sidplay_library = @sidplay_library@ + xmmsdir = @xmmsdir@ + +-SUBDIRS = blur_scope sanalyzer opengl_spectrum ++SUBDIRS = blur_scope sanalyzer + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = diff --git a/audio/xmms/files/patch-ad b/audio/xmms/files/patch-ad index 69fc08dace8d..0b26a5e0f80b 100644 --- a/audio/xmms/files/patch-ad +++ b/audio/xmms/files/patch-ad @@ -5,7 +5,7 @@ fi - -+if [ x"${HAVE_ESD_OVERRIDE}" != x"" ]; then ++if [ x"${HAVE_ESOUND}" != x"yes" ]; then + have_esd=no +fi @@ -16,21 +16,12 @@ rm -f conf.mikmodtest - -+if [ x"${HAVE_MIKMOD_OVERRIDE}" != x"" ]; then ++if [ x"${HAVE_MIKMOD}" != x"yes" ]; then + have_mikmod=no +fi if test "x$have_mikmod" = xyes; then HAVE_MIKMOD_TRUE= -@@ -5549,7 +5553,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo @@ -7171,14 +7175,14 @@ if test -n "$GCC" @@ -48,3 +39,14 @@ ARCH_DEFINES="-DI386_ASSEM" arch_type=ix86 ;; +@@ -7885,10 +7889,6 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/audio/xmms/files/patch-ae b/audio/xmms/files/patch-ae index 6494be16d0a2..8eea92cf33e2 100644 --- a/audio/xmms/files/patch-ae +++ b/audio/xmms/files/patch-ae @@ -1,5 +1,17 @@ --- Makefile.in.orig Mon Jul 31 10:27:32 2000 +++ Makefile.in Mon Jul 31 10:27:49 2000 +@@ -147,7 +147,10 @@ + sidplay_library = @sidplay_library@ + xmmsdir = @xmmsdir@ + +-SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms gnomexmms po ++SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms po ++.ifdef HAVE_GNOME ++SUBDIRS += gnomexmms ++.endif + + bin_SCRIPTS = xmms-config + @@ -205,9 +205,9 @@ rm -f $(srcdir)/stamp-h.in; \ $(MAKE) $(srcdir)/stamp-h.in; \ diff --git a/audio/xmms/files/patch-af b/audio/xmms/files/patch-af new file mode 100644 index 000000000000..014ca1b56704 --- /dev/null +++ b/audio/xmms/files/patch-af @@ -0,0 +1,14 @@ +--- Output/Makefile.in.orig Mon Jan 31 10:44:32 2000 ++++ Output/Makefile.in Sun Feb 27 01:37:39 2000 +@@ -125,7 +125,10 @@ + sidplay_library = @sidplay_library@ + xmmsdir = @xmmsdir@ + +-SUBDIRS = OSS esd disk_writer ++SUBDIRS = OSS disk_writer ++.if defined(HAVE_ESOUND) || defined(HAVE_GNOME) ++SUBDIRS += esd ++.endif + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = diff --git a/audio/xmms/pkg-plist b/audio/xmms/pkg-plist index 09034c1b85fd..2e0b6b88c99e 100644 --- a/audio/xmms/pkg-plist +++ b/audio/xmms/pkg-plist @@ -32,6 +32,7 @@ lib/xmms/Output/libdisk_writer.so lib/xmms/Visualization/libbscope.so lib/xmms/Visualization/libsanalyzer.so share/aclocal/xmms.m4 +%%DATADIR%%/xmms/wmxmms.xpm share/locale/af/LC_MESSAGES/xmms.mo share/locale/bg/LC_MESSAGES/xmms.mo share/locale/ca/LC_MESSAGES/xmms.mo @@ -61,8 +62,7 @@ share/locale/uk/LC_MESSAGES/xmms.mo share/locale/wa/LC_MESSAGES/xmms.mo share/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo share/locale/zh_TW.Big5/LC_MESSAGES/xmms.mo -share/xmms/wmxmms.xpm -@dirrm share/xmms +@dirrm %%DATADIR%%/xmms @dirrm lib/xmms/Visualization @dirrm lib/xmms/Output @dirrm lib/xmms/Input diff --git a/deskutils/gaddr/Makefile b/deskutils/gaddr/Makefile index 2c0936558c3a..de9ff23b536d 100644 --- a/deskutils/gaddr/Makefile +++ b/deskutils/gaddr/Makefile @@ -12,23 +12,16 @@ MASTER_SITES= http://www.cse.unl.edu/~cluening/gaddr/ MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -.if defined(WITH_GNOME) -LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_GTK= yes +WANT_GNOME= yes GNU_CONFIGURE= yes -.if defined(WITH_GNOME) +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes CONFIGURE_ARGS+= --enable-gnome .endif -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - -post-install: - @strip ${PREFIX}/bin/gaddr - -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/deskutils/gaddr/files/patch-ab b/deskutils/gaddr/files/patch-ab index 8b93f7a6682a..2bc163d926bf 100644 --- a/deskutils/gaddr/files/patch-ab +++ b/deskutils/gaddr/files/patch-ab @@ -14,4 +14,4 @@ install: gaddr - cp gaddr /usr/X11R6/bin/gaddr -+ @/usr/bin/install -c -o 0 -g 0 -s -m 755 gaddr ${PREFIX}/bin ++ ${BSD_INSTALL_PROGRAM} gaddr ${PREFIX}/bin diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile index aec1a42e27ad..8e189df0d89c 100644 --- a/editors/gnotepad+/Makefile +++ b/editors/gnotepad+/Makefile @@ -17,26 +17,30 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ MAINTAINER= brett@peloton.runet.edu -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - DOCVERSION= 1.2.0 + USE_X_PREFIX= yes +USE_XPM= yes +USE_GTK= yes +WANT_GNOME= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" MAN1= gnp.1 +.include <bsd.port.pre.mk> + .if !defined(NOPORTDOCS) post-extract: @${MV} ${WRKSRC}/docs ${WRKSRC}/docs.old @${CP} -R ${WRKDIR}/${PORTNAME}-help-${DOCVERSION}/docs ${WRKSRC}/docs .endif -.include <bsd.port.mk> +.if defined(HAVE_GNOME) +USE_GNOME= yes +.else +CONFIGURE_ARGS+=--disable-gnome +.endif + +.include <bsd.port.post.mk> diff --git a/editors/gnotepad+/files/patch-aa b/editors/gnotepad+/files/patch-aa index c807f58847d6..048e275ef951 100644 --- a/editors/gnotepad+/files/patch-aa +++ b/editors/gnotepad+/files/patch-aa @@ -1,11 +1,30 @@ ---- Makefile.in.orig Wed May 10 11:11:34 2000 -+++ Makefile.in Wed May 17 10:18:42 2000 -@@ -97,7 +97,7 @@ +--- Makefile.in.orig Wed May 10 09:11:34 2000 ++++ Makefile.in Mon Jun 5 20:59:43 2000 +@@ -97,8 +97,8 @@ CLEANFILES = *~ .deps/* -Applicationsdir = $(datadir)/gnome/apps/Applications -+Applicationsdir = $(datadir)/apps/Applications - Applications_DATA = gnotepad+.desktop gnotepad+.spec +-Applications_DATA = gnotepad+.desktop gnotepad+.spec ++@HAVE_GNOME_TRUE@Applicationsdir = $(datadir)/apps/Applications ++@HAVE_GNOME_TRUE@Applications_DATA = gnotepad+.desktop gnotepad+.spec SUBDIRS = docs po intl src + +@@ -217,7 +217,6 @@ + + install-ApplicationsDATA: $(Applications_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(Applicationsdir) + @list='$(Applications_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Applicationsdir)/$$p"; \ +@@ -431,7 +430,7 @@ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(Applicationsdir) \ ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 \ + $(DESTDIR)$(pkgdatadir) + + diff --git a/editors/gnotepad+/pkg-plist b/editors/gnotepad+/pkg-plist index 3358dad85dea..e4e5e8f182dd 100644 --- a/editors/gnotepad+/pkg-plist +++ b/editors/gnotepad+/pkg-plist @@ -1,145 +1,145 @@ bin/gnp -share/gnome/apps/Applications/gnotepad+.desktop -share/gnome/apps/Applications/gnotepad+.spec -share/gnome/gnotepad+/gnotepad+.glade -share/gnome/gnotepad+/xpm/colsel.xpm -share/gnome/gnotepad+/xpm/filesel.xpm -share/gnome/gnotepad+/xpm/gnp48x48.xpm -share/gnome/gnotepad+/xpm/tb_big.xpm -share/gnome/gnotepad+/xpm/tb_blank.xpm -share/gnome/gnotepad+/xpm/tb_bold.xpm -share/gnome/gnotepad+/xpm/tb_cancel.xpm -share/gnome/gnotepad+/xpm/tb_centjust.xpm -share/gnome/gnotepad+/xpm/tb_comment.xpm -share/gnome/gnotepad+/xpm/tb_copy.xpm -share/gnome/gnotepad+/xpm/tb_cut.xpm -share/gnome/gnotepad+/xpm/tb_edit.xpm -share/gnome/gnotepad+/xpm/tb_emphasis.xpm -share/gnome/gnotepad+/xpm/tb_exit.xpm -share/gnome/gnotepad+/xpm/tb_find.xpm -share/gnome/gnotepad+/xpm/tb_find_next.xpm -share/gnome/gnotepad+/xpm/tb_fontm1.xpm -share/gnome/gnotepad+/xpm/tb_fontp1.xpm -share/gnome/gnotepad+/xpm/tb_form.xpm -share/gnome/gnotepad+/xpm/tb_formoption.xpm -share/gnome/gnotepad+/xpm/tb_formselect.xpm -share/gnome/gnotepad+/xpm/tb_frame.xpm -share/gnome/gnotepad+/xpm/tb_frame2.xpm -share/gnome/gnotepad+/xpm/tb_framebase.xpm -share/gnome/gnotepad+/xpm/tb_frameno.xpm -share/gnome/gnotepad+/xpm/tb_frameset.xpm -share/gnome/gnotepad+/xpm/tb_frameset2.xpm -share/gnome/gnotepad+/xpm/tb_framewiz.xpm -share/gnome/gnotepad+/xpm/tb_h1.xpm -share/gnome/gnotepad+/xpm/tb_h2.xpm -share/gnome/gnotepad+/xpm/tb_h3.xpm -share/gnome/gnotepad+/xpm/tb_h4.xpm -share/gnome/gnotepad+/xpm/tb_h5.xpm -share/gnome/gnotepad+/xpm/tb_h6.xpm -share/gnome/gnotepad+/xpm/tb_help.xpm -share/gnome/gnotepad+/xpm/tb_image.xpm -share/gnome/gnotepad+/xpm/tb_inputbutton.xpm -share/gnome/gnotepad+/xpm/tb_inputcheckbox.xpm -share/gnome/gnotepad+/xpm/tb_inputimage.xpm -share/gnome/gnotepad+/xpm/tb_inputpass.xpm -share/gnome/gnotepad+/xpm/tb_inputradio.xpm -share/gnome/gnotepad+/xpm/tb_inputreset.xpm -share/gnome/gnotepad+/xpm/tb_inputsubmit.xpm -share/gnome/gnotepad+/xpm/tb_inputtext.xpm -share/gnome/gnotepad+/xpm/tb_inputtextarea.xpm -share/gnome/gnotepad+/xpm/tb_italic.xpm -share/gnome/gnotepad+/xpm/tb_leftjust.xpm -share/gnome/gnotepad+/xpm/tb_linebreak.xpm -share/gnome/gnotepad+/xpm/tb_link.xpm -share/gnome/gnotepad+/xpm/tb_listdd.xpm -share/gnome/gnotepad+/xpm/tb_listdl.xpm -share/gnome/gnotepad+/xpm/tb_listdt.xpm -share/gnome/gnotepad+/xpm/tb_listitem.xpm -share/gnome/gnotepad+/xpm/tb_menu.xpm -share/gnome/gnotepad+/xpm/tb_new.xpm -share/gnome/gnotepad+/xpm/tb_open.xpm -share/gnome/gnotepad+/xpm/tb_ordered.xpm -share/gnome/gnotepad+/xpm/tb_paragraph.xpm -share/gnome/gnotepad+/xpm/tb_paste.xpm -share/gnome/gnotepad+/xpm/tb_pre.xpm -share/gnome/gnotepad+/xpm/tb_prefs.xpm -share/gnome/gnotepad+/xpm/tb_print.xpm -share/gnome/gnotepad+/xpm/tb_redo.xpm -share/gnome/gnotepad+/xpm/tb_replace.xpm -share/gnome/gnotepad+/xpm/tb_rightjust.xpm -share/gnome/gnotepad+/xpm/tb_save.xpm -share/gnome/gnotepad+/xpm/tb_separator.xpm -share/gnome/gnotepad+/xpm/tb_small.xpm -share/gnome/gnotepad+/xpm/tb_strikeout.xpm -share/gnome/gnotepad+/xpm/tb_strong.xpm -share/gnome/gnotepad+/xpm/tb_subscript.xpm -share/gnome/gnotepad+/xpm/tb_superscript.xpm -share/gnome/gnotepad+/xpm/tb_table.xpm -share/gnome/gnotepad+/xpm/tb_table2.xpm -share/gnome/gnotepad+/xpm/tb_tablewiz.xpm -share/gnome/gnotepad+/xpm/tb_target.xpm -share/gnome/gnotepad+/xpm/tb_td.xpm -share/gnome/gnotepad+/xpm/tb_td2.xpm -share/gnome/gnotepad+/xpm/tb_th.xpm -share/gnome/gnotepad+/xpm/tb_th2.xpm -share/gnome/gnotepad+/xpm/tb_title.xpm -share/gnome/gnotepad+/xpm/tb_tr.xpm -share/gnome/gnotepad+/xpm/tb_tr2.xpm -share/gnome/gnotepad+/xpm/tb_typewriter.xpm -share/gnome/gnotepad+/xpm/tb_underline.xpm -share/gnome/gnotepad+/xpm/tb_undo.xpm -share/gnome/gnotepad+/xpm/tb_unordered.xpm -share/gnome/gnotepad+/xpm/tb_winclose.xpm -share/gnome/gnotepad+/xpm/tb_winnew.xpm -share/gnome/help/gnotepad+/C/closedialog.png -share/gnome/help/gnotepad+/C/doclist.png -share/gnome/help/gnotepad+/C/doctabs.png -share/gnome/help/gnotepad+/C/editmenu.png -share/gnome/help/gnotepad+/C/fileinfo1.png -share/gnome/help/gnotepad+/C/fileinfo2.png -share/gnome/help/gnotepad+/C/find1.png -share/gnome/help/gnotepad+/C/find2.png -share/gnome/help/gnotepad+/C/find3.png -share/gnome/help/gnotepad+/C/htmldoc.png -share/gnome/help/gnotepad+/C/htmltag.png -share/gnome/help/gnotepad+/C/htmltb1.png -share/gnome/help/gnotepad+/C/htmltb2.png -share/gnome/help/gnotepad+/C/htmlwin.png -share/gnome/help/gnotepad+/C/index-1.html -share/gnome/help/gnotepad+/C/index-2.html -share/gnome/help/gnotepad+/C/index-3.html -share/gnome/help/gnotepad+/C/index-4.html -share/gnome/help/gnotepad+/C/index-5.html -share/gnome/help/gnotepad+/C/index.html -share/gnome/help/gnotepad+/C/mainoptions.png -share/gnome/help/gnotepad+/C/maintb.png -share/gnome/help/gnotepad+/C/mainwin.png -share/gnome/help/gnotepad+/C/msgbar.png -share/gnome/help/gnotepad+/C/msgbox.png -share/gnome/help/gnotepad+/C/optionsmenu0.png -share/gnome/help/gnotepad+/C/optionsmenu1.png -share/gnome/help/gnotepad+/C/optionsmenu2.png -share/gnome/help/gnotepad+/C/prefs_appearance.png -share/gnome/help/gnotepad+/C/prefs_document.png -share/gnome/help/gnotepad+/C/prefs_fonts.png -share/gnome/help/gnotepad+/C/prefs_fontsel.png -share/gnome/help/gnotepad+/C/prefs_htmltb.png -share/gnome/help/gnotepad+/C/prefs_maintb.png -share/gnome/help/gnotepad+/C/prefs_misc.png -share/gnome/help/gnotepad+/C/prefs_srcctrl.png -share/gnome/help/gnotepad+/C/prefs_window.png -share/gnome/help/gnotepad+/C/printdialog.png -share/gnome/help/gnotepad+/C/shellcmd.png -share/gnome/help/gnotepad+/C/splashscreen.png -share/gnome/help/gnotepad+/C/textarea.png -share/gnome/help/gnotepad+/C/topic.dat -share/gnome/help/gnotepad+/C/windowmenu.png -share/gnome/help/gnotepad+/C/winlist.png -share/gnome/help/gnotepad+/C/winnew.png +%%GNOME:%%share/gnome/apps/Applications/gnotepad+.desktop +%%GNOME:%%share/gnome/apps/Applications/gnotepad+.spec +%%DATADIR%%/gnotepad+/gnotepad+.glade +%%DATADIR%%/gnotepad+/xpm/colsel.xpm +%%DATADIR%%/gnotepad+/xpm/filesel.xpm +%%DATADIR%%/gnotepad+/xpm/gnp48x48.xpm +%%DATADIR%%/gnotepad+/xpm/tb_big.xpm +%%DATADIR%%/gnotepad+/xpm/tb_blank.xpm +%%DATADIR%%/gnotepad+/xpm/tb_bold.xpm +%%DATADIR%%/gnotepad+/xpm/tb_cancel.xpm +%%DATADIR%%/gnotepad+/xpm/tb_centjust.xpm +%%DATADIR%%/gnotepad+/xpm/tb_comment.xpm +%%DATADIR%%/gnotepad+/xpm/tb_copy.xpm +%%DATADIR%%/gnotepad+/xpm/tb_cut.xpm +%%DATADIR%%/gnotepad+/xpm/tb_edit.xpm +%%DATADIR%%/gnotepad+/xpm/tb_emphasis.xpm +%%DATADIR%%/gnotepad+/xpm/tb_exit.xpm +%%DATADIR%%/gnotepad+/xpm/tb_find.xpm +%%DATADIR%%/gnotepad+/xpm/tb_find_next.xpm +%%DATADIR%%/gnotepad+/xpm/tb_fontm1.xpm +%%DATADIR%%/gnotepad+/xpm/tb_fontp1.xpm +%%DATADIR%%/gnotepad+/xpm/tb_form.xpm +%%DATADIR%%/gnotepad+/xpm/tb_formoption.xpm +%%DATADIR%%/gnotepad+/xpm/tb_formselect.xpm +%%DATADIR%%/gnotepad+/xpm/tb_frame.xpm +%%DATADIR%%/gnotepad+/xpm/tb_frame2.xpm +%%DATADIR%%/gnotepad+/xpm/tb_framebase.xpm +%%DATADIR%%/gnotepad+/xpm/tb_frameno.xpm +%%DATADIR%%/gnotepad+/xpm/tb_frameset.xpm +%%DATADIR%%/gnotepad+/xpm/tb_frameset2.xpm +%%DATADIR%%/gnotepad+/xpm/tb_framewiz.xpm +%%DATADIR%%/gnotepad+/xpm/tb_h1.xpm +%%DATADIR%%/gnotepad+/xpm/tb_h2.xpm +%%DATADIR%%/gnotepad+/xpm/tb_h3.xpm +%%DATADIR%%/gnotepad+/xpm/tb_h4.xpm +%%DATADIR%%/gnotepad+/xpm/tb_h5.xpm +%%DATADIR%%/gnotepad+/xpm/tb_h6.xpm +%%DATADIR%%/gnotepad+/xpm/tb_help.xpm +%%DATADIR%%/gnotepad+/xpm/tb_image.xpm +%%DATADIR%%/gnotepad+/xpm/tb_inputbutton.xpm +%%DATADIR%%/gnotepad+/xpm/tb_inputcheckbox.xpm +%%DATADIR%%/gnotepad+/xpm/tb_inputimage.xpm +%%DATADIR%%/gnotepad+/xpm/tb_inputpass.xpm +%%DATADIR%%/gnotepad+/xpm/tb_inputradio.xpm +%%DATADIR%%/gnotepad+/xpm/tb_inputreset.xpm +%%DATADIR%%/gnotepad+/xpm/tb_inputsubmit.xpm +%%DATADIR%%/gnotepad+/xpm/tb_inputtext.xpm +%%DATADIR%%/gnotepad+/xpm/tb_inputtextarea.xpm +%%DATADIR%%/gnotepad+/xpm/tb_italic.xpm +%%DATADIR%%/gnotepad+/xpm/tb_leftjust.xpm +%%DATADIR%%/gnotepad+/xpm/tb_linebreak.xpm +%%DATADIR%%/gnotepad+/xpm/tb_link.xpm +%%DATADIR%%/gnotepad+/xpm/tb_listdd.xpm +%%DATADIR%%/gnotepad+/xpm/tb_listdl.xpm +%%DATADIR%%/gnotepad+/xpm/tb_listdt.xpm +%%DATADIR%%/gnotepad+/xpm/tb_listitem.xpm +%%DATADIR%%/gnotepad+/xpm/tb_menu.xpm +%%DATADIR%%/gnotepad+/xpm/tb_new.xpm +%%DATADIR%%/gnotepad+/xpm/tb_open.xpm +%%DATADIR%%/gnotepad+/xpm/tb_ordered.xpm +%%DATADIR%%/gnotepad+/xpm/tb_paragraph.xpm +%%DATADIR%%/gnotepad+/xpm/tb_paste.xpm +%%DATADIR%%/gnotepad+/xpm/tb_pre.xpm +%%DATADIR%%/gnotepad+/xpm/tb_prefs.xpm +%%DATADIR%%/gnotepad+/xpm/tb_print.xpm +%%DATADIR%%/gnotepad+/xpm/tb_redo.xpm +%%DATADIR%%/gnotepad+/xpm/tb_replace.xpm +%%DATADIR%%/gnotepad+/xpm/tb_rightjust.xpm +%%DATADIR%%/gnotepad+/xpm/tb_save.xpm +%%DATADIR%%/gnotepad+/xpm/tb_separator.xpm +%%DATADIR%%/gnotepad+/xpm/tb_small.xpm +%%DATADIR%%/gnotepad+/xpm/tb_strikeout.xpm +%%DATADIR%%/gnotepad+/xpm/tb_strong.xpm +%%DATADIR%%/gnotepad+/xpm/tb_subscript.xpm +%%DATADIR%%/gnotepad+/xpm/tb_superscript.xpm +%%DATADIR%%/gnotepad+/xpm/tb_table.xpm +%%DATADIR%%/gnotepad+/xpm/tb_table2.xpm +%%DATADIR%%/gnotepad+/xpm/tb_tablewiz.xpm +%%DATADIR%%/gnotepad+/xpm/tb_target.xpm +%%DATADIR%%/gnotepad+/xpm/tb_td.xpm +%%DATADIR%%/gnotepad+/xpm/tb_td2.xpm +%%DATADIR%%/gnotepad+/xpm/tb_th.xpm +%%DATADIR%%/gnotepad+/xpm/tb_th2.xpm +%%DATADIR%%/gnotepad+/xpm/tb_title.xpm +%%DATADIR%%/gnotepad+/xpm/tb_tr.xpm +%%DATADIR%%/gnotepad+/xpm/tb_tr2.xpm +%%DATADIR%%/gnotepad+/xpm/tb_typewriter.xpm +%%DATADIR%%/gnotepad+/xpm/tb_underline.xpm +%%DATADIR%%/gnotepad+/xpm/tb_undo.xpm +%%DATADIR%%/gnotepad+/xpm/tb_unordered.xpm +%%DATADIR%%/gnotepad+/xpm/tb_winclose.xpm +%%DATADIR%%/gnotepad+/xpm/tb_winnew.xpm +%%DATADIR%%/help/gnotepad+/C/closedialog.png +%%DATADIR%%/help/gnotepad+/C/doclist.png +%%DATADIR%%/help/gnotepad+/C/doctabs.png +%%DATADIR%%/help/gnotepad+/C/editmenu.png +%%DATADIR%%/help/gnotepad+/C/fileinfo1.png +%%DATADIR%%/help/gnotepad+/C/fileinfo2.png +%%DATADIR%%/help/gnotepad+/C/find1.png +%%DATADIR%%/help/gnotepad+/C/find2.png +%%DATADIR%%/help/gnotepad+/C/find3.png +%%DATADIR%%/help/gnotepad+/C/htmldoc.png +%%DATADIR%%/help/gnotepad+/C/htmltag.png +%%DATADIR%%/help/gnotepad+/C/htmltb1.png +%%DATADIR%%/help/gnotepad+/C/htmltb2.png +%%DATADIR%%/help/gnotepad+/C/htmlwin.png +%%DATADIR%%/help/gnotepad+/C/index-1.html +%%DATADIR%%/help/gnotepad+/C/index-2.html +%%DATADIR%%/help/gnotepad+/C/index-3.html +%%DATADIR%%/help/gnotepad+/C/index-4.html +%%DATADIR%%/help/gnotepad+/C/index-5.html +%%DATADIR%%/help/gnotepad+/C/index.html +%%DATADIR%%/help/gnotepad+/C/mainoptions.png +%%DATADIR%%/help/gnotepad+/C/maintb.png +%%DATADIR%%/help/gnotepad+/C/mainwin.png +%%DATADIR%%/help/gnotepad+/C/msgbar.png +%%DATADIR%%/help/gnotepad+/C/msgbox.png +%%DATADIR%%/help/gnotepad+/C/optionsmenu0.png +%%DATADIR%%/help/gnotepad+/C/optionsmenu1.png +%%DATADIR%%/help/gnotepad+/C/optionsmenu2.png +%%DATADIR%%/help/gnotepad+/C/prefs_appearance.png +%%DATADIR%%/help/gnotepad+/C/prefs_document.png +%%DATADIR%%/help/gnotepad+/C/prefs_fonts.png +%%DATADIR%%/help/gnotepad+/C/prefs_fontsel.png +%%DATADIR%%/help/gnotepad+/C/prefs_htmltb.png +%%DATADIR%%/help/gnotepad+/C/prefs_maintb.png +%%DATADIR%%/help/gnotepad+/C/prefs_misc.png +%%DATADIR%%/help/gnotepad+/C/prefs_srcctrl.png +%%DATADIR%%/help/gnotepad+/C/prefs_window.png +%%DATADIR%%/help/gnotepad+/C/printdialog.png +%%DATADIR%%/help/gnotepad+/C/shellcmd.png +%%DATADIR%%/help/gnotepad+/C/splashscreen.png +%%DATADIR%%/help/gnotepad+/C/textarea.png +%%DATADIR%%/help/gnotepad+/C/topic.dat +%%DATADIR%%/help/gnotepad+/C/windowmenu.png +%%DATADIR%%/help/gnotepad+/C/winlist.png +%%DATADIR%%/help/gnotepad+/C/winnew.png share/locale/da/LC_MESSAGES/gnotepad+.mo share/locale/fr/LC_MESSAGES/gnotepad+.mo share/locale/ja/LC_MESSAGES/gnotepad+.mo -@dirrm share/gnome/help/gnotepad+/C -@dirrm share/gnome/help/gnotepad+ -@dirrm share/gnome/gnotepad+/xpm -@dirrm share/gnome/gnotepad+ +@dirrm %%DATADIR%%/help/gnotepad+/C +@dirrm %%DATADIR%%/help/gnotepad+ +@dirrm %%DATADIR%%/gnotepad+/xpm +@dirrm %%DATADIR%%/gnotepad+ diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile index 8c4692a144ed..a06c5b672592 100644 --- a/ftp/gftp/Makefile +++ b/ftp/gftp/Makefile @@ -13,26 +13,28 @@ MASTER_SITES= http://gftp.seul.org/ \ MAINTAINER= dmarion@open.hr -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -.if !defined(WITHOUT_GNOME) -RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter -.endif - USE_X_PREFIX= yes +USE_GTK= yes +WANT_GNOME= yes GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +MAN1= gftp.1 -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +.include <bsd.port.pre.mk> -MAN1= gftp.1 +.if defined(HAVE_GNOME) +USE_GNOME= yes +.endif pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|\$\(datadir\)/pixmaps|\$\(datadir\)/gnome/pixmaps|g' + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/ftp/gftp/files/patch-ab b/ftp/gftp/files/patch-ab new file mode 100644 index 000000000000..1246f8b0f0fe --- /dev/null +++ b/ftp/gftp/files/patch-ab @@ -0,0 +1,31 @@ +--- docs/Makefile.in.orig Sun Aug 6 19:53:16 2000 ++++ docs/Makefile.in Fri Sep 8 02:09:07 2000 +@@ -91,8 +91,10 @@ + SUBDIRS = sample.gftp + EXTRA_DIST = USERS-GUIDE gftp.1 gftp.desktop gftp.lsm gftp.png + ++.ifdef HAVE_GNOME + Utilitiesdir = $(datadir)/apps/Internet + Utilities_DATA = gftp.desktop ++.endif + + Iconsdir = $(datadir)/pixmaps + Icons_DATA = gftp.png +@@ -182,7 +184,6 @@ + + install-UtilitiesDATA: $(Utilities_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(Utilitiesdir) + @list='$(Utilities_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Utilitiesdir)/$$p"; \ +@@ -338,8 +339,7 @@ + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(Iconsdir) \ +- $(DESTDIR)$(Utilitiesdir) ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(Iconsdir) + + + mostlyclean-generic: diff --git a/ftp/gftp/pkg-plist b/ftp/gftp/pkg-plist index 1a7a575c0163..b2f62a214d41 100644 --- a/ftp/gftp/pkg-plist +++ b/ftp/gftp/pkg-plist @@ -1,26 +1,26 @@ bin/gftp -share/gftp/COPYING -share/gftp/bookmarks -share/gftp/deb.xpm -share/gftp/diff.xpm -share/gftp/dir.xpm -share/gftp/doc.xpm -share/gftp/dotdot.xpm -share/gftp/exe.xpm -share/gftp/gftp-logo.xpm -share/gftp/gftprc -share/gftp/img.xpm -share/gftp/linkdir.xpm -share/gftp/linkfile.xpm -share/gftp/man.xpm -share/gftp/open_dir.xpm -share/gftp/rpm.xpm -share/gftp/sound.xpm -share/gftp/tar.xpm -share/gftp/txt.xpm -share/gftp/world.xpm -share/gnome/apps/Internet/gftp.desktop -share/gnome/pixmaps/gftp.png +%%GNOME:%%share/gnome/apps/Internet/gftp.desktop +%%DATADIR%%/gftp/COPYING +%%DATADIR%%/gftp/bookmarks +%%DATADIR%%/gftp/deb.xpm +%%DATADIR%%/gftp/diff.xpm +%%DATADIR%%/gftp/dir.xpm +%%DATADIR%%/gftp/doc.xpm +%%DATADIR%%/gftp/dotdot.xpm +%%DATADIR%%/gftp/exe.xpm +%%DATADIR%%/gftp/gftp-logo.xpm +%%DATADIR%%/gftp/gftprc +%%DATADIR%%/gftp/img.xpm +%%DATADIR%%/gftp/linkdir.xpm +%%DATADIR%%/gftp/linkfile.xpm +%%DATADIR%%/gftp/man.xpm +%%DATADIR%%/gftp/open_dir.xpm +%%DATADIR%%/gftp/rpm.xpm +%%DATADIR%%/gftp/sound.xpm +%%DATADIR%%/gftp/tar.xpm +%%DATADIR%%/gftp/txt.xpm +%%DATADIR%%/gftp/world.xpm +%%DATADIR%%/pixmaps/gftp.png share/locale/br/LC_MESSAGES/gftp.mo share/locale/cs/LC_MESSAGES/gftp.mo share/locale/da/LC_MESSAGES/gftp.mo @@ -36,4 +36,4 @@ share/locale/pt_BR/LC_MESSAGES/gftp.mo share/locale/ru/LC_MESSAGES/gftp.mo share/locale/sv/LC_MESSAGES/gftp.mo share/locale/zh_TW.Big5/LC_MESSAGES/gftp.mo -@dirrm share/gftp +@dirrm %%DATADIR%%/gftp diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile index 8a0b4a30ca55..133b0af6ca7f 100644 --- a/games/xpuyopuyo/Makefile +++ b/games/xpuyopuyo/Makefile @@ -13,47 +13,33 @@ MASTER_SITES= http://chaos2.org/xpuyopuyo/ \ MAINTAINER= yinjieh@csie.nctu.edu.tw -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -.if defined(WITH_GNOME) -LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif -.if defined(WITH_MUSIC) -LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod -.endif - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_GMAKE= yes USE_X_PREFIX= yes USE_XPM= yes +USE_GTK= yes +WANT_GNOME= yes USE_AUTOCONF= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" -.if defined(WITH_GNOME) -CONFIGURE_ARGS+=--with-gnome=${X11BASE} +MAN6= xpuyopuyo.6 + +.include <bsd.port.pre.mk> + +.if defined(WITH_MIKMOD) || (exists(${LOCALBASE}/lib/libmikmod.a) && \ + !defined(WITHOUT_MIKMOD)) +LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod +CONFIGURE_ARGS+=--with-libmikmod-prefix=${LOCALBASE} +.endif + +.if defined(HAVE_GNOME) +USE_GNOME= yes .else CONFIGURE_ARGS+=--without-gnome .endif + .if defined(WITH_ROTATE_FIXED) CONFIGURE_ARGS+=--enable-rotate-fixed .endif .if defined(WITH_AIBREED) CONFIGURE_ARGS+=--enable-aibreed .endif -.if defined(WITH_MUSIC) -CONFIGURE_ARGS+=--with-libmikmod-prefix=${LOCALBASE} -.endif - -MAN6= xpuyopuyo.6 - -.if defined(WITH_GNOME) -PLIST= ${WRKDIR}/PLIST - -pre-install: - @${CP} ${PKGDIR}/PLIST ${PLIST} - @${ECHO} share/gnome/apps/Games/xpuyopuyo.desktop >> ${PLIST} - @${ECHO} share/gnome/pixmaps/xpuyopuyo.xpm >> ${PLIST} -.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/games/xpuyopuyo/files/patch-aa b/games/xpuyopuyo/files/patch-aa index eb38585389f7..e16f8929f03a 100644 --- a/games/xpuyopuyo/files/patch-aa +++ b/games/xpuyopuyo/files/patch-aa @@ -1,6 +1,5 @@ -diff -ru /tmp/xpuyopuyo-0.2.3/Makefile.in ./Makefile.in ---- /tmp/xpuyopuyo-0.2.3/Makefile.in Sat Sep 25 18:11:27 1999 -+++ ./Makefile.in Fri Oct 8 10:34:51 1999 +--- Makefile.in.orig Sat Sep 25 18:11:27 1999 ++++ Makefile.in Fri Oct 8 10:34:51 1999 @@ -135,7 +135,7 @@ @GTK_FALSE@xpuyopuyo_DEPENDENCIES = libxpuyopuyo.a @GTK_TRUE@xpuyopuyo_DEPENDENCIES = libxpuyopuyo.a diff --git a/games/xpuyopuyo/files/patch-ac b/games/xpuyopuyo/files/patch-ac new file mode 100644 index 000000000000..673c154369a3 --- /dev/null +++ b/games/xpuyopuyo/files/patch-ac @@ -0,0 +1,11 @@ +--- configure.in.orig Mon Jun 26 00:35:33 2000 ++++ configure.in Sun Oct 1 13:56:50 2000 +@@ -145,7 +145,7 @@ + GNOME_PIXMAPS="" + else + GNOME=1 +- GNOME_DESKTOP=`$GNOME_CONFIG --datadir`/gnome/apps/Games/ ++ GNOME_DESKTOP=`$GNOME_CONFIG --datadir`/apps/Games/ + GNOME_PIXMAPS=`$GNOME_CONFIG --datadir`/pixmaps/ + echo "GNOME features enabled" + echo "GNOME desktop directory: $GNOME_DESKTOP" diff --git a/games/xpuyopuyo/pkg-plist b/games/xpuyopuyo/pkg-plist index 1d7b70bcab84..93af6c93f19d 100644 --- a/games/xpuyopuyo/pkg-plist +++ b/games/xpuyopuyo/pkg-plist @@ -1,122 +1,124 @@ bin/xpuyopuyo -share/xpuyopuyo/sounds/game.xm -share/xpuyopuyo/sounds/gameover.xm -share/xpuyopuyo/sounds/prelude.xm -share/xpuyopuyo/themes/default/img_0.xpm -share/xpuyopuyo/themes/default/img_0j.xpm -share/xpuyopuyo/themes/default/img_1.xpm -share/xpuyopuyo/themes/default/img_1j.xpm -share/xpuyopuyo/themes/default/img_2.xpm -share/xpuyopuyo/themes/default/img_2j.xpm -share/xpuyopuyo/themes/default/img_3.xpm -share/xpuyopuyo/themes/default/img_3j.xpm -share/xpuyopuyo/themes/default/img_4.xpm -share/xpuyopuyo/themes/default/img_4j.xpm -share/xpuyopuyo/themes/default/img_5.xpm -share/xpuyopuyo/themes/default/img_5j.xpm -share/xpuyopuyo/themes/default/img_clear.xpm -share/xpuyopuyo/themes/default/img_clearb.xpm -share/xpuyopuyo/themes/default/img_expl.xpm -share/xpuyopuyo/themes/default/img_gameover.xpm -share/xpuyopuyo/themes/default/img_ind.xpm -share/xpuyopuyo/themes/default/img_num0.xpm -share/xpuyopuyo/themes/default/img_num1.xpm -share/xpuyopuyo/themes/default/img_num2.xpm -share/xpuyopuyo/themes/default/img_num3.xpm -share/xpuyopuyo/themes/default/img_num4.xpm -share/xpuyopuyo/themes/default/img_num5.xpm -share/xpuyopuyo/themes/default/img_num6.xpm -share/xpuyopuyo/themes/default/img_num7.xpm -share/xpuyopuyo/themes/default/img_num8.xpm -share/xpuyopuyo/themes/default/img_num9.xpm -share/xpuyopuyo/themes/default/img_paused.xpm -share/xpuyopuyo/themes/default/img_rock.xpm -share/xpuyopuyo/themes/default/img_rockbig.xpm -share/xpuyopuyo/themes/default/img_rockdemon.xpm -share/xpuyopuyo/themes/default/img_side.xpm -share/xpuyopuyo/themes/default/img_tile_bottom1.xpm -share/xpuyopuyo/themes/default/img_tile_bottom2.xpm -share/xpuyopuyo/themes/default/img_tile_bottom3.xpm -share/xpuyopuyo/themes/default/img_tile_left.xpm -share/xpuyopuyo/themes/default/img_tile_leftbottom.xpm -share/xpuyopuyo/themes/default/img_tile_lefttop.xpm -share/xpuyopuyo/themes/default/img_tile_ltrans.xpm -share/xpuyopuyo/themes/default/img_tile_right.xpm -share/xpuyopuyo/themes/default/img_tile_rightbottom.xpm -share/xpuyopuyo/themes/default/img_tile_righttop.xpm -share/xpuyopuyo/themes/default/img_tile_rtrans.xpm -share/xpuyopuyo/themes/default/img_tile_top.xpm -share/xpuyopuyo/themes/default/img_title.xpm -share/xpuyopuyo/themes/default/img_top.xpm -share/xpuyopuyo/themes/default/img_trans.xpm -share/xpuyopuyo/themes/3dRokz/img_0.xpm -share/xpuyopuyo/themes/3dRokz/img_0j.xpm -share/xpuyopuyo/themes/3dRokz/img_1.xpm -share/xpuyopuyo/themes/3dRokz/img_1j.xpm -share/xpuyopuyo/themes/3dRokz/img_2.xpm -share/xpuyopuyo/themes/3dRokz/img_2j.xpm -share/xpuyopuyo/themes/3dRokz/img_3.xpm -share/xpuyopuyo/themes/3dRokz/img_3j.xpm -share/xpuyopuyo/themes/3dRokz/img_4.xpm -share/xpuyopuyo/themes/3dRokz/img_4j.xpm -share/xpuyopuyo/themes/3dRokz/img_5.xpm -share/xpuyopuyo/themes/3dRokz/img_5j.xpm -share/xpuyopuyo/themes/3dRokz/img_clear.xpm -share/xpuyopuyo/themes/3dRokz/img_clearb.xpm -share/xpuyopuyo/themes/3dRokz/img_expl.xpm -share/xpuyopuyo/themes/3dRokz/img_gameover.xpm -share/xpuyopuyo/themes/3dRokz/img_ind.xpm -share/xpuyopuyo/themes/3dRokz/img_num0.xpm -share/xpuyopuyo/themes/3dRokz/img_num1.xpm -share/xpuyopuyo/themes/3dRokz/img_num2.xpm -share/xpuyopuyo/themes/3dRokz/img_num3.xpm -share/xpuyopuyo/themes/3dRokz/img_num4.xpm -share/xpuyopuyo/themes/3dRokz/img_num5.xpm -share/xpuyopuyo/themes/3dRokz/img_num6.xpm -share/xpuyopuyo/themes/3dRokz/img_num7.xpm -share/xpuyopuyo/themes/3dRokz/img_num8.xpm -share/xpuyopuyo/themes/3dRokz/img_num9.xpm -share/xpuyopuyo/themes/3dRokz/img_rock.xpm -share/xpuyopuyo/themes/3dRokz/img_rockbig.xpm -share/xpuyopuyo/themes/3dRokz/img_rockdemon.xpm -share/xpuyopuyo/themes/3dRokz/img_side.xpm -share/xpuyopuyo/themes/3dRokz/img_tile_bottom1.xpm -share/xpuyopuyo/themes/3dRokz/img_tile_bottom2.xpm -share/xpuyopuyo/themes/3dRokz/img_tile_bottom3.xpm -share/xpuyopuyo/themes/3dRokz/img_tile_left.xpm -share/xpuyopuyo/themes/3dRokz/img_tile_leftbottom.xpm -share/xpuyopuyo/themes/3dRokz/img_tile_lefttop.xpm -share/xpuyopuyo/themes/3dRokz/img_tile_ltrans.xpm -share/xpuyopuyo/themes/3dRokz/img_tile_right.xpm -share/xpuyopuyo/themes/3dRokz/img_tile_rightbottom.xpm -share/xpuyopuyo/themes/3dRokz/img_tile_righttop.xpm -share/xpuyopuyo/themes/3dRokz/img_tile_rtrans.xpm -share/xpuyopuyo/themes/3dRokz/img_tile_top.xpm -share/xpuyopuyo/themes/3dRokz/img_title.xpm -share/xpuyopuyo/themes/3dRokz/img_top.xpm -share/xpuyopuyo/themes/3dRokz/img_trans.xpm -share/xpuyopuyo/themes/smileys/img_0.xpm -share/xpuyopuyo/themes/smileys/img_0j.xpm -share/xpuyopuyo/themes/smileys/img_1.xpm -share/xpuyopuyo/themes/smileys/img_1j.xpm -share/xpuyopuyo/themes/smileys/img_2.xpm -share/xpuyopuyo/themes/smileys/img_2j.xpm -share/xpuyopuyo/themes/smileys/img_3.xpm -share/xpuyopuyo/themes/smileys/img_3j.xpm -share/xpuyopuyo/themes/smileys/img_4.xpm -share/xpuyopuyo/themes/smileys/img_4j.xpm -share/xpuyopuyo/themes/smileys/img_5.xpm -share/xpuyopuyo/themes/smileys/img_5j.xpm -share/xpuyopuyo/themes/smileys/img_expl.xpm -share/xpuyopuyo/themes/smileys/img_ind.xpm -share/xpuyopuyo/themes/smileys/img_rock.xpm -share/xpuyopuyo/themes/smileys/img_rockbig.xpm -share/xpuyopuyo/themes/smileys/img_rockdemon.xpm -share/xpuyopuyo/xpuyopuyo.txt -share/xpuyopuyo/copying.txt -@dirrm share/xpuyopuyo/themes/smileys -@dirrm share/xpuyopuyo/themes/3dRokz -@dirrm share/xpuyopuyo/themes/default -@dirrm share/xpuyopuyo/themes -@dirrm share/xpuyopuyo/sounds -@dirrm share/xpuyopuyo +%%GNOME:%%share/gnome/apps/Games/xpuyopuyo.desktop +%%GNOME:%%share/gnome/pixmaps/xpuyopuyo.xpm +%%DATADIR%%/xpuyopuyo/copying.txt +%%DATADIR%%/xpuyopuyo/sounds/game.xm +%%DATADIR%%/xpuyopuyo/sounds/gameover.xm +%%DATADIR%%/xpuyopuyo/sounds/prelude.xm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_0.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_0j.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_1.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_1j.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_2.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_2j.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_3.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_3j.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_4.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_4j.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_5.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_5j.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_clear.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_clearb.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_expl.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_gameover.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_ind.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num0.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num1.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num2.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num3.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num4.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num5.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num6.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num7.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num8.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num9.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_rock.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_rockbig.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_rockdemon.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_side.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_bottom1.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_bottom2.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_bottom3.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_left.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_leftbottom.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_lefttop.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_ltrans.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_right.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_rightbottom.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_righttop.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_rtrans.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_top.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_title.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_top.xpm +%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_trans.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_0.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_0j.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_1.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_1j.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_2.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_2j.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_3.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_3j.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_4.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_4j.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_5.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_5j.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_clear.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_clearb.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_expl.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_gameover.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_ind.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_num0.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_num1.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_num2.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_num3.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_num4.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_num5.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_num6.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_num7.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_num8.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_num9.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_paused.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_rock.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_rockbig.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_rockdemon.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_side.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_tile_bottom1.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_tile_bottom2.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_tile_bottom3.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_tile_left.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_tile_leftbottom.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_tile_lefttop.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_tile_ltrans.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_tile_right.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_tile_rightbottom.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_tile_righttop.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_tile_rtrans.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_tile_top.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_title.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_top.xpm +%%DATADIR%%/xpuyopuyo/themes/default/img_trans.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_0.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_0j.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_1.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_1j.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_2.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_2j.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_3.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_3j.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_4.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_4j.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_5.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_5j.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_expl.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_ind.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_rock.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_rockbig.xpm +%%DATADIR%%/xpuyopuyo/themes/smileys/img_rockdemon.xpm +%%DATADIR%%/xpuyopuyo/xpuyopuyo.txt +@dirrm %%DATADIR%%/xpuyopuyo/themes/smileys +@dirrm %%DATADIR%%/xpuyopuyo/themes/default +@dirrm %%DATADIR%%/xpuyopuyo/themes/3dRokz +@dirrm %%DATADIR%%/xpuyopuyo/themes +@dirrm %%DATADIR%%/xpuyopuyo/sounds +@dirrm %%DATADIR%%/xpuyopuyo diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile index f4892a6318b2..b7b3b1aa65e0 100644 --- a/games/xscorch/Makefile +++ b/games/xscorch/Makefile @@ -12,25 +12,23 @@ MASTER_SITES= http://chaos2.org/xscorch/ MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - mikmod.2:${PORTSDIR}/audio/libmikmod -.if defined(WITH_GNOME) -LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif +LIB_DEPENDS= mikmod.2:${PORTSDIR}/audio/libmikmod -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-gtk -.if defined(WITH_GNOME) -CONFIGURE_ARGS+=--with-gnome -.else -CONFIGURE_ARGS+=--without-gnome -.endif -CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" USE_GMAKE= yes -CFLAGS+= -g +USE_GTK= yes +WANT_GNOME= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-gtk MAN6= xscorch.6 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +.else +CONFIGURE_ARGS+= --without-gnome +.endif + +.include <bsd.port.post.mk> diff --git a/games/xscorch/pkg-plist b/games/xscorch/pkg-plist index 5c351a8fb7c4..d24ac05d5da3 100644 --- a/games/xscorch/pkg-plist +++ b/games/xscorch/pkg-plist @@ -1,11 +1,11 @@ bin/xscorch -share/xscorch/sounds/stamp -share/xscorch/images/xscorch-icon.xpm -share/xscorch/images/xscorch-logo.xpm -share/xscorch/copying.txt -share/xscorch/xscorch.txt -share/xscorch/tankprofiles -share/xscorch/tankprofiles~ -@dirrm share/xscorch/sounds -@dirrm share/xscorch/images -@dirrm share/xscorch +%%DATADIR%%/xscorch/sounds/stamp +%%DATADIR%%/xscorch/images/xscorch-icon.xpm +%%DATADIR%%/xscorch/images/xscorch-logo.xpm +%%DATADIR%%/xscorch/copying.txt +%%DATADIR%%/xscorch/xscorch.txt +%%DATADIR%%/xscorch/tankprofiles +%%DATADIR%%/xscorch/tankprofiles~ +@dirrm %%DATADIR%%/xscorch/sounds +@dirrm %%DATADIR%%/xscorch/images +@dirrm %%DATADIR%%/xscorch diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index 8ea13df76cd9..69fd0575d9cb 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -13,30 +13,26 @@ MASTER_SITE_SUBDIR= stable/sources/dia MAINTAINER= saper@system.pl -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - xml.5:${PORTSDIR}/textproc/libxml \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib \ +LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml \ popt.0:${PORTSDIR}/devel/popt -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -USE_X_PREFIX= yes -USE_LIBTOOL= yes +USE_X_PREFIX= yes USE_GMAKE= yes - -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --enable-gnome -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - LDFLAGS="-L${LOCALBASE}/lib" +USE_IMLIB= yes +WANT_GNOME= yes +USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" MAN1= dia.1 +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS= --enable-gnome +.endif + pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @@ -48,4 +44,4 @@ post-install: ${SED} "s|%%PREFIX%%|${PREFIX}|g" ${FILESDIR}/dia.sh > ${WRKDIR}/dia.sh ${INSTALL_SCRIPT} ${WRKDIR}/dia.sh ${PREFIX}/bin/dia -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/dia/files/patch-ab b/graphics/dia/files/patch-ab index b35be2f31f82..b3a5bd9a1570 100644 --- a/graphics/dia/files/patch-ab +++ b/graphics/dia/files/patch-ab @@ -1,6 +1,10 @@ --- Makefile.in.orig Mon Aug 7 12:15:36 2000 +++ Makefile.in Mon Aug 7 12:15:39 2000 -@@ -136,7 +136,7 @@ +@@ -120,14 +120,16 @@ + pkgdata_DATA = dia_logo.png + man_MANS = dia.1 + ++ifdef HAVE_GNOME pixmapdir = $(gnomedatadir)/pixmaps pixmap_DATA = dia_gnome_icon.png dia-diagram.png @@ -9,3 +13,42 @@ Applications_DATA = dia.desktop mimedir = $(gnomedatadir)/mime-info + mime_DATA = dia.mime dia.keys ++endif + + EXTRA_DIST = dia.xpm dia_gnome_icon.png dia_gnome_menu_icon.png dia.desktop dia.spec KNOWN_BUGS $(pkgdata_DATA) $(man_MANS) dia-diagram.png dia.mime dia.keys.in doc/diagram.dtd doc/sheet.dtd doc/custom-shapes + +@@ -237,7 +239,6 @@ + + install-ApplicationsDATA: $(Applications_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(Applicationsdir) + @list='$(Applications_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Applicationsdir)/$$p"; \ +@@ -256,7 +257,6 @@ + + install-mimeDATA: $(mime_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(mimedir) + @list='$(mime_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(mimedir)/$$p"; \ +@@ -275,7 +275,6 @@ + + install-pixmapDATA: $(pixmap_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(pixmapdir) + @list='$(pixmap_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \ +@@ -490,8 +489,7 @@ + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(Applicationsdir) \ +- $(DESTDIR)$(mimedir) $(DESTDIR)$(pixmapdir) \ ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 \ + $(DESTDIR)$(pkgdatadir) + + diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist index b3e07958de60..41cb97d5850e 100644 --- a/graphics/dia/pkg-plist +++ b/graphics/dia/pkg-plist @@ -17,251 +17,251 @@ lib/dia/libsvg_filter.so lib/dia/libsybase_objects.so lib/dia/libuml_objects.so lib/dia/libwpg_filter.so -share/gnome/apps/Applications/dia.desktop -share/gnome/dia/dia_logo.png -share/gnome/dia/shapes/Circuit/ground.shape -share/gnome/dia/shapes/Circuit/ground.xpm -share/gnome/dia/shapes/Circuit/hcapacitor.shape -share/gnome/dia/shapes/Circuit/hcapacitor.xpm -share/gnome/dia/shapes/Circuit/hdiode.shape -share/gnome/dia/shapes/Circuit/hdiode.xpm -share/gnome/dia/shapes/Circuit/hfuse_de.shape -share/gnome/dia/shapes/Circuit/hfuse_de.xpm -share/gnome/dia/shapes/Circuit/hinductor.shape -share/gnome/dia/shapes/Circuit/hinductor.xpm -share/gnome/dia/shapes/Circuit/hinductor_de.shape -share/gnome/dia/shapes/Circuit/hinductor_de.xpm -share/gnome/dia/shapes/Circuit/hjumper.shape -share/gnome/dia/shapes/Circuit/hled_de.shape -share/gnome/dia/shapes/Circuit/hled_de.xpm -share/gnome/dia/shapes/Circuit/hpowersource_de.shape -share/gnome/dia/shapes/Circuit/hpowersource_de.xpm -share/gnome/dia/shapes/Circuit/hresistor.shape -share/gnome/dia/shapes/Circuit/hresistor.xpm -share/gnome/dia/shapes/Circuit/hresistor_de.shape -share/gnome/dia/shapes/Circuit/hresistor_de.xpm -share/gnome/dia/shapes/Circuit/hzener.shape -share/gnome/dia/shapes/Circuit/hzener.xpm -share/gnome/dia/shapes/Circuit/lamp_de.shape -share/gnome/dia/shapes/Circuit/lamp_de.xpm -share/gnome/dia/shapes/Circuit/nmos_de.shape -share/gnome/dia/shapes/Circuit/nmos_de.xpm -share/gnome/dia/shapes/Circuit/npn.shape -share/gnome/dia/shapes/Circuit/npn.xpm -share/gnome/dia/shapes/Circuit/opamp.shape -share/gnome/dia/shapes/Circuit/opamp.xpm -share/gnome/dia/shapes/Circuit/pmos_de.shape -share/gnome/dia/shapes/Circuit/pmos_de.xpm -share/gnome/dia/shapes/Circuit/pnp.shape -share/gnome/dia/shapes/Circuit/pnp.xpm -share/gnome/dia/shapes/Circuit/speaker_de.shape -share/gnome/dia/shapes/Circuit/speaker_de.xpm -share/gnome/dia/shapes/Circuit/vcapacitor.shape -share/gnome/dia/shapes/Circuit/vcapacitor.xpm -share/gnome/dia/shapes/Circuit/vdiode.shape -share/gnome/dia/shapes/Circuit/vdiode.xpm -share/gnome/dia/shapes/Circuit/vfuse_de.shape -share/gnome/dia/shapes/Circuit/vfuse_de.xpm -share/gnome/dia/shapes/Circuit/vinductor.shape -share/gnome/dia/shapes/Circuit/vinductor.xpm -share/gnome/dia/shapes/Circuit/vinductor_de.shape -share/gnome/dia/shapes/Circuit/vinductor_de.xpm -share/gnome/dia/shapes/Circuit/vled_de.shape -share/gnome/dia/shapes/Circuit/vled_de.xpm -share/gnome/dia/shapes/Circuit/vpowersource_de.shape -share/gnome/dia/shapes/Circuit/vpowersource_de.xpm -share/gnome/dia/shapes/Circuit/vresistor.shape -share/gnome/dia/shapes/Circuit/vresistor.xpm -share/gnome/dia/shapes/Circuit/vresistor_de.shape -share/gnome/dia/shapes/Circuit/vresistor_de.xpm -share/gnome/dia/shapes/Circuit/vzener.shape -share/gnome/dia/shapes/Circuit/vzener.xpm -share/gnome/dia/shapes/Civil/bvrest.shape -share/gnome/dia/shapes/Civil/bvrest.xpm -share/gnome/dia/shapes/Civil/hcompressor.shape -share/gnome/dia/shapes/Civil/hcompressor.xpm -share/gnome/dia/shapes/Civil/hpump.shape -share/gnome/dia/shapes/Civil/hpump.xpm -share/gnome/dia/shapes/Civil/hrest.shape -share/gnome/dia/shapes/Civil/hrest.xpm -share/gnome/dia/shapes/Civil/line.shape -share/gnome/dia/shapes/Civil/line.xpm -share/gnome/dia/shapes/Civil/vcompressor.shape -share/gnome/dia/shapes/Civil/vcompressor.xpm -share/gnome/dia/shapes/Civil/vpump.shape -share/gnome/dia/shapes/Civil/vpump.xpm -share/gnome/dia/shapes/Civil/vrest.shape -share/gnome/dia/shapes/Civil/vrest.xpm -share/gnome/dia/shapes/Civil/water_level.shape -share/gnome/dia/shapes/Civil/water_level.xpm -share/gnome/dia/shapes/Contact/c_if.shape -share/gnome/dia/shapes/Contact/c_if.xpm -share/gnome/dia/shapes/Contact/c_ifnot.shape -share/gnome/dia/shapes/Contact/c_ifnot.xpm -share/gnome/dia/shapes/Contact/c_lamp.shape -share/gnome/dia/shapes/Contact/c_lamp.xpm -share/gnome/dia/shapes/Contact/c_relay.shape -share/gnome/dia/shapes/Contact/c_relay.xpm -share/gnome/dia/shapes/Contact/l_if.shape -share/gnome/dia/shapes/Contact/l_if.xpm -share/gnome/dia/shapes/Contact/l_ifnot.shape -share/gnome/dia/shapes/Contact/l_ifnot.xpm -share/gnome/dia/shapes/Contact/l_out.shape -share/gnome/dia/shapes/Contact/l_out.xpm -share/gnome/dia/shapes/Contact/l_outj.shape -share/gnome/dia/shapes/Contact/l_outj.xpm -share/gnome/dia/shapes/Contact/l_outnot.shape -share/gnome/dia/shapes/Contact/l_outnot.xpm -share/gnome/dia/shapes/Contact/l_outr.shape -share/gnome/dia/shapes/Contact/l_outr.xpm -share/gnome/dia/shapes/Contact/l_outrcep.shape -share/gnome/dia/shapes/Contact/l_outrcep.xpm -share/gnome/dia/shapes/Contact/l_outs.shape -share/gnome/dia/shapes/Contact/l_outs.xpm -share/gnome/dia/shapes/Contact/l_sout.shape -share/gnome/dia/shapes/Contact/l_sout.xpm -share/gnome/dia/shapes/Contact/l_soutnot.shape -share/gnome/dia/shapes/Contact/l_soutnot.xpm -share/gnome/dia/shapes/Contact/l_soutr.shape -share/gnome/dia/shapes/Contact/l_soutr.xpm -share/gnome/dia/shapes/Contact/l_souts.shape -share/gnome/dia/shapes/Contact/l_souts.xpm -share/gnome/dia/shapes/Electric/cnx.shape -share/gnome/dia/shapes/Electric/cnx.xpm -share/gnome/dia/shapes/Electric/command.shape -share/gnome/dia/shapes/Electric/command.xpm -share/gnome/dia/shapes/Electric/contact_f.shape -share/gnome/dia/shapes/Electric/contact_f.xpm -share/gnome/dia/shapes/Electric/contact_o.shape -share/gnome/dia/shapes/Electric/contact_o.xpm -share/gnome/dia/shapes/Electric/intpos_f.shape -share/gnome/dia/shapes/Electric/intpos_f.xpm -share/gnome/dia/shapes/Electric/intpos_o.shape -share/gnome/dia/shapes/Electric/intpos_o.xpm -share/gnome/dia/shapes/Electric/lamp.shape -share/gnome/dia/shapes/Electric/lamp.xpm -share/gnome/dia/shapes/Electric/relay.shape -share/gnome/dia/shapes/Electric/relay.xpm -share/gnome/dia/shapes/Flowchart/collate.shape -share/gnome/dia/shapes/Flowchart/collate.xpm -share/gnome/dia/shapes/Flowchart/delay.shape -share/gnome/dia/shapes/Flowchart/delay.xpm -share/gnome/dia/shapes/Flowchart/display.shape -share/gnome/dia/shapes/Flowchart/display.xpm -share/gnome/dia/shapes/Flowchart/document.shape -share/gnome/dia/shapes/Flowchart/document.xpm -share/gnome/dia/shapes/Flowchart/extract.shape -share/gnome/dia/shapes/Flowchart/extract.xpm -share/gnome/dia/shapes/Flowchart/intstorage.shape -share/gnome/dia/shapes/Flowchart/intstorage.xpm -share/gnome/dia/shapes/Flowchart/magdisk.shape -share/gnome/dia/shapes/Flowchart/magdisk.xpm -share/gnome/dia/shapes/Flowchart/magdrum.shape -share/gnome/dia/shapes/Flowchart/magdrum.xpm -share/gnome/dia/shapes/Flowchart/magtape.shape -share/gnome/dia/shapes/Flowchart/magtape.xpm -share/gnome/dia/shapes/Flowchart/manualinput.shape -share/gnome/dia/shapes/Flowchart/manualinput.xpm -share/gnome/dia/shapes/Flowchart/manualop.shape -share/gnome/dia/shapes/Flowchart/manualop.xpm -share/gnome/dia/shapes/Flowchart/merge.shape -share/gnome/dia/shapes/Flowchart/merge.xpm -share/gnome/dia/shapes/Flowchart/offlinestore.shape -share/gnome/dia/shapes/Flowchart/offlinestore.xpm -share/gnome/dia/shapes/Flowchart/offpageconn.shape -share/gnome/dia/shapes/Flowchart/offpageconn.xpm -share/gnome/dia/shapes/Flowchart/or.shape -share/gnome/dia/shapes/Flowchart/or.xpm -share/gnome/dia/shapes/Flowchart/predefdproc.shape -share/gnome/dia/shapes/Flowchart/predefdproc.xpm -share/gnome/dia/shapes/Flowchart/preparation.shape -share/gnome/dia/shapes/Flowchart/preparation.xpm -share/gnome/dia/shapes/Flowchart/punchedcard.shape -share/gnome/dia/shapes/Flowchart/punchedcard.xpm -share/gnome/dia/shapes/Flowchart/punchedtape.shape -share/gnome/dia/shapes/Flowchart/punchedtape.xpm -share/gnome/dia/shapes/Flowchart/sort.shape -share/gnome/dia/shapes/Flowchart/sort.xpm -share/gnome/dia/shapes/Flowchart/sumjunction.shape -share/gnome/dia/shapes/Flowchart/sumjunction.xpm -share/gnome/dia/shapes/Flowchart/terminal.shape -share/gnome/dia/shapes/Flowchart/terminal.xpm -share/gnome/dia/shapes/Flowchart/transaction.shape -share/gnome/dia/shapes/Flowchart/transaction.xpm -share/gnome/dia/shapes/Flowchart/transmittape.shape -share/gnome/dia/shapes/Flowchart/transmittape.xpm -share/gnome/dia/shapes/Network/nwcloud.shape -share/gnome/dia/shapes/Network/nwcloud.xpm -share/gnome/dia/shapes/Network/router-symbol.shape -share/gnome/dia/shapes/Network/router-symbol.xpm -share/gnome/dia/shapes/Network/switch-atm-symbol.shape -share/gnome/dia/shapes/Network/switch-atm-symbol.xpm -share/gnome/dia/shapes/Network/switch-symbol.shape -share/gnome/dia/shapes/Network/switch-symbol.xpm -share/gnome/dia/shapes/Pneumatic/cnx.shape -share/gnome/dia/shapes/Pneumatic/cnx.xpm -share/gnome/dia/shapes/Pneumatic/comelec1.shape -share/gnome/dia/shapes/Pneumatic/comelec1.xpm -share/gnome/dia/shapes/Pneumatic/comelec2.shape -share/gnome/dia/shapes/Pneumatic/comelec2.xpm -share/gnome/dia/shapes/Pneumatic/commusc.shape -share/gnome/dia/shapes/Pneumatic/commusc.xpm -share/gnome/dia/shapes/Pneumatic/compb.shape -share/gnome/dia/shapes/Pneumatic/compb.xpm -share/gnome/dia/shapes/Pneumatic/compilh.shape -share/gnome/dia/shapes/Pneumatic/compilh.xpm -share/gnome/dia/shapes/Pneumatic/compilp.shape -share/gnome/dia/shapes/Pneumatic/compilp.xpm -share/gnome/dia/shapes/Pneumatic/comspr.shape -share/gnome/dia/shapes/Pneumatic/comspr.xpm -share/gnome/dia/shapes/Pneumatic/dejack.shape -share/gnome/dia/shapes/Pneumatic/dejack.xpm -share/gnome/dia/shapes/Pneumatic/dist22.shape -share/gnome/dia/shapes/Pneumatic/dist22.xpm -share/gnome/dia/shapes/Pneumatic/dist32.shape -share/gnome/dia/shapes/Pneumatic/dist32.xpm -share/gnome/dia/shapes/Pneumatic/dist42.shape -share/gnome/dia/shapes/Pneumatic/dist42.xpm -share/gnome/dia/shapes/Pneumatic/dist52.shape -share/gnome/dia/shapes/Pneumatic/dist52.xpm -share/gnome/dia/shapes/Pneumatic/drain.shape -share/gnome/dia/shapes/Pneumatic/drain.xpm -share/gnome/dia/shapes/Pneumatic/press.shape -share/gnome/dia/shapes/Pneumatic/press.xpm -share/gnome/dia/shapes/Pneumatic/presshy.shape -share/gnome/dia/shapes/Pneumatic/presshy.xpm -share/gnome/dia/shapes/Pneumatic/presspn.shape -share/gnome/dia/shapes/Pneumatic/presspn.xpm -share/gnome/dia/shapes/Pneumatic/seijack.shape -share/gnome/dia/shapes/Pneumatic/seijack.xpm -share/gnome/dia/shapes/Pneumatic/seojack.shape -share/gnome/dia/shapes/Pneumatic/seojack.xpm -share/gnome/dia/sheets/Circuit.sheet -share/gnome/dia/sheets/Contact.sheet -share/gnome/dia/sheets/ER.sheet -share/gnome/dia/sheets/ER/weakentity.xpm -share/gnome/dia/sheets/Electric.sheet -share/gnome/dia/sheets/FS.sheet -share/gnome/dia/sheets/Flowchart.sheet -share/gnome/dia/sheets/GRAFCET.sheet -share/gnome/dia/sheets/GRAFCET/etapei.xpm -share/gnome/dia/sheets/GRAFCET/etapemc.xpm -share/gnome/dia/sheets/GRAFCET/etapeme.xpm -share/gnome/dia/sheets/GRAFCET/etapems.xpm -share/gnome/dia/sheets/GRAFCET/etapesp.xpm -share/gnome/dia/sheets/GRAFCET/vergent_and.xpm -share/gnome/dia/sheets/Pneumatic.sheet -share/gnome/dia/sheets/SADT.sheet -share/gnome/dia/sheets/UML.sheet -share/gnome/dia/sheets/UML/aggregation.xpm -share/gnome/dia/sheets/UML/umlclass_template.xpm -share/gnome/dia/sheets/chronogram.sheet -share/gnome/dia/sheets/network.sheet -share/gnome/dia/sheets/sybase.sheet -share/gnome/mime-info/dia.keys -share/gnome/mime-info/dia.mime -share/gnome/pixmaps/dia-diagram.png -share/gnome/pixmaps/dia_gnome_icon.png +%%GNOME:%%share/gnome/apps/Applications/dia.desktop +%%DATADIR%%/dia/dia_logo.png +%%DATADIR%%/dia/shapes/Circuit/ground.shape +%%DATADIR%%/dia/shapes/Circuit/ground.xpm +%%DATADIR%%/dia/shapes/Circuit/hcapacitor.shape +%%DATADIR%%/dia/shapes/Circuit/hcapacitor.xpm +%%DATADIR%%/dia/shapes/Circuit/hdiode.shape +%%DATADIR%%/dia/shapes/Circuit/hdiode.xpm +%%DATADIR%%/dia/shapes/Circuit/hfuse_de.shape +%%DATADIR%%/dia/shapes/Circuit/hfuse_de.xpm +%%DATADIR%%/dia/shapes/Circuit/hinductor.shape +%%DATADIR%%/dia/shapes/Circuit/hinductor.xpm +%%DATADIR%%/dia/shapes/Circuit/hinductor_de.shape +%%DATADIR%%/dia/shapes/Circuit/hinductor_de.xpm +%%DATADIR%%/dia/shapes/Circuit/hjumper.shape +%%DATADIR%%/dia/shapes/Circuit/hled_de.shape +%%DATADIR%%/dia/shapes/Circuit/hled_de.xpm +%%DATADIR%%/dia/shapes/Circuit/hpowersource_de.shape +%%DATADIR%%/dia/shapes/Circuit/hpowersource_de.xpm +%%DATADIR%%/dia/shapes/Circuit/hresistor.shape +%%DATADIR%%/dia/shapes/Circuit/hresistor.xpm +%%DATADIR%%/dia/shapes/Circuit/hresistor_de.shape +%%DATADIR%%/dia/shapes/Circuit/hresistor_de.xpm +%%DATADIR%%/dia/shapes/Circuit/hzener.shape +%%DATADIR%%/dia/shapes/Circuit/hzener.xpm +%%DATADIR%%/dia/shapes/Circuit/lamp_de.shape +%%DATADIR%%/dia/shapes/Circuit/lamp_de.xpm +%%DATADIR%%/dia/shapes/Circuit/nmos_de.shape +%%DATADIR%%/dia/shapes/Circuit/nmos_de.xpm +%%DATADIR%%/dia/shapes/Circuit/npn.shape +%%DATADIR%%/dia/shapes/Circuit/npn.xpm +%%DATADIR%%/dia/shapes/Circuit/opamp.shape +%%DATADIR%%/dia/shapes/Circuit/opamp.xpm +%%DATADIR%%/dia/shapes/Circuit/pmos_de.shape +%%DATADIR%%/dia/shapes/Circuit/pmos_de.xpm +%%DATADIR%%/dia/shapes/Circuit/pnp.shape +%%DATADIR%%/dia/shapes/Circuit/pnp.xpm +%%DATADIR%%/dia/shapes/Circuit/speaker_de.shape +%%DATADIR%%/dia/shapes/Circuit/speaker_de.xpm +%%DATADIR%%/dia/shapes/Circuit/vcapacitor.shape +%%DATADIR%%/dia/shapes/Circuit/vcapacitor.xpm +%%DATADIR%%/dia/shapes/Circuit/vdiode.shape +%%DATADIR%%/dia/shapes/Circuit/vdiode.xpm +%%DATADIR%%/dia/shapes/Circuit/vfuse_de.shape +%%DATADIR%%/dia/shapes/Circuit/vfuse_de.xpm +%%DATADIR%%/dia/shapes/Circuit/vinductor.shape +%%DATADIR%%/dia/shapes/Circuit/vinductor.xpm +%%DATADIR%%/dia/shapes/Circuit/vinductor_de.shape +%%DATADIR%%/dia/shapes/Circuit/vinductor_de.xpm +%%DATADIR%%/dia/shapes/Circuit/vled_de.shape +%%DATADIR%%/dia/shapes/Circuit/vled_de.xpm +%%DATADIR%%/dia/shapes/Circuit/vpowersource_de.shape +%%DATADIR%%/dia/shapes/Circuit/vpowersource_de.xpm +%%DATADIR%%/dia/shapes/Circuit/vresistor.shape +%%DATADIR%%/dia/shapes/Circuit/vresistor.xpm +%%DATADIR%%/dia/shapes/Circuit/vresistor_de.shape +%%DATADIR%%/dia/shapes/Circuit/vresistor_de.xpm +%%DATADIR%%/dia/shapes/Circuit/vzener.shape +%%DATADIR%%/dia/shapes/Circuit/vzener.xpm +%%DATADIR%%/dia/shapes/Civil/bvrest.shape +%%DATADIR%%/dia/shapes/Civil/bvrest.xpm +%%DATADIR%%/dia/shapes/Civil/hcompressor.shape +%%DATADIR%%/dia/shapes/Civil/hcompressor.xpm +%%DATADIR%%/dia/shapes/Civil/hpump.shape +%%DATADIR%%/dia/shapes/Civil/hpump.xpm +%%DATADIR%%/dia/shapes/Civil/hrest.shape +%%DATADIR%%/dia/shapes/Civil/hrest.xpm +%%DATADIR%%/dia/shapes/Civil/line.shape +%%DATADIR%%/dia/shapes/Civil/line.xpm +%%DATADIR%%/dia/shapes/Civil/vcompressor.shape +%%DATADIR%%/dia/shapes/Civil/vcompressor.xpm +%%DATADIR%%/dia/shapes/Civil/vpump.shape +%%DATADIR%%/dia/shapes/Civil/vpump.xpm +%%DATADIR%%/dia/shapes/Civil/vrest.shape +%%DATADIR%%/dia/shapes/Civil/vrest.xpm +%%DATADIR%%/dia/shapes/Civil/water_level.shape +%%DATADIR%%/dia/shapes/Civil/water_level.xpm +%%DATADIR%%/dia/shapes/Contact/c_if.shape +%%DATADIR%%/dia/shapes/Contact/c_if.xpm +%%DATADIR%%/dia/shapes/Contact/c_ifnot.shape +%%DATADIR%%/dia/shapes/Contact/c_ifnot.xpm +%%DATADIR%%/dia/shapes/Contact/c_lamp.shape +%%DATADIR%%/dia/shapes/Contact/c_lamp.xpm +%%DATADIR%%/dia/shapes/Contact/c_relay.shape +%%DATADIR%%/dia/shapes/Contact/c_relay.xpm +%%DATADIR%%/dia/shapes/Contact/l_if.shape +%%DATADIR%%/dia/shapes/Contact/l_if.xpm +%%DATADIR%%/dia/shapes/Contact/l_ifnot.shape +%%DATADIR%%/dia/shapes/Contact/l_ifnot.xpm +%%DATADIR%%/dia/shapes/Contact/l_out.shape +%%DATADIR%%/dia/shapes/Contact/l_out.xpm +%%DATADIR%%/dia/shapes/Contact/l_outj.shape +%%DATADIR%%/dia/shapes/Contact/l_outj.xpm +%%DATADIR%%/dia/shapes/Contact/l_outnot.shape +%%DATADIR%%/dia/shapes/Contact/l_outnot.xpm +%%DATADIR%%/dia/shapes/Contact/l_outr.shape +%%DATADIR%%/dia/shapes/Contact/l_outr.xpm +%%DATADIR%%/dia/shapes/Contact/l_outrcep.shape +%%DATADIR%%/dia/shapes/Contact/l_outrcep.xpm +%%DATADIR%%/dia/shapes/Contact/l_outs.shape +%%DATADIR%%/dia/shapes/Contact/l_outs.xpm +%%DATADIR%%/dia/shapes/Contact/l_sout.shape +%%DATADIR%%/dia/shapes/Contact/l_sout.xpm +%%DATADIR%%/dia/shapes/Contact/l_soutnot.shape +%%DATADIR%%/dia/shapes/Contact/l_soutnot.xpm +%%DATADIR%%/dia/shapes/Contact/l_soutr.shape +%%DATADIR%%/dia/shapes/Contact/l_soutr.xpm +%%DATADIR%%/dia/shapes/Contact/l_souts.shape +%%DATADIR%%/dia/shapes/Contact/l_souts.xpm +%%DATADIR%%/dia/shapes/Electric/cnx.shape +%%DATADIR%%/dia/shapes/Electric/cnx.xpm +%%DATADIR%%/dia/shapes/Electric/command.shape +%%DATADIR%%/dia/shapes/Electric/command.xpm +%%DATADIR%%/dia/shapes/Electric/contact_f.shape +%%DATADIR%%/dia/shapes/Electric/contact_f.xpm +%%DATADIR%%/dia/shapes/Electric/contact_o.shape +%%DATADIR%%/dia/shapes/Electric/contact_o.xpm +%%DATADIR%%/dia/shapes/Electric/intpos_f.shape +%%DATADIR%%/dia/shapes/Electric/intpos_f.xpm +%%DATADIR%%/dia/shapes/Electric/intpos_o.shape +%%DATADIR%%/dia/shapes/Electric/intpos_o.xpm +%%DATADIR%%/dia/shapes/Electric/lamp.shape +%%DATADIR%%/dia/shapes/Electric/lamp.xpm +%%DATADIR%%/dia/shapes/Electric/relay.shape +%%DATADIR%%/dia/shapes/Electric/relay.xpm +%%DATADIR%%/dia/shapes/Flowchart/collate.shape +%%DATADIR%%/dia/shapes/Flowchart/collate.xpm +%%DATADIR%%/dia/shapes/Flowchart/delay.shape +%%DATADIR%%/dia/shapes/Flowchart/delay.xpm +%%DATADIR%%/dia/shapes/Flowchart/display.shape +%%DATADIR%%/dia/shapes/Flowchart/display.xpm +%%DATADIR%%/dia/shapes/Flowchart/document.shape +%%DATADIR%%/dia/shapes/Flowchart/document.xpm +%%DATADIR%%/dia/shapes/Flowchart/extract.shape +%%DATADIR%%/dia/shapes/Flowchart/extract.xpm +%%DATADIR%%/dia/shapes/Flowchart/intstorage.shape +%%DATADIR%%/dia/shapes/Flowchart/intstorage.xpm +%%DATADIR%%/dia/shapes/Flowchart/magdisk.shape +%%DATADIR%%/dia/shapes/Flowchart/magdisk.xpm +%%DATADIR%%/dia/shapes/Flowchart/magdrum.shape +%%DATADIR%%/dia/shapes/Flowchart/magdrum.xpm +%%DATADIR%%/dia/shapes/Flowchart/magtape.shape +%%DATADIR%%/dia/shapes/Flowchart/magtape.xpm +%%DATADIR%%/dia/shapes/Flowchart/manualinput.shape +%%DATADIR%%/dia/shapes/Flowchart/manualinput.xpm +%%DATADIR%%/dia/shapes/Flowchart/manualop.shape +%%DATADIR%%/dia/shapes/Flowchart/manualop.xpm +%%DATADIR%%/dia/shapes/Flowchart/merge.shape +%%DATADIR%%/dia/shapes/Flowchart/merge.xpm +%%DATADIR%%/dia/shapes/Flowchart/offlinestore.shape +%%DATADIR%%/dia/shapes/Flowchart/offlinestore.xpm +%%DATADIR%%/dia/shapes/Flowchart/offpageconn.shape +%%DATADIR%%/dia/shapes/Flowchart/offpageconn.xpm +%%DATADIR%%/dia/shapes/Flowchart/or.shape +%%DATADIR%%/dia/shapes/Flowchart/or.xpm +%%DATADIR%%/dia/shapes/Flowchart/predefdproc.shape +%%DATADIR%%/dia/shapes/Flowchart/predefdproc.xpm +%%DATADIR%%/dia/shapes/Flowchart/preparation.shape +%%DATADIR%%/dia/shapes/Flowchart/preparation.xpm +%%DATADIR%%/dia/shapes/Flowchart/punchedcard.shape +%%DATADIR%%/dia/shapes/Flowchart/punchedcard.xpm +%%DATADIR%%/dia/shapes/Flowchart/punchedtape.shape +%%DATADIR%%/dia/shapes/Flowchart/punchedtape.xpm +%%DATADIR%%/dia/shapes/Flowchart/sort.shape +%%DATADIR%%/dia/shapes/Flowchart/sort.xpm +%%DATADIR%%/dia/shapes/Flowchart/sumjunction.shape +%%DATADIR%%/dia/shapes/Flowchart/sumjunction.xpm +%%DATADIR%%/dia/shapes/Flowchart/terminal.shape +%%DATADIR%%/dia/shapes/Flowchart/terminal.xpm +%%DATADIR%%/dia/shapes/Flowchart/transaction.shape +%%DATADIR%%/dia/shapes/Flowchart/transaction.xpm +%%DATADIR%%/dia/shapes/Flowchart/transmittape.shape +%%DATADIR%%/dia/shapes/Flowchart/transmittape.xpm +%%DATADIR%%/dia/shapes/Network/nwcloud.shape +%%DATADIR%%/dia/shapes/Network/nwcloud.xpm +%%DATADIR%%/dia/shapes/Network/router-symbol.shape +%%DATADIR%%/dia/shapes/Network/router-symbol.xpm +%%DATADIR%%/dia/shapes/Network/switch-atm-symbol.shape +%%DATADIR%%/dia/shapes/Network/switch-atm-symbol.xpm +%%DATADIR%%/dia/shapes/Network/switch-symbol.shape +%%DATADIR%%/dia/shapes/Network/switch-symbol.xpm +%%DATADIR%%/dia/shapes/Pneumatic/cnx.shape +%%DATADIR%%/dia/shapes/Pneumatic/cnx.xpm +%%DATADIR%%/dia/shapes/Pneumatic/comelec1.shape +%%DATADIR%%/dia/shapes/Pneumatic/comelec1.xpm +%%DATADIR%%/dia/shapes/Pneumatic/comelec2.shape +%%DATADIR%%/dia/shapes/Pneumatic/comelec2.xpm +%%DATADIR%%/dia/shapes/Pneumatic/commusc.shape +%%DATADIR%%/dia/shapes/Pneumatic/commusc.xpm +%%DATADIR%%/dia/shapes/Pneumatic/compb.shape +%%DATADIR%%/dia/shapes/Pneumatic/compb.xpm +%%DATADIR%%/dia/shapes/Pneumatic/compilh.shape +%%DATADIR%%/dia/shapes/Pneumatic/compilh.xpm +%%DATADIR%%/dia/shapes/Pneumatic/compilp.shape +%%DATADIR%%/dia/shapes/Pneumatic/compilp.xpm +%%DATADIR%%/dia/shapes/Pneumatic/comspr.shape +%%DATADIR%%/dia/shapes/Pneumatic/comspr.xpm +%%DATADIR%%/dia/shapes/Pneumatic/dejack.shape +%%DATADIR%%/dia/shapes/Pneumatic/dejack.xpm +%%DATADIR%%/dia/shapes/Pneumatic/dist22.shape +%%DATADIR%%/dia/shapes/Pneumatic/dist22.xpm +%%DATADIR%%/dia/shapes/Pneumatic/dist32.shape +%%DATADIR%%/dia/shapes/Pneumatic/dist32.xpm +%%DATADIR%%/dia/shapes/Pneumatic/dist42.shape +%%DATADIR%%/dia/shapes/Pneumatic/dist42.xpm +%%DATADIR%%/dia/shapes/Pneumatic/dist52.shape +%%DATADIR%%/dia/shapes/Pneumatic/dist52.xpm +%%DATADIR%%/dia/shapes/Pneumatic/drain.shape +%%DATADIR%%/dia/shapes/Pneumatic/drain.xpm +%%DATADIR%%/dia/shapes/Pneumatic/press.shape +%%DATADIR%%/dia/shapes/Pneumatic/press.xpm +%%DATADIR%%/dia/shapes/Pneumatic/presshy.shape +%%DATADIR%%/dia/shapes/Pneumatic/presshy.xpm +%%DATADIR%%/dia/shapes/Pneumatic/presspn.shape +%%DATADIR%%/dia/shapes/Pneumatic/presspn.xpm +%%DATADIR%%/dia/shapes/Pneumatic/seijack.shape +%%DATADIR%%/dia/shapes/Pneumatic/seijack.xpm +%%DATADIR%%/dia/shapes/Pneumatic/seojack.shape +%%DATADIR%%/dia/shapes/Pneumatic/seojack.xpm +%%DATADIR%%/dia/sheets/Circuit.sheet +%%DATADIR%%/dia/sheets/Contact.sheet +%%DATADIR%%/dia/sheets/ER.sheet +%%DATADIR%%/dia/sheets/ER/weakentity.xpm +%%DATADIR%%/dia/sheets/Electric.sheet +%%DATADIR%%/dia/sheets/FS.sheet +%%DATADIR%%/dia/sheets/Flowchart.sheet +%%DATADIR%%/dia/sheets/GRAFCET.sheet +%%DATADIR%%/dia/sheets/GRAFCET/etapei.xpm +%%DATADIR%%/dia/sheets/GRAFCET/etapemc.xpm +%%DATADIR%%/dia/sheets/GRAFCET/etapeme.xpm +%%DATADIR%%/dia/sheets/GRAFCET/etapems.xpm +%%DATADIR%%/dia/sheets/GRAFCET/etapesp.xpm +%%DATADIR%%/dia/sheets/GRAFCET/vergent_and.xpm +%%DATADIR%%/dia/sheets/Pneumatic.sheet +%%DATADIR%%/dia/sheets/SADT.sheet +%%DATADIR%%/dia/sheets/UML.sheet +%%DATADIR%%/dia/sheets/UML/aggregation.xpm +%%DATADIR%%/dia/sheets/UML/umlclass_template.xpm +%%DATADIR%%/dia/sheets/chronogram.sheet +%%DATADIR%%/dia/sheets/network.sheet +%%DATADIR%%/dia/sheets/sybase.sheet +%%GNOME:%%share/gnome/mime-info/dia.keys +%%GNOME:%%share/gnome/mime-info/dia.mime +%%GNOME:%%share/gnome/pixmaps/dia-diagram.png +%%GNOME:%%share/gnome/pixmaps/dia_gnome_icon.png share/locale/ca/LC_MESSAGES/dia.mo share/locale/da/LC_MESSAGES/dia.mo share/locale/de/LC_MESSAGES/dia.mo @@ -283,17 +283,17 @@ share/locale/sv/LC_MESSAGES/dia.mo share/locale/tr/LC_MESSAGES/dia.mo share/locale/uk/LC_MESSAGES/dia.mo share/locale/zh_TW.Big5/LC_MESSAGES/dia.mo -@dirrm share/gnome/dia/sheets/UML -@dirrm share/gnome/dia/sheets/GRAFCET -@dirrm share/gnome/dia/sheets/ER -@dirrm share/gnome/dia/sheets -@dirrm share/gnome/dia/shapes/Pneumatic -@dirrm share/gnome/dia/shapes/Network -@dirrm share/gnome/dia/shapes/Flowchart -@dirrm share/gnome/dia/shapes/Electric -@dirrm share/gnome/dia/shapes/Contact -@dirrm share/gnome/dia/shapes/Civil -@dirrm share/gnome/dia/shapes/Circuit -@dirrm share/gnome/dia/shapes -@dirrm share/gnome/dia +@dirrm %%DATADIR%%/dia/sheets/UML +@dirrm %%DATADIR%%/dia/sheets/GRAFCET +@dirrm %%DATADIR%%/dia/sheets/ER +@dirrm %%DATADIR%%/dia/sheets +@dirrm %%DATADIR%%/dia/shapes/Pneumatic +@dirrm %%DATADIR%%/dia/shapes/Network +@dirrm %%DATADIR%%/dia/shapes/Flowchart +@dirrm %%DATADIR%%/dia/shapes/Electric +@dirrm %%DATADIR%%/dia/shapes/Contact +@dirrm %%DATADIR%%/dia/shapes/Civil +@dirrm %%DATADIR%%/dia/shapes/Circuit +@dirrm %%DATADIR%%/dia/shapes +@dirrm %%DATADIR%%/dia @dirrm lib/dia diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile index a9a05d862073..1272d291e5ec 100644 --- a/graphics/gimp-app-devel/Makefile +++ b/graphics/gimp-app-devel/Makefile @@ -17,60 +17,52 @@ MAINTAINER= vanilla@FreeBSD.org LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config SHLIBVER?= ${PORTVERSION:S/1.//g} USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes +USE_GTK= yes +WANT_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore PLIST_SUB= SHLIBVER="${SHLIBVER}" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= gimp.1 gimptool.1 gimp-remote.1 MAN5= gimprc.5 -.if !defined(WITH_PERL) -CONFIGURE_ARGS= --disable-perl -PLIST_SUB+= PERL:="@comment " -.else +.if defined(WITH_PERL) PERL_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent BUILD_DEPENDS+= ${PERL_DEPENDS} RUN_DEPENDS+= ${PERL_DEPENDS} PLIST_SUB+= PERL:="" -.endif - -.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ - && !defined(WITHOUT_GNOME)) -LIB_DEPENDS+= gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs -PLIST_SUB+= GNOME:="" .else -PLIST_SUB+= GNOME:="@comment " -.endif - -.if !defined(WITH_PERL) +CONFIGURE_ARGS= --disable-perl +PLIST_SUB+= PERL:="@comment " pre-fetch: @${ECHO} -n "If you want to compile with perl support use " @${ECHO} "'make -DWITH_PERL' instead" .endif +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +.endif + post-install: ${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin @${CAT} ${PKGDIR}/MESSAGE -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index a9a05d862073..1272d291e5ec 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -17,60 +17,52 @@ MAINTAINER= vanilla@FreeBSD.org LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config SHLIBVER?= ${PORTVERSION:S/1.//g} USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes +USE_GTK= yes +WANT_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore PLIST_SUB= SHLIBVER="${SHLIBVER}" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= gimp.1 gimptool.1 gimp-remote.1 MAN5= gimprc.5 -.if !defined(WITH_PERL) -CONFIGURE_ARGS= --disable-perl -PLIST_SUB+= PERL:="@comment " -.else +.if defined(WITH_PERL) PERL_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent BUILD_DEPENDS+= ${PERL_DEPENDS} RUN_DEPENDS+= ${PERL_DEPENDS} PLIST_SUB+= PERL:="" -.endif - -.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ - && !defined(WITHOUT_GNOME)) -LIB_DEPENDS+= gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs -PLIST_SUB+= GNOME:="" .else -PLIST_SUB+= GNOME:="@comment " -.endif - -.if !defined(WITH_PERL) +CONFIGURE_ARGS= --disable-perl +PLIST_SUB+= PERL:="@comment " pre-fetch: @${ECHO} -n "If you want to compile with perl support use " @${ECHO} "'make -DWITH_PERL' instead" .endif +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +.endif + post-install: ${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin @${CAT} ${PKGDIR}/MESSAGE -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile index a9a05d862073..1272d291e5ec 100644 --- a/graphics/gimp-devel/Makefile +++ b/graphics/gimp-devel/Makefile @@ -17,60 +17,52 @@ MAINTAINER= vanilla@FreeBSD.org LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config SHLIBVER?= ${PORTVERSION:S/1.//g} USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes +USE_GTK= yes +WANT_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore PLIST_SUB= SHLIBVER="${SHLIBVER}" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= gimp.1 gimptool.1 gimp-remote.1 MAN5= gimprc.5 -.if !defined(WITH_PERL) -CONFIGURE_ARGS= --disable-perl -PLIST_SUB+= PERL:="@comment " -.else +.if defined(WITH_PERL) PERL_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent BUILD_DEPENDS+= ${PERL_DEPENDS} RUN_DEPENDS+= ${PERL_DEPENDS} PLIST_SUB+= PERL:="" -.endif - -.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ - && !defined(WITHOUT_GNOME)) -LIB_DEPENDS+= gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs -PLIST_SUB+= GNOME:="" .else -PLIST_SUB+= GNOME:="@comment " -.endif - -.if !defined(WITH_PERL) +CONFIGURE_ARGS= --disable-perl +PLIST_SUB+= PERL:="@comment " pre-fetch: @${ECHO} -n "If you want to compile with perl support use " @${ECHO} "'make -DWITH_PERL' instead" .endif +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +.endif + post-install: ${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin @${CAT} ${PKGDIR}/MESSAGE -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index a9a05d862073..1272d291e5ec 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -17,60 +17,52 @@ MAINTAINER= vanilla@FreeBSD.org LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config SHLIBVER?= ${PORTVERSION:S/1.//g} USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes +USE_GTK= yes +WANT_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore PLIST_SUB= SHLIBVER="${SHLIBVER}" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= gimp.1 gimptool.1 gimp-remote.1 MAN5= gimprc.5 -.if !defined(WITH_PERL) -CONFIGURE_ARGS= --disable-perl -PLIST_SUB+= PERL:="@comment " -.else +.if defined(WITH_PERL) PERL_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent BUILD_DEPENDS+= ${PERL_DEPENDS} RUN_DEPENDS+= ${PERL_DEPENDS} PLIST_SUB+= PERL:="" -.endif - -.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ - && !defined(WITHOUT_GNOME)) -LIB_DEPENDS+= gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs -PLIST_SUB+= GNOME:="" .else -PLIST_SUB+= GNOME:="@comment " -.endif - -.if !defined(WITH_PERL) +CONFIGURE_ARGS= --disable-perl +PLIST_SUB+= PERL:="@comment " pre-fetch: @${ECHO} -n "If you want to compile with perl support use " @${ECHO} "'make -DWITH_PERL' instead" .endif +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +.endif + post-install: ${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin @${CAT} ${PKGDIR}/MESSAGE -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile index a9a05d862073..1272d291e5ec 100644 --- a/graphics/gimp1/Makefile +++ b/graphics/gimp1/Makefile @@ -17,60 +17,52 @@ MAINTAINER= vanilla@FreeBSD.org LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config SHLIBVER?= ${PORTVERSION:S/1.//g} USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes +USE_GTK= yes +WANT_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore PLIST_SUB= SHLIBVER="${SHLIBVER}" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= gimp.1 gimptool.1 gimp-remote.1 MAN5= gimprc.5 -.if !defined(WITH_PERL) -CONFIGURE_ARGS= --disable-perl -PLIST_SUB+= PERL:="@comment " -.else +.if defined(WITH_PERL) PERL_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent BUILD_DEPENDS+= ${PERL_DEPENDS} RUN_DEPENDS+= ${PERL_DEPENDS} PLIST_SUB+= PERL:="" -.endif - -.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ - && !defined(WITHOUT_GNOME)) -LIB_DEPENDS+= gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs -PLIST_SUB+= GNOME:="" .else -PLIST_SUB+= GNOME:="@comment " -.endif - -.if !defined(WITH_PERL) +CONFIGURE_ARGS= --disable-perl +PLIST_SUB+= PERL:="@comment " pre-fetch: @${ECHO} -n "If you want to compile with perl support use " @${ECHO} "'make -DWITH_PERL' instead" .endif +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +.endif + post-install: ${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin @${CAT} ${PKGDIR}/MESSAGE -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile index a9a05d862073..1272d291e5ec 100644 --- a/graphics/gimpshop/Makefile +++ b/graphics/gimpshop/Makefile @@ -17,60 +17,52 @@ MAINTAINER= vanilla@FreeBSD.org LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config SHLIBVER?= ${PORTVERSION:S/1.//g} USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes +USE_GTK= yes +WANT_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore PLIST_SUB= SHLIBVER="${SHLIBVER}" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= gimp.1 gimptool.1 gimp-remote.1 MAN5= gimprc.5 -.if !defined(WITH_PERL) -CONFIGURE_ARGS= --disable-perl -PLIST_SUB+= PERL:="@comment " -.else +.if defined(WITH_PERL) PERL_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent BUILD_DEPENDS+= ${PERL_DEPENDS} RUN_DEPENDS+= ${PERL_DEPENDS} PLIST_SUB+= PERL:="" -.endif - -.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ - && !defined(WITHOUT_GNOME)) -LIB_DEPENDS+= gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs -PLIST_SUB+= GNOME:="" .else -PLIST_SUB+= GNOME:="@comment " -.endif - -.if !defined(WITH_PERL) +CONFIGURE_ARGS= --disable-perl +PLIST_SUB+= PERL:="@comment " pre-fetch: @${ECHO} -n "If you want to compile with perl support use " @${ECHO} "'make -DWITH_PERL' instead" .endif +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +.endif + post-install: ${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin @${CAT} ${PKGDIR}/MESSAGE -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index 480e705f4e57..fc46500a6084 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -13,21 +13,33 @@ DISTNAME= Giram-${PORTVERSION} MAINTAINER= bfoz@glue.umd.edu -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray31 -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - +USE_X_PREFIX= yes USE_MESA= yes USE_GMAKE= yes +USE_GTK= yes +WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-gnome + +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +.else +CONFIGURE_ARGS+=--disable-gnome +.endif + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure post-install: @${MKDIR} ${PREFIX}/share/doc/giram/SampleScenes ${INSTALL_DATA} ${WRKSRC}/SampleScenes/* ${PREFIX}/share/doc/giram/SampleScenes/ -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/giram/files/patch-ac b/graphics/giram/files/patch-ac new file mode 100644 index 000000000000..cff3172ef611 --- /dev/null +++ b/graphics/giram/files/patch-ac @@ -0,0 +1,11 @@ +--- docs/Makefile.in.orig Mon Mar 6 00:33:01 2000 ++++ docs/Makefile.in Mon Mar 6 00:35:17 2000 +@@ -88,7 +88,7 @@ + helpfilepath = @helpfilepath@ + l = @l@ + +-docsdir = @helpfilepath@ ++docsdir = @prefix@/share/doc/giram + + docs_DATA = Tutorial + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile index 7c7275cf5f97..b13152b4e21a 100644 --- a/graphics/gqview/Makefile +++ b/graphics/gqview/Makefile @@ -13,16 +13,26 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_IMLIB= yes +WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --without-gnome --disable-imlibtest --disable-gtktest + +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +.else +CONFIGURE_ENV+= GNOME_CONFIG=no +.endif + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|GNOME_DATADIR\)/gnome/|GNOME_DATADIR\)/|g' post-install: .if !defined(NOPORTDOCS) @@ -30,4 +40,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gqview .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/gqview/pkg-plist b/graphics/gqview/pkg-plist index 67acecb3a462..487d31fe6b2f 100644 --- a/graphics/gqview/pkg-plist +++ b/graphics/gqview/pkg-plist @@ -1,5 +1,7 @@ bin/gqview share/doc/gqview/README +%%GNOME:%%share/gnome/apps/Graphics/gqview.desktop +%%GNOME:%%share/gnome/pixmaps/gqview.png share/locale/de/LC_MESSAGES/gqview.mo share/locale/es/LC_MESSAGES/gqview.mo share/locale/fr/LC_MESSAGES/gqview.mo diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile index d7734f2d33fb..f74895dd4348 100644 --- a/irc/bitchx/Makefile +++ b/irc/bitchx/Makefile @@ -13,71 +13,62 @@ MASTER_SITES= ftp://ftp.bitchx.com/pub/BitchX/source/ \ MAINTAINER= cj@vallcom.net -.if defined(WITH_GNOME) -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif - -.if defined(WITH_TCL) -BUILD_DEPENDS= ${LOCALBASE}/include/tcl8.3/tcl.h:${PORTSDIR}/lang/tcl83 -.endif - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config WRKSRC= ${WRKDIR}/BitchX + USE_AUTOCONF= yes USE_GMAKE= yes -.if defined(WITH_GNOME) -CONFIGURE_ARGS+= --with-gtk +WANT_ESOUND= yes +WANT_GNOME= yes +CONFIGURE_ARGS= --exec-prefix="${PREFIX}/share" \ + --bindir="${PREFIX}/bin" \ + --datadir="${PREFIX}/share" \ + --libdir="${PREFIX}/share" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L{LOCALBASE}/lib" + +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--with-gtk .else -CONFIGURE_ARGS+= --without-gtk +CONFIGURE_ARGS+=--without-gtk .endif -.if defined(WITH_TCL) -CONFIGURE_ARGS+= --with-tcl \ - --with-tcl-includes="${PREFIX}/include/tcl8.3" \ - --with-tcl-libs="${PREFIX}/lib" +.if defined(HAVE_ESOUND) +USE_ESOUND= yes +CONFIGURE_ARGS+=--enable-sound .endif -.if defined(WITH_ESD) -CONFIGURE_ARGS+= --enable-sound + +.if defined(WITH_TCL) +BUILD_DEPENDS+= ${LOCALBASE}/include/tcl8.3/tcl.h:${PORTSDIR}/lang/tcl83 +CONFIGURE_ARGS+=--with-tcl \ + --with-tcl-includes=/usr/local/include/tcl8.3 \ + --with-tcl-libs=/usr/local/lib +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3" +post-extract: + @uudecode -p ${FILESDIR}/tcl-freebsd.o.uu > ${WRKSRC}/source/tcl.o .endif + .if defined(WITH_PLUGINS) -CONFIGURE_ARGS+= --with-plugins=pkga,possum,encrypt,hint,abot,acro,amp,blowfish,scan,wavplay,qmail,fserv,nap,qbx +CONFIGURE_ARGS+=--with-plugins=pkga,possum,encrypt,hint,abot,acro,amp,blowfish,scan,wavplay,qmail,fserv,nap,qbx +PLIST_SUB+= PLUGINS:="" .else -CONFIGURE_ARGS+= --without-plugins +CONFIGURE_ARGS+=--without-plugins +PLIST_SUB+= PLUGINS:="@comment " .endif -CONFIGURE_ARGS+= --exec-prefix="${PREFIX}/share" \ - --bindir="${PREFIX}/bin" \ - --datadir="${PREFIX}/share" \ - --libdir="${PREFIX}/share" -.if defined(WITH_TCL) -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3" -.else -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" +.if defined(WITH_LATIN) +pre-patch: + @${PERL} -pi -e "s!#undef LATIN1!#define LATIN1!" ${WRKSRC}/include/config.h .endif -CONFIGURE_ENV+= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" - -MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_DATA="${INSTALL_DATA}" pre-extract: @${ECHO} "Available switches:" @${ECHO} "-------------------" - @${ECHO} "WITH_GNOME - Build GTK BitchX" - @${ECHO} "WITH_ESD - Build GTK BitchX with ESD sound support" @${ECHO} "WITH_PLUGINS - Build the plugins" @${ECHO} "WITH_LATIN - Recommended if you are using an ISO-8859-1 display" @${ECHO} "WITH_TCL - Build BitchX with TCL scripting" -.if defined(WITH_TCL) -post-extract: - @uudecode -p ${FILESDIR}/tcl-freebsd.o.uu > ${WRKSRC}/source/tcl.o -.endif - -.if defined(WITH_LATIN) -pre-patch: - @${PERL} -pi -e "s!#undef LATIN1!#define LATIN1!" ${WRKSRC}/include/config.h -.endif post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/bx/help @@ -87,36 +78,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/bxfaq.html ${PREFIX}/share/doc/bitchx .endif -.if defined(WITH_PLUGINS) - @${ECHO} share/bx/plugins/BitchX.hints >> ${TMPPLIST} - @${ECHO} share/bx/plugins/acro.so >> ${TMPPLIST} - @${ECHO} share/bx/plugins/amp.so >> ${TMPPLIST} - @${ECHO} share/bx/plugins/autobot.so >> ${TMPPLIST} - @${ECHO} share/bx/plugins/blowfish.so >> ${TMPPLIST} - @${ECHO} share/bx/plugins/encrypt.so >> ${TMPPLIST} - @${ECHO} share/bx/plugins/fserv.so >> ${TMPPLIST} - @${ECHO} share/bx/plugins/hint.so >> ${TMPPLIST} - @${ECHO} share/bx/plugins/nap.so >> ${TMPPLIST} - @${ECHO} share/bx/plugins/pkga.so >> ${TMPPLIST} - @${ECHO} share/bx/plugins/possum.so >> ${TMPPLIST} - @${ECHO} share/bx/plugins/qmail.so >> ${TMPPLIST} - @${ECHO} share/bx/plugins/scan.so >> ${TMPPLIST} - @${ECHO} share/bx/plugins/wavplay.so >> ${TMPPLIST} - @${ECHO} share/bx/plugins/qbx.so >> ${TMPPLIST} - @${ECHO} @dirrm share/bx/plugins >> ${TMPPLIST} -.endif -.if defined(WITH_GNOME) - @${ECHO} bin/gtkBitchX >> ${TMPPLIST} - @${ECHO} bin/gtkBitchX-1.0c17 >> ${TMPPLIST} -.else - @${ECHO} bin/BitchX >> ${TMPPLIST} - @${ECHO} bin/BitchX-1.0c17 >> ${TMPPLIST} - @${ECHO} bin/scr-bx >> ${TMPPLIST} - @${ECHO} share/bx/wserv >> ${TMPPLIST} -.endif - @${ECHO} @dirrm share/bx/help >> ${TMPPLIST} - @${ECHO} @dirrm share/bx/script >> ${TMPPLIST} - @${ECHO} @dirrm share/bx/translation >> ${TMPPLIST} - @${ECHO} @dirrm share/bx >> ${TMPPLIST} - -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/irc/bitchx/files/patch-ag b/irc/bitchx/files/patch-ag index 1868a7405c07..2d65fcf13bfa 100644 --- a/irc/bitchx/files/patch-ag +++ b/irc/bitchx/files/patch-ag @@ -1,21 +1,22 @@ -*** Makefile.in.orig Sun Jan 23 03:30:33 2000 ---- Makefile.in Sun Jan 23 03:30:56 2000 -*************** -*** 90,97 **** - - # This command will be used to install the BitchX help files. If you don't - # want to install them, replace with the following: -! # INSTALL_HELP_CMD = @echo The help files have not been installed. -! INSTALL_HELP_CMD = cp -pr $(srcdir)/bitchx-docs/* $(HELPDIR) - - # This program allows you to use screen/xterm's to put new BitchX windows - # on new screen/xterm windows. ---- 90,97 ---- - - # This command will be used to install the BitchX help files. If you don't - # want to install them, replace with the following: -! INSTALL_HELP_CMD = @echo -! # INSTALL_HELP_CMD = cp -pr $(srcdir)/bitchx-docs/* $(HELPDIR) - - # This program allows you to use screen/xterm's to put new BitchX windows - # on new screen/xterm windows. +--- Makefile.in.orig Sun Jan 9 02:11:01 2000 ++++ Makefile.in Sat Sep 9 01:24:46 2000 +@@ -43,7 +43,7 @@ + IRCLIB = @IRCLIB@ + + CC = @CC@ +-DEFS = -I$$(srcdir)/../include -I$(topdir)/include ++DEFS = -I$$(srcdir)/../include -I$(topdir)/include -I. -I- + LIBS = @LIBS@ + INCLUDES = @INCLUDES@ + +@@ -90,8 +90,8 @@ + + # This command will be used to install the BitchX help files. If you don't + # want to install them, replace with the following: +-# INSTALL_HELP_CMD = @echo The help files have not been installed. +-INSTALL_HELP_CMD = cp -pr $(srcdir)/bitchx-docs/* $(HELPDIR) ++INSTALL_HELP_CMD = @echo ++# INSTALL_HELP_CMD = cp -pr $(srcdir)/bitchx-docs/* $(HELPDIR) + + # This program allows you to use screen/xterm's to put new BitchX windows + # on new screen/xterm windows. diff --git a/irc/bitchx/pkg-plist b/irc/bitchx/pkg-plist index 16e55977c1c5..4170d9e5f18e 100644 --- a/irc/bitchx/pkg-plist +++ b/irc/bitchx/pkg-plist @@ -1,133 +1,139 @@ -share/bx/BitchX.quit +%%NOGNOME:%%bin/BitchX +%%NOGNOME:%%bin/BitchX-1.0c17 +%%GNOME:%%bin/gtkBitchX +%%GNOME:%%bin/gtkBitchX-1.0c17 +%%NOGNOME:%%bin/scr-bx +share/bx/BitchX.help share/bx/BitchX.ircnames +share/bx/BitchX.quit share/bx/BitchX.reasons -share/bx/BitchX.help -share/bx/help/1_General/l +share/bx/help/1_General/1_General +share/bx/help/1_General/4op +share/bx/help/1_General/about +share/bx/help/1_General/addforward +share/bx/help/1_General/addidle +share/bx/help/1_General/addlamenick +share/bx/help/1_General/addnoflood +share/bx/help/1_General/addshit share/bx/help/1_General/adduser +share/bx/help/1_General/addword +share/bx/help/1_General/ajoin +share/bx/help/1_General/ajoinlist share/bx/help/1_General/away +share/bx/help/1_General/awaylog +share/bx/help/1_General/awaymsg +share/bx/help/1_General/b +share/bx/help/1_General/back +share/bx/help/1_General/ban +share/bx/help/1_General/banstat +share/bx/help/1_General/bantype +share/bx/help/1_General/banwords +share/bx/help/1_General/bk +share/bx/help/1_General/bki share/bx/help/1_General/bye share/bx/help/1_General/channel +share/bx/help/1_General/chat +share/bx/help/1_General/ctcp/action +share/bx/help/1_General/ctcp/bdcc +share/bx/help/1_General/ctcp/cdcc +share/bx/help/1_General/ctcp/clientinfo +share/bx/help/1_General/ctcp/ctcp +share/bx/help/1_General/ctcp/echo +share/bx/help/1_General/ctcp/finger +share/bx/help/1_General/ctcp/ident +share/bx/help/1_General/ctcp/invite +share/bx/help/1_General/ctcp/op +share/bx/help/1_General/ctcp/ops +share/bx/help/1_General/ctcp/ping +share/bx/help/1_General/ctcp/time +share/bx/help/1_General/ctcp/unban +share/bx/help/1_General/ctcp/uptime +share/bx/help/1_General/ctcp/userinfo +share/bx/help/1_General/ctcp/utc +share/bx/help/1_General/ctcp/version +share/bx/help/1_General/ctcp/whoami +share/bx/help/1_General/ctcp/xdcc +share/bx/help/1_General/dcc/activecount +share/bx/help/1_General/dcc/autoget +share/bx/help/1_General/dcc/autooverwrite +share/bx/help/1_General/dcc/autorename +share/bx/help/1_General/dcc/bot +share/bx/help/1_General/dcc/chat +share/bx/help/1_General/dcc/close +share/bx/help/1_General/dcc/closeall +share/bx/help/1_General/dcc/dcc +share/bx/help/1_General/dcc/exempt +share/bx/help/1_General/dcc/ftp +share/bx/help/1_General/dcc/get +share/bx/help/1_General/dcc/list +share/bx/help/1_General/dcc/quietmode +share/bx/help/1_General/dcc/raw +share/bx/help/1_General/dcc/reget +share/bx/help/1_General/dcc/rename +share/bx/help/1_General/dcc/resend +share/bx/help/1_General/dcc/resume +share/bx/help/1_General/dcc/send +share/bx/help/1_General/dcc/showpaths +share/bx/help/1_General/dcc/stats +share/bx/help/1_General/dcc/tget +share/bx/help/1_General/dcc/treget +share/bx/help/1_General/dcc/tresend +share/bx/help/1_General/dcc/tsend share/bx/help/1_General/describe share/bx/help/1_General/disconnect +share/bx/help/1_General/gone share/bx/help/1_General/help share/bx/help/1_General/ignore share/bx/help/1_General/invite +share/bx/help/1_General/j share/bx/help/1_General/join +share/bx/help/1_General/k +share/bx/help/1_General/kb +share/bx/help/1_General/kbi share/bx/help/1_General/kick +share/bx/help/1_General/kickidle +share/bx/help/1_General/l +share/bx/help/1_General/lamenicklist share/bx/help/1_General/lastlog +share/bx/help/1_General/leave +share/bx/help/1_General/m share/bx/help/1_General/me share/bx/help/1_General/mode share/bx/help/1_General/msg share/bx/help/1_General/nick +share/bx/help/1_General/nochat share/bx/help/1_General/noforward share/bx/help/1_General/notice share/bx/help/1_General/notify share/bx/help/1_General/nslookup +share/bx/help/1_General/offers +share/bx/help/1_General/p share/bx/help/1_General/part +share/bx/help/1_General/partall share/bx/help/1_General/ping share/bx/help/1_General/query share/bx/help/1_General/quit share/bx/help/1_General/reconnect share/bx/help/1_General/say share/bx/help/1_General/server -share/bx/help/1_General/url +share/bx/help/1_General/shitlist +share/bx/help/1_General/showwordkick share/bx/help/1_General/silence share/bx/help/1_General/spam +share/bx/help/1_General/t share/bx/help/1_General/topic +share/bx/help/1_General/unajoin share/bx/help/1_General/unforward share/bx/help/1_General/unidle -share/bx/help/1_General/unuser -share/bx/help/1_General/1_General -share/bx/help/1_General/4op -share/bx/help/1_General/about -share/bx/help/1_General/addforward -share/bx/help/1_General/addidle -share/bx/help/1_General/uping -share/bx/help/1_General/offers -share/bx/help/1_General/k -share/bx/help/1_General/ver -share/bx/help/1_General/j -share/bx/help/1_General/kb -share/bx/help/1_General/kbi -share/bx/help/1_General/kickidle -share/bx/help/1_General/m -share/bx/help/1_General/chat -share/bx/help/1_General/addshit -share/bx/help/1_General/nochat -share/bx/help/1_General/addlamenick -share/bx/help/1_General/lamenicklist share/bx/help/1_General/unlamenick share/bx/help/1_General/unshit -share/bx/help/1_General/shitlist -share/bx/help/1_General/addword +share/bx/help/1_General/unuser share/bx/help/1_General/unwordkick -share/bx/help/1_General/bki -share/bx/help/1_General/ajoin -share/bx/help/1_General/ajoinlist -share/bx/help/1_General/unajoin -share/bx/help/1_General/ban -share/bx/help/1_General/showwordkick -share/bx/help/1_General/banstat -share/bx/help/1_General/bantype -share/bx/help/1_General/banwords -share/bx/help/1_General/b -share/bx/help/1_General/bk -share/bx/help/1_General/awaylog -share/bx/help/1_General/awaymsg -share/bx/help/1_General/gone -share/bx/help/1_General/back -share/bx/help/1_General/partall -share/bx/help/1_General/leave -share/bx/help/1_General/p -share/bx/help/1_General/t +share/bx/help/1_General/uping +share/bx/help/1_General/url +share/bx/help/1_General/ver share/bx/help/1_General/wordlist -share/bx/help/1_General/addnoflood -share/bx/help/1_General/dcc/close -share/bx/help/1_General/dcc/closeall -share/bx/help/1_General/dcc/dcc -share/bx/help/1_General/dcc/get -share/bx/help/1_General/dcc/list -share/bx/help/1_General/dcc/raw -share/bx/help/1_General/dcc/rename -share/bx/help/1_General/dcc/resume -share/bx/help/1_General/dcc/chat -share/bx/help/1_General/dcc/send -share/bx/help/1_General/dcc/resend -share/bx/help/1_General/dcc/reget -share/bx/help/1_General/dcc/tsend -share/bx/help/1_General/dcc/tresend -share/bx/help/1_General/dcc/tget -share/bx/help/1_General/dcc/treget -share/bx/help/1_General/dcc/ftp -share/bx/help/1_General/dcc/activecount -share/bx/help/1_General/dcc/quietmode -share/bx/help/1_General/dcc/showpaths -share/bx/help/1_General/dcc/autorename -share/bx/help/1_General/dcc/autooverwrite -share/bx/help/1_General/dcc/autoget -share/bx/help/1_General/dcc/stats -share/bx/help/1_General/dcc/exempt -share/bx/help/1_General/dcc/bot -share/bx/help/1_General/ctcp/bdcc -share/bx/help/1_General/ctcp/cdcc -share/bx/help/1_General/ctcp/clientinfo -share/bx/help/1_General/ctcp/ctcp -share/bx/help/1_General/ctcp/echo -share/bx/help/1_General/ctcp/finger -share/bx/help/1_General/ctcp/ident -share/bx/help/1_General/ctcp/invite -share/bx/help/1_General/ctcp/op -share/bx/help/1_General/ctcp/ops -share/bx/help/1_General/ctcp/ping -share/bx/help/1_General/ctcp/time -share/bx/help/1_General/ctcp/unban -share/bx/help/1_General/ctcp/uptime -share/bx/help/1_General/ctcp/userinfo -share/bx/help/1_General/ctcp/utc -share/bx/help/1_General/ctcp/version -share/bx/help/1_General/ctcp/whoami -share/bx/help/1_General/ctcp/action -share/bx/help/1_General/ctcp/xdcc +share/bx/help/2_Queries/2_Queries share/bx/help/2_Queries/admin share/bx/help/2_Queries/flush share/bx/help/2_Queries/info @@ -137,7 +143,16 @@ share/bx/help/2_Queries/list share/bx/help/2_Queries/lusers share/bx/help/2_Queries/map share/bx/help/2_Queries/motd +share/bx/help/2_Queries/n share/bx/help/2_Queries/names +share/bx/help/2_Queries/sc +share/bx/help/2_Queries/scan +share/bx/help/2_Queries/scanf +share/bx/help/2_Queries/scani +share/bx/help/2_Queries/scann +share/bx/help/2_Queries/scano +share/bx/help/2_Queries/scans +share/bx/help/2_Queries/scanv share/bx/help/2_Queries/stats share/bx/help/2_Queries/time share/bx/help/2_Queries/trace @@ -147,46 +162,40 @@ share/bx/help/2_Queries/users share/bx/help/2_Queries/version share/bx/help/2_Queries/who share/bx/help/2_Queries/whois -share/bx/help/2_Queries/2_Queries share/bx/help/2_Queries/whowas +share/bx/help/2_Queries/wi share/bx/help/2_Queries/wii -share/bx/help/2_Queries/ww share/bx/help/2_Queries/wilc +share/bx/help/2_Queries/wilcr share/bx/help/2_Queries/wilm share/bx/help/2_Queries/wiln -share/bx/help/2_Queries/wilcr -share/bx/help/2_Queries/sc -share/bx/help/2_Queries/n -share/bx/help/2_Queries/scan -share/bx/help/2_Queries/wi -share/bx/help/2_Queries/scani -share/bx/help/2_Queries/scanv -share/bx/help/2_Queries/scano -share/bx/help/2_Queries/scann -share/bx/help/2_Queries/scanf -share/bx/help/2_Queries/scans +share/bx/help/2_Queries/ww +share/bx/help/3_Operators/3_Operators share/bx/help/3_Operators/connect +share/bx/help/3_Operators/deoper share/bx/help/3_Operators/die +share/bx/help/3_Operators/dline share/bx/help/3_Operators/hash +share/bx/help/3_Operators/helpop +share/bx/help/3_Operators/helpserv share/bx/help/3_Operators/kill +share/bx/help/3_Operators/kline +share/bx/help/3_Operators/locop share/bx/help/3_Operators/oper share/bx/help/3_Operators/rehash share/bx/help/3_Operators/restart share/bx/help/3_Operators/rping -share/bx/help/3_Operators/squit -share/bx/help/3_Operators/uping -share/bx/help/3_Operators/3_Operators -share/bx/help/3_Operators/wallops share/bx/help/3_Operators/sping -share/bx/help/3_Operators/dline +share/bx/help/3_Operators/squit share/bx/help/3_Operators/swallop -share/bx/help/3_Operators/locop -share/bx/help/3_Operators/deoper share/bx/help/3_Operators/tkline share/bx/help/3_Operators/unkline -share/bx/help/3_Operators/kline -share/bx/help/3_Operators/helpserv -share/bx/help/3_Operators/helpop +share/bx/help/3_Operators/uping +share/bx/help/3_Operators/wallops +share/bx/help/4_Misc/4_Misc +share/bx/help/4_Misc/abort +share/bx/help/4_Misc/beep +share/bx/help/4_Misc/bind/backspace share/bx/help/4_Misc/bind/backward_character share/bx/help/4_Misc/bind/backward_history share/bx/help/4_Misc/bind/backward_word @@ -205,8 +214,8 @@ share/bx/help/4_Misc/bind/enter_digraph share/bx/help/4_Misc/bind/enter_menu share/bx/help/4_Misc/bind/erase_line share/bx/help/4_Misc/bind/erase_to_beg_of_line -share/bx/help/4_Misc/bind/forward_character share/bx/help/4_Misc/bind/erase_to_end_of_line +share/bx/help/4_Misc/bind/forward_character share/bx/help/4_Misc/bind/forward_history share/bx/help/4_Misc/bind/forward_word share/bx/help/4_Misc/bind/highlight_off @@ -230,7 +239,6 @@ share/bx/help/4_Misc/bind/self_insert share/bx/help/4_Misc/bind/send_line share/bx/help/4_Misc/bind/shove_to_history share/bx/help/4_Misc/bind/stop_irc -share/bx/help/4_Misc/bind/type_text share/bx/help/4_Misc/bind/swap_last_window share/bx/help/4_Misc/bind/swap_next_window share/bx/help/4_Misc/bind/swap_previous_window @@ -238,11 +246,25 @@ share/bx/help/4_Misc/bind/switch_channels share/bx/help/4_Misc/bind/toggle_insert_mode share/bx/help/4_Misc/bind/toggle_stop_screen share/bx/help/4_Misc/bind/transpose_characters +share/bx/help/4_Misc/bind/type_text share/bx/help/4_Misc/bind/unclear_screen share/bx/help/4_Misc/bind/underline share/bx/help/4_Misc/bind/unstop_all_windows -share/bx/help/4_Misc/bind/backspace share/bx/help/4_Misc/bind/yank_from_cutbuffer +share/bx/help/4_Misc/cd +share/bx/help/4_Misc/clear +share/bx/help/4_Misc/digraph +share/bx/help/4_Misc/encrypt +share/bx/help/4_Misc/history +share/bx/help/4_Misc/hostname +share/bx/help/4_Misc/ircuser +share/bx/help/4_Misc/mesg +share/bx/help/4_Misc/mlist +share/bx/help/4_Misc/mload +share/bx/help/4_Misc/note +share/bx/help/4_Misc/rbind +share/bx/help/4_Misc/realname +share/bx/help/4_Misc/set/always_split_biggest share/bx/help/4_Misc/set/auto_new_nick share/bx/help/4_Misc/set/auto_reconnect_delay share/bx/help/4_Misc/set/auto_rejoin @@ -285,7 +307,6 @@ share/bx/help/4_Misc/set/eight_bit_characters share/bx/help/4_Misc/set/encrypt_program share/bx/help/4_Misc/set/floating_point_math share/bx/help/4_Misc/set/flood_after -share/bx/help/4_Misc/set/history share/bx/help/4_Misc/set/flood_rate share/bx/help/4_Misc/set/flood_users share/bx/help/4_Misc/set/flood_warning @@ -295,8 +316,9 @@ share/bx/help/4_Misc/set/help_path share/bx/help/4_Misc/set/help_prompt share/bx/help/4_Misc/set/help_window share/bx/help/4_Misc/set/hide_private_channels -share/bx/help/4_Misc/set/highlight_char share/bx/help/4_Misc/set/high_bit_escape +share/bx/help/4_Misc/set/highlight_char +share/bx/help/4_Misc/set/history share/bx/help/4_Misc/set/history_file share/bx/help/4_Misc/set/hold_mode share/bx/help/4_Misc/set/indent @@ -315,30 +337,29 @@ share/bx/help/4_Misc/set/menu share/bx/help/4_Misc/set/mirc_broken_dcc_resume share/bx/help/4_Misc/set/mode_stripper share/bx/help/4_Misc/set/nd_space_max +share/bx/help/4_Misc/set/no_control_log +share/bx/help/4_Misc/set/no_ctcp_flood +share/bx/help/4_Misc/set/no_fail_disconnect share/bx/help/4_Misc/set/notify_handler share/bx/help/4_Misc/set/notify_interval share/bx/help/4_Misc/set/notify_level share/bx/help/4_Misc/set/notify_on_termination share/bx/help/4_Misc/set/notify_userhost_automatic share/bx/help/4_Misc/set/novice -share/bx/help/4_Misc/set/no_control_log -share/bx/help/4_Misc/set/no_ctcp_flood -share/bx/help/4_Misc/set/no_fail_disconnect share/bx/help/4_Misc/set/num_of_whowas share/bx/help/4_Misc/set/pad_char share/bx/help/4_Misc/set/quit_message share/bx/help/4_Misc/set/realname share/bx/help/4_Misc/set/reverse_status_line -share/bx/help/4_Misc/set/set -share/bx/help/4_Misc/set/scroll share/bx/help/4_Misc/set/reverse_video share/bx/help/4_Misc/set/screen_options +share/bx/help/4_Misc/set/scroll +share/bx/help/4_Misc/set/scroll_lines share/bx/help/4_Misc/set/scrollback -share/bx/help/4_Misc/set/tab share/bx/help/4_Misc/set/scrollback_ratio -share/bx/help/4_Misc/set/scroll_lines share/bx/help/4_Misc/set/security share/bx/help/4_Misc/set/send_ignore_msg +share/bx/help/4_Misc/set/set share/bx/help/4_Misc/set/shell share/bx/help/4_Misc/set/shell_flags share/bx/help/4_Misc/set/shell_limit @@ -352,8 +373,6 @@ share/bx/help/4_Misc/set/status_away share/bx/help/4_Misc/set/status_channel share/bx/help/4_Misc/set/status_chanop share/bx/help/4_Misc/set/status_clock -share/bx/help/4_Misc/set/tab_max -share/bx/help/4_Misc/set/xterm share/bx/help/4_Misc/set/status_does_expandos share/bx/help/4_Misc/set/status_format share/bx/help/4_Misc/set/status_hold @@ -362,8 +381,8 @@ share/bx/help/4_Misc/set/status_insert share/bx/help/4_Misc/set/status_mail share/bx/help/4_Misc/set/status_mode share/bx/help/4_Misc/set/status_nick -share/bx/help/4_Misc/set/status_notify share/bx/help/4_Misc/set/status_no_repeat +share/bx/help/4_Misc/set/status_notify share/bx/help/4_Misc/set/status_oper share/bx/help/4_Misc/set/status_overwrite share/bx/help/4_Misc/set/status_query @@ -374,14 +393,20 @@ share/bx/help/4_Misc/set/status_umode share/bx/help/4_Misc/set/status_user share/bx/help/4_Misc/set/status_voice share/bx/help/4_Misc/set/status_window -share/bx/help/4_Misc/set/underline_video share/bx/help/4_Misc/set/suppress_from_remote_server share/bx/help/4_Misc/set/suppress_server_motd +share/bx/help/4_Misc/set/tab +share/bx/help/4_Misc/set/tab_max +share/bx/help/4_Misc/set/underline_video share/bx/help/4_Misc/set/user_information share/bx/help/4_Misc/set/verbose_ctcp share/bx/help/4_Misc/set/warn_of_ignores -share/bx/help/4_Misc/set/always_split_biggest +share/bx/help/4_Misc/set/xterm share/bx/help/4_Misc/set/xterm_options +share/bx/help/4_Misc/summon +share/bx/help/4_Misc/unclear +share/bx/help/4_Misc/which +share/bx/help/4_Misc/window/add share/bx/help/4_Misc/window/back share/bx/help/4_Misc/window/balance share/bx/help/4_Misc/window/beep_always @@ -400,8 +425,8 @@ share/bx/help/4_Misc/window/hide share/bx/help/4_Misc/window/hide_others share/bx/help/4_Misc/window/hold_mode share/bx/help/4_Misc/window/kill -share/bx/help/4_Misc/window/killswap share/bx/help/4_Misc/window/kill_others +share/bx/help/4_Misc/window/killswap share/bx/help/4_Misc/window/last share/bx/help/4_Misc/window/lastlog share/bx/help/4_Misc/window/lastlog_level @@ -437,27 +462,37 @@ share/bx/help/4_Misc/window/stack share/bx/help/4_Misc/window/status_special share/bx/help/4_Misc/window/swap share/bx/help/4_Misc/window/unbind -share/bx/help/4_Misc/window/add share/bx/help/4_Misc/window/window -share/bx/help/4_Misc/history -share/bx/help/4_Misc/hostname -share/bx/help/4_Misc/4_Misc -share/bx/help/4_Misc/mesg -share/bx/help/4_Misc/mlist -share/bx/help/4_Misc/mload -share/bx/help/4_Misc/note -share/bx/help/4_Misc/rbind -share/bx/help/4_Misc/realname -share/bx/help/4_Misc/summon -share/bx/help/4_Misc/unclear -share/bx/help/4_Misc/which -share/bx/help/4_Misc/ircuser -share/bx/help/4_Misc/abort -share/bx/help/4_Misc/beep -share/bx/help/4_Misc/cd -share/bx/help/4_Misc/clear -share/bx/help/4_Misc/digraph -share/bx/help/4_Misc/encrypt +share/bx/help/5_Programming/5_Programming +share/bx/help/5_Programming/alias +share/bx/help/5_Programming/assign +share/bx/help/5_Programming/blah +share/bx/help/5_Programming/bless +share/bx/help/5_Programming/break +share/bx/help/5_Programming/call +share/bx/help/5_Programming/comment +share/bx/help/5_Programming/continue +share/bx/help/5_Programming/do +share/bx/help/5_Programming/dump +share/bx/help/5_Programming/echo +share/bx/help/5_Programming/eval +share/bx/help/5_Programming/exec +share/bx/help/5_Programming/fe +share/bx/help/5_Programming/fec +share/bx/help/5_Programming/filedialog +share/bx/help/5_Programming/fontdialog +share/bx/help/5_Programming/for +share/bx/help/5_Programming/foreach +share/bx/help/5_Programming/hook +share/bx/help/5_Programming/if +share/bx/help/5_Programming/input +share/bx/help/5_Programming/load +share/bx/help/5_Programming/loaddll +share/bx/help/5_Programming/loadtcl +share/bx/help/5_Programming/local +share/bx/help/5_Programming/menu +share/bx/help/5_Programming/menuitem +share/bx/help/5_Programming/on/action share/bx/help/5_Programming/on/channel_nick share/bx/help/5_Programming/on/channel_signoff share/bx/help/5_Programming/on/connect @@ -510,7 +545,6 @@ share/bx/help/5_Programming/on/public_notice share/bx/help/5_Programming/on/public_other share/bx/help/5_Programming/on/raw_irc share/bx/help/5_Programming/on/redirect -share/bx/help/5_Programming/on/set share/bx/help/5_Programming/on/send_action share/bx/help/5_Programming/on/send_ctcp share/bx/help/5_Programming/on/send_dcc_chat @@ -520,6 +554,7 @@ share/bx/help/5_Programming/on/send_public share/bx/help/5_Programming/on/send_to_server share/bx/help/5_Programming/on/server_lost share/bx/help/5_Programming/on/server_notice +share/bx/help/5_Programming/on/set share/bx/help/5_Programming/on/signoff share/bx/help/5_Programming/on/silence share/bx/help/5_Programming/on/status_update @@ -534,45 +569,22 @@ share/bx/help/5_Programming/on/window share/bx/help/5_Programming/on/window_create share/bx/help/5_Programming/on/window_kill share/bx/help/5_Programming/on/yell -share/bx/help/5_Programming/on/action -share/bx/help/5_Programming/blah -share/bx/help/5_Programming/bless -share/bx/help/5_Programming/break -share/bx/help/5_Programming/call -share/bx/help/5_Programming/comment -share/bx/help/5_Programming/continue -share/bx/help/5_Programming/do -share/bx/help/5_Programming/dump -share/bx/help/5_Programming/echo -share/bx/help/5_Programming/eval -share/bx/help/5_Programming/exec -share/bx/help/5_Programming/fe -share/bx/help/5_Programming/filedialog -share/bx/help/5_Programming/fontdialog -share/bx/help/5_Programming/for -share/bx/help/5_Programming/foreach -share/bx/help/5_Programming/hook -share/bx/help/5_Programming/if -share/bx/help/5_Programming/input -share/bx/help/5_Programming/load -share/bx/help/5_Programming/local -share/bx/help/5_Programming/menu -share/bx/help/5_Programming/menuitem share/bx/help/5_Programming/package share/bx/help/5_Programming/parsekey share/bx/help/5_Programming/pmpaste share/bx/help/5_Programming/pop -share/bx/help/5_Programming/pretend -share/bx/help/5_Programming/push share/bx/help/5_Programming/popupmenu share/bx/help/5_Programming/popupmsg +share/bx/help/5_Programming/pretend share/bx/help/5_Programming/properties +share/bx/help/5_Programming/push share/bx/help/5_Programming/queue share/bx/help/5_Programming/quote share/bx/help/5_Programming/redirect share/bx/help/5_Programming/repeat share/bx/help/5_Programming/return share/bx/help/5_Programming/save +share/bx/help/5_Programming/saveirc share/bx/help/5_Programming/send share/bx/help/5_Programming/sendline share/bx/help/5_Programming/setenv @@ -591,14 +603,8 @@ share/bx/help/5_Programming/wait share/bx/help/5_Programming/while share/bx/help/5_Programming/xecho share/bx/help/5_Programming/xeval -share/bx/help/5_Programming/5_Programming share/bx/help/5_Programming/xtype -share/bx/help/5_Programming/alias -share/bx/help/5_Programming/assign -share/bx/help/5_Programming/loadtcl -share/bx/help/5_Programming/saveirc -share/bx/help/5_Programming/loaddll -share/bx/help/5_Programming/fec +share/bx/help/6_Functions/6_Functions share/bx/help/6_Functions/absstrlen share/bx/help/6_Functions/addtabkey share/bx/help/6_Functions/after @@ -607,6 +613,7 @@ share/bx/help/6_Functions/ajoinitem share/bx/help/6_Functions/aliasctl share/bx/help/6_Functions/annoy share/bx/help/6_Functions/ascii +share/bx/help/6_Functions/before share/bx/help/6_Functions/bitchx share/bx/help/6_Functions/center share/bx/help/6_Functions/cexist @@ -616,6 +623,7 @@ share/bx/help/6_Functions/chmod share/bx/help/6_Functions/chngw share/bx/help/6_Functions/chop share/bx/help/6_Functions/chops +share/bx/help/6_Functions/chr share/bx/help/6_Functions/close share/bx/help/6_Functions/common share/bx/help/6_Functions/connect @@ -627,11 +635,11 @@ share/bx/help/6_Functions/crypt share/bx/help/6_Functions/curpos share/bx/help/6_Functions/currchans share/bx/help/6_Functions/decode -share/bx/help/6_Functions/eof share/bx/help/6_Functions/delarray share/bx/help/6_Functions/delitem share/bx/help/6_Functions/deuhc share/bx/help/6_Functions/encode +share/bx/help/6_Functions/eof share/bx/help/6_Functions/epic share/bx/help/6_Functions/fexist share/bx/help/6_Functions/filter @@ -648,6 +656,7 @@ share/bx/help/6_Functions/getgid share/bx/help/6_Functions/getitem share/bx/help/6_Functions/getlogin share/bx/help/6_Functions/getmatches +share/bx/help/6_Functions/getopt share/bx/help/6_Functions/getpgrp share/bx/help/6_Functions/getsets share/bx/help/6_Functions/gettmatch @@ -655,13 +664,14 @@ share/bx/help/6_Functions/getuid share/bx/help/6_Functions/glob share/bx/help/6_Functions/gui share/bx/help/6_Functions/idle +share/bx/help/6_Functions/ifindfirst share/bx/help/6_Functions/ifinditem share/bx/help/6_Functions/igetmatches share/bx/help/6_Functions/igmask -share/bx/help/6_Functions/info share/bx/help/6_Functions/igtype share/bx/help/6_Functions/index share/bx/help/6_Functions/indextoitem +share/bx/help/6_Functions/info share/bx/help/6_Functions/insertw share/bx/help/6_Functions/iptoname share/bx/help/6_Functions/irclib @@ -683,11 +693,13 @@ share/bx/help/6_Functions/lastserver share/bx/help/6_Functions/left share/bx/help/6_Functions/leftpc share/bx/help/6_Functions/leftw +share/bx/help/6_Functions/listarray share/bx/help/6_Functions/listen -share/bx/help/6_Functions/mid share/bx/help/6_Functions/mask share/bx/help/6_Functions/match share/bx/help/6_Functions/matchitem +share/bx/help/6_Functions/menucontrol +share/bx/help/6_Functions/mid share/bx/help/6_Functions/midw share/bx/help/6_Functions/mkdir share/bx/help/6_Functions/msar @@ -740,12 +752,14 @@ share/bx/help/6_Functions/split share/bx/help/6_Functions/srand share/bx/help/6_Functions/status share/bx/help/6_Functions/stime +share/bx/help/6_Functions/strchr share/bx/help/6_Functions/strftime share/bx/help/6_Functions/strip share/bx/help/6_Functions/stripansi share/bx/help/6_Functions/stripansicodes share/bx/help/6_Functions/stripc share/bx/help/6_Functions/strlen +share/bx/help/6_Functions/strrchr share/bx/help/6_Functions/substr share/bx/help/6_Functions/tdiff share/bx/help/6_Functions/time @@ -780,16 +794,8 @@ share/bx/help/6_Functions/winsize share/bx/help/6_Functions/winvisible share/bx/help/6_Functions/word share/bx/help/6_Functions/write -share/bx/help/6_Functions/6_Functions share/bx/help/6_Functions/writeb -share/bx/help/6_Functions/menucontrol -share/bx/help/6_Functions/before -share/bx/help/6_Functions/chr -share/bx/help/6_Functions/getopt -share/bx/help/6_Functions/ifindfirst -share/bx/help/6_Functions/listarray -share/bx/help/6_Functions/strchr -share/bx/help/6_Functions/strrchr +share/bx/help/7_Docs/7_Docs share/bx/help/7_Docs/About_BitchX share/bx/help/7_Docs/Arrays share/bx/help/7_Docs/Command_Line @@ -811,8 +817,8 @@ share/bx/help/7_Docs/Signals share/bx/help/7_Docs/Special_Vars share/bx/help/7_Docs/Status_Line share/bx/help/7_Docs/Text_Highlight -share/bx/help/7_Docs/7_Docs share/bx/help/7_Docs/Updates +share/bx/help/8_Scripts/2.8script share/bx/help/8_Scripts/8_Scripts share/bx/help/8_Scripts/action share/bx/help/8_Scripts/alias @@ -839,7 +845,6 @@ share/bx/help/8_Scripts/events share/bx/help/8_Scripts/events.hop share/bx/help/8_Scripts/fake-dcc share/bx/help/8_Scripts/fe -share/bx/help/8_Scripts/guh share/bx/help/8_Scripts/files share/bx/help/8_Scripts/finger share/bx/help/8_Scripts/fnet @@ -848,6 +853,7 @@ share/bx/help/8_Scripts/functions share/bx/help/8_Scripts/funnyban share/bx/help/8_Scripts/genalias share/bx/help/8_Scripts/global +share/bx/help/8_Scripts/guh share/bx/help/8_Scripts/history share/bx/help/8_Scripts/history-match share/bx/help/8_Scripts/imap @@ -874,13 +880,13 @@ share/bx/help/8_Scripts/mudlike share/bx/help/8_Scripts/multi share/bx/help/8_Scripts/nemesis share/bx/help/8_Scripts/netsplit -share/bx/help/8_Scripts/ping share/bx/help/8_Scripts/netsplit.env share/bx/help/8_Scripts/newaway share/bx/help/8_Scripts/newformat share/bx/help/8_Scripts/nicks share/bx/help/8_Scripts/old-dcc share/bx/help/8_Scripts/oldping +share/bx/help/8_Scripts/ping share/bx/help/8_Scripts/pipe share/bx/help/8_Scripts/prefix share/bx/help/8_Scripts/recursion @@ -903,20 +909,34 @@ share/bx/help/8_Scripts/uhnotify share/bx/help/8_Scripts/uping share/bx/help/8_Scripts/wallopstat share/bx/help/8_Scripts/webster -share/bx/help/8_Scripts/2.8script share/bx/help/8_Scripts/window share/bx/help/README_FIRST share/bx/help/commands share/bx/help/findcomm share/bx/help/functions share/bx/help/out +%%PLUGINS:%%share/bx/plugins/BitchX.hints +%%PLUGINS:%%share/bx/plugins/acro.so +%%PLUGINS:%%share/bx/plugins/amp.so +%%PLUGINS:%%share/bx/plugins/autobot.so +%%PLUGINS:%%share/bx/plugins/blowfish.so +%%PLUGINS:%%share/bx/plugins/encrypt.so +%%PLUGINS:%%share/bx/plugins/fserv.so +%%PLUGINS:%%share/bx/plugins/hint.so +%%PLUGINS:%%share/bx/plugins/nap.so +%%PLUGINS:%%share/bx/plugins/pkga.so +%%PLUGINS:%%share/bx/plugins/possum.so +%%PLUGINS:%%share/bx/plugins/qmail.so +%%PLUGINS:%%share/bx/plugins/scan.so +%%PLUGINS:%%share/bx/plugins/wavplay.so +%%PLUGINS:%%share/bx/plugins/qbx.so share/bx/script/actplug.gmz share/bx/script/bxglobal share/bx/script/bxtcl.tcl +share/bx/script/example-.bitchxrc share/bx/script/file.tcl share/bx/script/fserve+vfs.tar.gz share/bx/script/menu.bx -share/bx/script/example-.bitchxrc share/bx/script/query.bx share/bx/translation/ASCII share/bx/translation/CP437 @@ -951,21 +971,27 @@ share/bx/translation/SWEDISH_NAMES_COM share/bx/translation/SWISS share/bx/translation/UNITED_KINGDOM share/bx/translation/UNITED_KINGDOM_COM +%%NOGNOME:%%share/bx/wserv share/doc/bitchx/bxfaq.html -@dirrm share/bx/help/1_General/dcc -@dirrm share/bx/help/1_General/ctcp -@dirrm share/bx/help/1_General -@dirrm share/bx/help/2_Queries -@dirrm share/bx/help/3_Operators -@dirrm share/bx/help/4_Misc/bind -@dirrm share/bx/help/4_Misc/set +@dirrm share/doc/bitchx +@dirrm share/bx/translation +@dirrm share/bx/script +%%PLUGINS:%%@dirrm share/bx/plugins +@dirrm share/bx/help/8_Scripts +@dirrm share/bx/help/7_Docs +@dirrm share/bx/help/6_Functions +@dirrm share/bx/help/5_Programming/on +@dirrm share/bx/help/5_Programming +@dirrm share/bx/help/4_Misc/wset @dirrm share/bx/help/4_Misc/window +@dirrm share/bx/help/4_Misc/set @dirrm share/bx/help/4_Misc/fset -@dirrm share/bx/help/4_Misc/wset +@dirrm share/bx/help/4_Misc/bind @dirrm share/bx/help/4_Misc -@dirrm share/bx/help/5_Programming/on -@dirrm share/bx/help/5_Programming -@dirrm share/bx/help/6_Functions -@dirrm share/bx/help/7_Docs -@dirrm share/bx/help/8_Scripts -@dirrm share/doc/bitchx +@dirrm share/bx/help/3_Operators +@dirrm share/bx/help/2_Queries +@dirrm share/bx/help/1_General/dcc +@dirrm share/bx/help/1_General/ctcp +@dirrm share/bx/help/1_General +@dirrm share/bx/help +@dirrm share/bx diff --git a/irc/xchat-devel/Makefile b/irc/xchat-devel/Makefile index fcafc3e0be6c..a15774070c9a 100644 --- a/irc/xchat-devel/Makefile +++ b/irc/xchat-devel/Makefile @@ -14,78 +14,50 @@ MASTER_SITES= http://xchat.org/files/source/1.5/ \ MAINTAINER= jim@FreeBSD.org -.if defined(WITH_SOCKS) -BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 -.endif -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - Imlib.5:${PORTSDIR}/graphics/imlib -.if defined(WITH_GNOME) -LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif - -.if exists(${X11BASE}/bin/panel) && defined(WITH_GNOME) -WITH_GDK_PIXBUF=yes -WITH_PANEL= yes -LIB_DEPENDS+= panel_applet.4:${PORTSDIR}/x11/gnomecore -.endif - -.if defined(WITH_GDK_PIXBUF) -LIB_DEPENDS+= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf -.endif - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GDK_PIXBUF_CONFIG?= ${X11BASE}/bin/gdk-pixbuf-config - USE_X_PREFIX= yes USE_BZIP2= yes USE_GMAKE= yes USE_PERL5= yes +USE_IMLIB= yes +WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-python +.include <bsd.port.pre.mk> + .if defined(WITH_SOCKS) +BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 CONFIGURE_ARGS+=--enable-socks .endif -.if defined(WITH_GNOME) -CONFIGURE_ARGS+=--enable-gnome -PLIST_SUB+= GNOME:="" -.if defined(WITH_PANEL) -CONFIGURE_ARGS+=--enable-panel -.else -CONFIGURE_ARGS+=--disable-panel -.endif -.else -CONFIGURE_ARGS+=--disable-gnome -PLIST_SUB+= GNOME:="@comment " -.endif - -.if defined(WITH_GDK_PIXBUF) -CONFIGURE_ARGS+=--enable-gdk-pixbuf -.else -CONFIGURE_ARGS+=--disable-gdk-pixbuf -.endif - .if defined(WITH_SSL) USE_OPENSSL= YES CONFIGURE_ARGS+=--enable-openssl .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}" \ - LIBS="-L${LOCALBASE}/lib" +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--enable-gnome --enable-panel --enable-gdk-pixbuf +.else +CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf +.endif + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' post-install: - @strip ${PREFIX}/bin/xchat .if !defined(NOPORTDOCS) - @${ECHO} "===> Installing xchat docs in ${PREFIX}/share/doc/xchat" + @${ECHO_MSG} "===> Installing xchat docs in ${PREFIX}/share/doc/xchat" @${MKDIR} ${PREFIX}/share/doc/xchat && ${CHMOD} a+rx ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xchat .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile index 4c0318ade4a9..9bc401a1ed4d 100644 --- a/irc/xchat-gnome/Makefile +++ b/irc/xchat-gnome/Makefile @@ -13,61 +13,45 @@ MASTER_SITES= http://xchat.org/files/source/1.4/ \ MAINTAINER= jim@FreeBSD.org -.if defined(WITH_SOCKS) -BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 -.endif -LIB_DEPENDS+= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - Imlib.5:${PORTSDIR}/graphics/imlib -.if defined(WITH_GNOME) -LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif - -.if exists(${X11BASE}/bin/panel) && defined(WITH_GNOME) -WITH_GDK_PIXBUF=yes -WITH_PANEL= yes -LIB_DEPENDS+= panel_applet.4:${PORTSDIR}/x11/gnomecore -.endif - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_X_PREFIX= yes USE_BZIP2= yes USE_GMAKE= yes USE_PERL5= yes +USE_IMLIB= yes +WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-python +.include <bsd.port.pre.mk> + .if defined(WITH_SOCKS) +BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 CONFIGURE_ARGS+=--enable-socks .endif -.if defined(WITH_GNOME) -CONFIGURE_ARGS+=--enable-gnome -PLIST_SUB+= GNOME:="" -.if defined(WITH_PANEL) -CONFIGURE_ARGS+=--enable-panel -.else -CONFIGURE_ARGS+=--disable-panel -.endif +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--enable-gnome --enable-panel --enable-gdk-pixbuf .else -CONFIGURE_ARGS+=--disable-gnome -PLIST_SUB+= GNOME:="@comment " +CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - LIBS="-L${LOCALBASE}/lib" +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' post-install: - @strip ${PREFIX}/bin/xchat .if !defined(NOPORTDOCS) - @${ECHO} "===> Installing xchat docs in ${PREFIX}/share/doc/xchat" + @${ECHO_MSG} "===> Installing xchat docs in ${PREFIX}/share/doc/xchat" @${MKDIR} ${PREFIX}/share/doc/xchat && ${CHMOD} a+rx ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xchat .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile index 4c0318ade4a9..9bc401a1ed4d 100644 --- a/irc/xchat/Makefile +++ b/irc/xchat/Makefile @@ -13,61 +13,45 @@ MASTER_SITES= http://xchat.org/files/source/1.4/ \ MAINTAINER= jim@FreeBSD.org -.if defined(WITH_SOCKS) -BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 -.endif -LIB_DEPENDS+= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - Imlib.5:${PORTSDIR}/graphics/imlib -.if defined(WITH_GNOME) -LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif - -.if exists(${X11BASE}/bin/panel) && defined(WITH_GNOME) -WITH_GDK_PIXBUF=yes -WITH_PANEL= yes -LIB_DEPENDS+= panel_applet.4:${PORTSDIR}/x11/gnomecore -.endif - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_X_PREFIX= yes USE_BZIP2= yes USE_GMAKE= yes USE_PERL5= yes +USE_IMLIB= yes +WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-python +.include <bsd.port.pre.mk> + .if defined(WITH_SOCKS) +BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 CONFIGURE_ARGS+=--enable-socks .endif -.if defined(WITH_GNOME) -CONFIGURE_ARGS+=--enable-gnome -PLIST_SUB+= GNOME:="" -.if defined(WITH_PANEL) -CONFIGURE_ARGS+=--enable-panel -.else -CONFIGURE_ARGS+=--disable-panel -.endif +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--enable-gnome --enable-panel --enable-gdk-pixbuf .else -CONFIGURE_ARGS+=--disable-gnome -PLIST_SUB+= GNOME:="@comment " +CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - LIBS="-L${LOCALBASE}/lib" +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' post-install: - @strip ${PREFIX}/bin/xchat .if !defined(NOPORTDOCS) - @${ECHO} "===> Installing xchat docs in ${PREFIX}/share/doc/xchat" + @${ECHO_MSG} "===> Installing xchat docs in ${PREFIX}/share/doc/xchat" @${MKDIR} ${PREFIX}/share/doc/xchat && ${CHMOD} a+rx ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xchat .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile index 4c0318ade4a9..9bc401a1ed4d 100644 --- a/irc/xchat1/Makefile +++ b/irc/xchat1/Makefile @@ -13,61 +13,45 @@ MASTER_SITES= http://xchat.org/files/source/1.4/ \ MAINTAINER= jim@FreeBSD.org -.if defined(WITH_SOCKS) -BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 -.endif -LIB_DEPENDS+= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - Imlib.5:${PORTSDIR}/graphics/imlib -.if defined(WITH_GNOME) -LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif - -.if exists(${X11BASE}/bin/panel) && defined(WITH_GNOME) -WITH_GDK_PIXBUF=yes -WITH_PANEL= yes -LIB_DEPENDS+= panel_applet.4:${PORTSDIR}/x11/gnomecore -.endif - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_X_PREFIX= yes USE_BZIP2= yes USE_GMAKE= yes USE_PERL5= yes +USE_IMLIB= yes +WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-python +.include <bsd.port.pre.mk> + .if defined(WITH_SOCKS) +BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 CONFIGURE_ARGS+=--enable-socks .endif -.if defined(WITH_GNOME) -CONFIGURE_ARGS+=--enable-gnome -PLIST_SUB+= GNOME:="" -.if defined(WITH_PANEL) -CONFIGURE_ARGS+=--enable-panel -.else -CONFIGURE_ARGS+=--disable-panel -.endif +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--enable-gnome --enable-panel --enable-gdk-pixbuf .else -CONFIGURE_ARGS+=--disable-gnome -PLIST_SUB+= GNOME:="@comment " +CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - LIBS="-L${LOCALBASE}/lib" +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' post-install: - @strip ${PREFIX}/bin/xchat .if !defined(NOPORTDOCS) - @${ECHO} "===> Installing xchat docs in ${PREFIX}/share/doc/xchat" + @${ECHO_MSG} "===> Installing xchat docs in ${PREFIX}/share/doc/xchat" @${MKDIR} ${PREFIX}/share/doc/xchat && ${CHMOD} a+rx ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xchat .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile index 4c0318ade4a9..9bc401a1ed4d 100644 --- a/irc/xchat2/Makefile +++ b/irc/xchat2/Makefile @@ -13,61 +13,45 @@ MASTER_SITES= http://xchat.org/files/source/1.4/ \ MAINTAINER= jim@FreeBSD.org -.if defined(WITH_SOCKS) -BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 -.endif -LIB_DEPENDS+= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - Imlib.5:${PORTSDIR}/graphics/imlib -.if defined(WITH_GNOME) -LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif - -.if exists(${X11BASE}/bin/panel) && defined(WITH_GNOME) -WITH_GDK_PIXBUF=yes -WITH_PANEL= yes -LIB_DEPENDS+= panel_applet.4:${PORTSDIR}/x11/gnomecore -.endif - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_X_PREFIX= yes USE_BZIP2= yes USE_GMAKE= yes USE_PERL5= yes +USE_IMLIB= yes +WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-python +.include <bsd.port.pre.mk> + .if defined(WITH_SOCKS) +BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 CONFIGURE_ARGS+=--enable-socks .endif -.if defined(WITH_GNOME) -CONFIGURE_ARGS+=--enable-gnome -PLIST_SUB+= GNOME:="" -.if defined(WITH_PANEL) -CONFIGURE_ARGS+=--enable-panel -.else -CONFIGURE_ARGS+=--disable-panel -.endif +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--enable-gnome --enable-panel --enable-gdk-pixbuf .else -CONFIGURE_ARGS+=--disable-gnome -PLIST_SUB+= GNOME:="@comment " +CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - LIBS="-L${LOCALBASE}/lib" +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' post-install: - @strip ${PREFIX}/bin/xchat .if !defined(NOPORTDOCS) - @${ECHO} "===> Installing xchat docs in ${PREFIX}/share/doc/xchat" + @${ECHO_MSG} "===> Installing xchat docs in ${PREFIX}/share/doc/xchat" @${MKDIR} ${PREFIX}/share/doc/xchat && ${CHMOD} a+rx ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xchat .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/korean/ami/Makefile b/korean/ami/Makefile index 58713e318fa6..44ffa288fda9 100644 --- a/korean/ami/Makefile +++ b/korean/ami/Makefile @@ -17,24 +17,22 @@ MAINTAINER= cjh@kr.freebsd.org LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -USE_X_PREFIX= YES -USE_GMAKE= YES -GNU_CONFIGURE= YES -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_X_PREFIX= yes +USE_GMAKE= yes +USE_GTK= yes +WANT_GNOME= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-hangul-keyboard=2 -MAKE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" -# gnome panel applet support -.if defined(WITH_GNOME_APPLET) -PKGNAMESUFFIX= -gnome -RUN_DEPENDS+= panel:${PORTSDIR}/x11/gnomecore -CONFIGURE_ARGS+= --enable-gnome-applet +.include <bsd.port.pre.mk> + +# gnome support +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--enable-gnome-applet +DATADIR= share/gnome .else -pre-fetch: - @${ECHO_MSG} "Type \"make WITH_GNOME_APPLET=YES\" if you want GNOME panel applet support." +DATADIR= share .endif post-build: @@ -43,7 +41,6 @@ post-build: post-install: ${INSTALL_PROGRAM} ${WRKSRC}/hanjadic/hanja-hwp2ami ${PREFIX}/bin - # patch XLC_LOCALE for ko_KR.EUC(harmless) if [ -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE; then \ ${MV} -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE \ @@ -51,19 +48,15 @@ post-install: fi ${INSTALL_DATA} ${FILESDIR}/XLC_LOCALE \ ${PREFIX}/lib/X11/locale/ko/ - ${MKDIR} ${PREFIX}/share/doc/ami ${INSTALL_DATA} ${FILESDIR}/XLC_LOCALE \ ${PREFIX}/share/doc/ami - .for NAME in AUTHORS README NEWS ChangeLog ${INSTALL_DATA} ${WRKSRC}/${NAME} \ ${PREFIX}/share/doc/ami .endfor + ${GUNZIP_CMD} -cd ${DISTDIR}/hanja.dic.gz > \ + ${PREFIX}/${DATADIR}/ami/hanja.dic + ${CAT} ${DISTDIR}/ami.dic >> ${PREFIX}/${DATADIR}/ami/hanja.dic - # dic - ${GUNZIP_CMD} -cd ${_DISTDIR}/hanja.dic.gz > \ - ${PREFIX}/share/ami/hanja.dic - ${CAT} ${_DISTDIR}/ami.dic >> ${PREFIX}/share/ami/hanja.dic - -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/korean/ami/pkg-plist b/korean/ami/pkg-plist index 3380da644829..1079c421b0dc 100644 --- a/korean/ami/pkg-plist +++ b/korean/ami/pkg-plist @@ -1,43 +1,45 @@ bin/ami -@exec ln -fs ami %B/wmami -@unexec rm -f %B/wmami +%%GNOME:%%bin/ami_applet bin/hanja-hwp2ami -share/ami/gtkrc -share/ami/hanja.dic -share/ami/pix/nam/ami-e.xpm -share/ami/pix/nam/ami-h.xpm -share/ami/pix/nam/AUTHORS -share/ami/pix/nam/ami-d.xpm -@dirrm share/ami/pix/nam -share/ami/pix/arctic/ami-d.xpm -share/ami/pix/arctic/ami-e.xpm -share/ami/pix/arctic/ami-h.xpm -share/ami/pix/arctic/AUTHORS -@dirrm share/ami/pix/arctic -share/ami/pix/OSX/ami-d.xpm -share/ami/pix/OSX/ami-e.xpm -share/ami/pix/OSX/ami-h.xpm -share/ami/pix/OSX/AUTHORS -@dirrm share/ami/pix/OSX -share/ami/pix/Mac/ami-d.xpm -share/ami/pix/Mac/ami-e.xpm -share/ami/pix/Mac/ami-h.xpm -share/ami/pix/Mac/AUTHORS -@dirrm share/ami/pix/Mac -share/ami/pix/Aqua/ami-d.xpm -share/ami/pix/Aqua/ami-e.xpm -share/ami/pix/Aqua/ami-h.xpm -share/ami/pix/Aqua/AUTHORS -@dirrm share/ami/pix/Aqua -@dirrm share/ami/pix -@dirrm share/ami +bin/wmami +%%GNOME:%%etc/CORBA/servers/ami.gnorba +share/doc/ami/AUTHORS +share/doc/ami/ChangeLog +share/doc/ami/NEWS +share/doc/ami/README share/doc/ami/XLC_LOCALE +%%DATADIR%%/ami/gtkrc +%%DATADIR%%/ami/hanja.dic +%%DATADIR%%/ami/pix/Aqua/AUTHORS +%%DATADIR%%/ami/pix/Aqua/ami-d.xpm +%%DATADIR%%/ami/pix/Aqua/ami-e.xpm +%%DATADIR%%/ami/pix/Aqua/ami-h.xpm +%%DATADIR%%/ami/pix/Mac/AUTHORS +%%DATADIR%%/ami/pix/Mac/ami-d.xpm +%%DATADIR%%/ami/pix/Mac/ami-e.xpm +%%DATADIR%%/ami/pix/Mac/ami-h.xpm +%%DATADIR%%/ami/pix/OSX/AUTHORS +%%DATADIR%%/ami/pix/OSX/ami-d.xpm +%%DATADIR%%/ami/pix/OSX/ami-e.xpm +%%DATADIR%%/ami/pix/OSX/ami-h.xpm +%%DATADIR%%/ami/pix/arctic/AUTHORS +%%DATADIR%%/ami/pix/arctic/ami-d.xpm +%%DATADIR%%/ami/pix/arctic/ami-e.xpm +%%DATADIR%%/ami/pix/arctic/ami-h.xpm +%%DATADIR%%/ami/pix/nam/AUTHORS +%%DATADIR%%/ami/pix/nam/ami-d.xpm +%%DATADIR%%/ami/pix/nam/ami-e.xpm +%%DATADIR%%/ami/pix/nam/ami-h.xpm +%%GNOME:%%share/gnome/applets/Utility/ami.desktop @comment copy new locale definition(no harm, so need not be uninstalled) -@exec if [ -f %D/lib/X11/locale/ko/XLC_LOCALE ]; then mv -f %D/lib/X11/locale/ko/XLC_LOCALE %D/lib/X11/locale/ko/XLC_LOCALE.orig; fi @exec cp %D/share/doc/ami/XLC_LOCALE %D/lib/X11/locale/ko/ +@exec if [ -f %D/lib/X11/locale/ko/XLC_LOCALE ]; then mv -f %D/lib/X11/locale/ko/XLC_LOCALE %D/lib/X11/locale/ko/XLC_LOCALE.orig; fi @unexec if [ -f %D/lib/X11/locale/ko/XLC_LOCALE.orig ]; then mv -f %D/lib/X11/locale/ko/XLC_LOCALE.orig %D/lib/X11/locale/ko/XLC_LOCALE; fi -share/doc/ami/AUTHORS -share/doc/ami/README -share/doc/ami/NEWS -share/doc/ami/ChangeLog @dirrm share/doc/ami +@dirrm %%DATADIR%%/ami/pix/nam +@dirrm %%DATADIR%%/ami/pix/arctic +@dirrm %%DATADIR%%/ami/pix/OSX +@dirrm %%DATADIR%%/ami/pix/Mac +@dirrm %%DATADIR%%/ami/pix/Aqua +@dirrm %%DATADIR%%/ami/pix +@dirrm %%DATADIR%%/ami diff --git a/korean/bitchx/Makefile b/korean/bitchx/Makefile index 57b6a3411e5b..1621a5c95a8b 100644 --- a/korean/bitchx/Makefile +++ b/korean/bitchx/Makefile @@ -19,36 +19,31 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= hollywar@mail.holywar.net -.if defined(WITH_GNOME) -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif - -#PATCH_DIST_ARGS= -d ${WRKDIR}/ --forward --quiet -E ${PATCH_DIST_STRIP} -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config WRKSRC= ${WRKDIR}/BitchX + USE_AUTOCONF= yes USE_GMAKE= yes -.if defined(WITH_GNOME) -CONFIGURE_ARGS+= --with-plugins --with-gtk --enable-sound -.else -CONFIGURE_ARGS+= --with-plugins --without-gtk -.endif -CONFIGURE_ARGS+= --exec-prefix="${PREFIX}/share" \ - --bindir="${PREFIX}/bin" \ - --datadir="${PREFIX}/share" \ - --libdir="${PREFIX}/share" - +WANT_ESOUND= yes +WANT_GNOME= yes +CONFIGURE_ARGS= --with-plugins \ + --exec-prefix="${PREFIX}/share" \ + --bindir="${PREFIX}/bin" \ + --datadir="${PREFIX}/share" \ + --libdir="${PREFIX}/share" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" + LIBS="-L{LOCALBASE}/lib" -MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_DATA="${INSTALL_DATA}" +.include <bsd.port.pre.mk> -.if !defined(WITH_GNOME) -pre-extract: - @${ECHO} "You can add hooks for GNOME by defining WITH_GNOME" +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--with-gtk +.else +CONFIGURE_ARGS+=--without-gtk +.endif +.if defined(HAVE_ESOUND) +USE_ESOUND= yes +CONFIGURE_ARGS+=--enable-sound .endif post-install: @@ -61,21 +56,5 @@ post-install: ${RMDIR} ${PREFIX}/share/bx/help/4_Misc/fset ${RMDIR} ${PREFIX}/share/bx/help/4_Misc/wset .endif -.if defined(WITH_GNOME) - @${ECHO} bin/gtkBitchX >> ${TMPPLIST} - @${ECHO} bin/gtkBitchX-1.0c16+H1 >> ${TMPPLIST} - @${ECHO} share/bx/plugins/nicklist.so >> ${TMPPLIST} -.else - @${ECHO} bin/bx >> ${TMPPLIST} - @${ECHO} bin/BitchX >> ${TMPPLIST} - @${ECHO} bin/BitchX-1.0c16+H1 >> ${TMPPLIST} - @${ECHO} bin/scr-bx >> ${TMPPLIST} - @${ECHO} share/bx/wserv >> ${TMPPLIST} -.endif - @${ECHO} @dirrm share/bx/help >> ${TMPPLIST} - @${ECHO} @dirrm share/bx/plugins >> ${TMPPLIST} - @${ECHO} @dirrm share/bx/script >> ${TMPPLIST} - @${ECHO} @dirrm share/bx/translation >> ${TMPPLIST} - @${ECHO} @dirrm share/bx >> ${TMPPLIST} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/korean/bitchx/files/patch-ag b/korean/bitchx/files/patch-ag new file mode 100644 index 000000000000..163bf1445c7c --- /dev/null +++ b/korean/bitchx/files/patch-ag @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sun Jan 9 02:11:01 2000 ++++ Makefile.in Sat Sep 9 01:24:46 2000 +@@ -43,7 +43,7 @@ + IRCLIB = @IRCLIB@ + + CC = @CC@ +-DEFS = -I$$(srcdir)/../include -I$(topdir)/include ++DEFS = -I$$(srcdir)/../include -I$(topdir)/include -I. -I- + LIBS = @LIBS@ + INCLUDES = @INCLUDES@ + diff --git a/korean/bitchx/files/patch-ah b/korean/bitchx/files/patch-ah new file mode 100644 index 000000000000..fca11c214367 --- /dev/null +++ b/korean/bitchx/files/patch-ah @@ -0,0 +1,11 @@ +--- dll/Makefile.in.orig Sun Oct 1 22:05:20 2000 ++++ dll/Makefile.in Sun Oct 1 22:05:47 2000 +@@ -31,7 +32,7 @@ + 'SHLIB_CFLAGS=$(SHLIB_CFLAGS)' \ + 'IRCLIB=$(IRCLIB)' \ + 'TCLINC=$(TCLINC)' \ +- 'INCLUDES=$(INCLUDES)' \ ++ 'INCLUDES=$(DEFS) $(INCLUDES)' \ + 'DEFS=$(DEFS)' \ + 'local_dir=$(local_dir)' \ + 'LIBS=$(LIBS)' diff --git a/korean/bitchx/pkg-plist b/korean/bitchx/pkg-plist index e27a42624e53..1db84aebe59f 100644 --- a/korean/bitchx/pkg-plist +++ b/korean/bitchx/pkg-plist @@ -1,3 +1,9 @@ +%%NOGNOME:%%bin/BitchX +%%NOGNOME:%%bin/BitchX-1.0c16+H1 +%%GNOME:%%bin/gtkBitchX +%%GNOME:%%bin/gtkBitchX-1.0c16+H1 +bin/bx +%%NOGNOME:%%bin/scr-bx share/bx/BitchX.quit share/bx/BitchX.ircnames share/bx/BitchX.reasons @@ -907,6 +913,7 @@ share/bx/plugins/encrypt.so share/bx/plugins/fserv.so share/bx/plugins/hint.so share/bx/plugins/nap.so +%%GNOME:%%share/bx/plugins/nicklist.so share/bx/plugins/pkga.so share/bx/plugins/possum.so share/bx/plugins/qmail.so @@ -953,19 +960,25 @@ share/bx/translation/SWEDISH_NAMES_COM share/bx/translation/SWISS share/bx/translation/UNITED_KINGDOM share/bx/translation/UNITED_KINGDOM_COM +%%NOGNOME:%%share/bx/wserv share/doc/bitchx/bxfaq.html +@dirrm share/doc/bitchx +@dirrm share/bx/translation +@dirrm share/bx/script +@dirrm share/bx/plugins +@dirrm share/bx/help/8_Scripts +@dirrm share/bx/help/7_Docs +@dirrm share/bx/help/6_Functions +@dirrm share/bx/help/5_Programming/on +@dirrm share/bx/help/5_Programming +@dirrm share/bx/help/4_Misc/window +@dirrm share/bx/help/4_Misc/set +@dirrm share/bx/help/4_Misc/bind +@dirrm share/bx/help/4_Misc +@dirrm share/bx/help/3_Operators +@dirrm share/bx/help/2_Queries @dirrm share/bx/help/1_General/dcc @dirrm share/bx/help/1_General/ctcp @dirrm share/bx/help/1_General -@dirrm share/bx/help/2_Queries -@dirrm share/bx/help/3_Operators -@dirrm share/bx/help/4_Misc/bind -@dirrm share/bx/help/4_Misc/set -@dirrm share/bx/help/4_Misc/window -@dirrm share/bx/help/4_Misc -@dirrm share/bx/help/5_Programming/on -@dirrm share/bx/help/5_Programming -@dirrm share/bx/help/6_Functions -@dirrm share/bx/help/7_Docs -@dirrm share/bx/help/8_Scripts -@dirrm share/doc/bitchx +@dirrm share/bx/help +@dirrm share/bx diff --git a/misc/grdb/Makefile b/misc/grdb/Makefile index 2045a98a8885..04202d4000e6 100644 --- a/misc/grdb/Makefile +++ b/misc/grdb/Makefile @@ -12,46 +12,35 @@ MASTER_SITES= http://bucket.pp.ualr.edu/~bit/download/ MAINTAINER= stijn@win.tue.nl -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - ${GNOME_DEPENDS} - -.if !defined(WITHOUT_GNOME) -GNOME_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter -.endif +LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_X_PREFIX= yes - +USE_GTK= yes +WANT_GNOME= yes USE_GMAKE= yes GNU_CONFIGURE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.if defined(WITHOUT_GNOME) +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +.else CONFIGURE_ARGS= --disable-gnome .endif -.if !defined(WITHOUT_GNOME) -pre-extract: - @${ECHO} "===> NOTE: You can remove support for the Gnome control panel" - @${ECHO} "===> by defining WITHOUT_GNOME" -.endif +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/grdb - ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/grdb - @${ECHO} "share/doc/grdb/README" >> ${TMPPLIST} - @${ECHO} "@dirrm share/doc/grdb" >> ${TMPPLIST} -.endif -.if !defined(WITHOUT_GNOME) - @${ECHO} "bin/grdb-capplet" >> ${TMPPLIST} - @${ECHO} "share/gnome/control-center/Desktop/grdb-capplet.desktop" >> ${TMPPLIST} - @${ECHO} "share/gnome/apps/Settings/Desktop/grdb-capplet.desktop" >> ${TMPPLIST} - @${ECHO} "share/gnome/pixmaps/grdb-capplet.png" >> ${TMPPLIST} + @${MKDIR} ${PREFIX}/share/doc/grdb + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/grdb .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/misc/grdb/pkg-plist b/misc/grdb/pkg-plist index d43d9aa5b0e4..f4a582fe6ee1 100644 --- a/misc/grdb/pkg-plist +++ b/misc/grdb/pkg-plist @@ -1,17 +1,23 @@ +%%GNOME:%%bin/grdb-capplet bin/grdb -share/grdb/AAAAAAGeneral.ad -share/grdb/AAAMotif.ad -share/grdb/AAATk.ad -share/grdb/AAAXaw.ad -share/grdb/Ddd.ad -share/grdb/Editres.ad -share/grdb/Emacs.ad -share/grdb/ML.ad -share/grdb/Nedit.ad -share/grdb/Netscape.ad -share/grdb/RVPlayer.ad -share/grdb/XCalc.ad -share/grdb/XTerm.ad -share/grdb/XV.ad -share/grdb/XWp.ad -@dirrm share/grdb +share/doc/grdb/README +%%GNOME:%%share/gnome/apps/Settings/Desktop/grdb-capplet.desktop +%%GNOME:%%share/gnome/control-center/Desktop/grdb-capplet.desktop +%%DATADIR%%/grdb/AAAAAAGeneral.ad +%%DATADIR%%/grdb/AAAMotif.ad +%%DATADIR%%/grdb/AAATk.ad +%%DATADIR%%/grdb/AAAXaw.ad +%%DATADIR%%/grdb/Ddd.ad +%%DATADIR%%/grdb/Editres.ad +%%DATADIR%%/grdb/Emacs.ad +%%DATADIR%%/grdb/ML.ad +%%DATADIR%%/grdb/Nedit.ad +%%DATADIR%%/grdb/Netscape.ad +%%DATADIR%%/grdb/RVPlayer.ad +%%DATADIR%%/grdb/XCalc.ad +%%DATADIR%%/grdb/XTerm.ad +%%DATADIR%%/grdb/XV.ad +%%DATADIR%%/grdb/XWp.ad +%%GNOME:%%share/gnome/pixmaps/grdb-capplet.png +@dirrm %%DATADIR%%/grdb +@dirrm share/doc/grdb diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile index df7550bffb6a..6663c0359fa5 100644 --- a/multimedia/xmms/Makefile +++ b/multimedia/xmms/Makefile @@ -22,70 +22,59 @@ PATCH_SITE_SUBDIR= sobomax MAINTAINER= esk@ira.uka.de -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - glib12.3:${PORTSDIR}/devel/glib12 \ - xml.5:${PORTSDIR}/textproc/libxml +LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml -USE_X_PREFIX= yes -USE_LIBTOOL= yes +USE_X_PREFIX= yes +USE_GTK= yes +WANT_ESOUND= yes +WANT_GNOME= yes +USE_LIBTOOL= yes LIBTOOLFILES= configure libxmms/configure -INSTALLS_SHLIB= yes +INSTALLS_SHLIB= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" \ + HAVE_MIKMOD=${HAVE_MIKMOD} + +.include <bsd.port.pre.mk> .if !defined(WITHOUT_MIKMOD) LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod -HAVE_MIKMOD_OVERRIDE= +HAVE_MIKMOD= yes PLIST_SUB+= MIKMODPLUGIN:="" .else -HAVE_MIKMOD_OVERRIDE= yes PLIST_SUB+= MIKMODPLUGIN:="@comment " .endif -.if !defined(WITHOUT_ESD) -LIB_DEPENDS+= esd.2:${PORTSDIR}/audio/esound -HAVE_ESD_OVERRIDE= -PLIST_SUB+= ESDPLUGIN:="" +.if defined(HAVE_GNOME) +USE_GNOME= yes .else -HAVE_ESD_OVERRIDE= yes -PLIST_SUB+= ESDPLUGIN:="@comment " +CONFIGURE_ARGS= --without-gnome .endif -.if defined(WITH_GNOME) -LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs \ - panel_applet.4:${PORTSDIR}/x11/gnomecore -CONFIGURE_ARGS+= --with-gnome -PLIST_SUB+= GNOME:="" +.if defined(HAVE_ESOUND) +USE_ESOUND= yes +PLIST_SUB+= ESDPLUGIN:="" .else -CONFIGURE_ARGS+= --without-gnome -PLIST_SUB+= GNOME:="@comment " +PLIST_SUB+= ESDPLUGIN:="@comment " .endif -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - -CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - HAVE_ESD_OVERRIDE="${HAVE_ESD_OVERRIDE}" \ - HAVE_MIKMOD_OVERRIDE="${HAVE_MIKMOD_OVERRIDE}" - -.include <bsd.port.pre.mk> - .if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 PATCHFILES= xmms-${PORTVERSION}-3dnow.patch.gz CONFIGURE_ARGS+= --enable-3dnow .endif +.if defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021 +post-extract: + (cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \ + cd ${WRKSRC}/Visualization/blur_scope && ${MV} blur_8.s blur_8.S); + ${PERL} -pi.bak -e 's:\.s :\.S :g' ${WRKSRC}/Input/mpg123/Makefile.in + ${PERL} -pi.bak -e 's:blur_8.s:blur_8.S:g' \ + ${WRKSRC}/Visualization/blur_scope/Makefile.in +.endif + pre-extract: -.if !defined(WITH_GNOME) || !defined(WITHOUT_ESD) || !defined(WITHOUT_MIKMOD) || \ - ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 ) +.if !defined(WITHOUT_MIKMOD) || ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 ) @${ECHO_MSG} -.if !defined(WITH_GNOME) - @${ECHO_MSG} "You can add support for GNOME by defining WITH_GNOME." -.endif -.if !defined(WITHOUT_ESD) - @${ECHO_MSG} "You can disable support for ESD sound daemon by defining WITHOUT_ESD." -.endif .if !defined(WITHOUT_MIKMOD) @${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD." .endif @@ -95,16 +84,12 @@ pre-extract: @${ECHO_MSG} .endif -.if defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021 -post-extract: - (cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \ - cd ${WRKSRC}/Visualization/blur_scope && ${MV} blur_8.s blur_8.S); - ${PERL} -pi.bak -e 's:\.s :\.S :g' ${WRKSRC}/Input/mpg123/Makefile.in - ${PERL} -pi.bak -e 's:blur_8.s:blur_8.S:g' \ - ${WRKSRC}/Visualization/blur_scope/Makefile.in -.endif - pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/aclocal|\$\(prefix\)/share/aclocal|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' .include <bsd.port.post.mk> diff --git a/multimedia/xmms/files/patch-ab b/multimedia/xmms/files/patch-ab index a9842709cd22..a4895b94c00e 100644 --- a/multimedia/xmms/files/patch-ab +++ b/multimedia/xmms/files/patch-ab @@ -1,19 +1,11 @@ -*** Visualization/Makefile.in.org Wed Jun 14 13:21:50 2000 ---- Visualization/Makefile.in Wed Jun 14 13:22:09 2000 -*************** -*** 148,154 **** - sidplay_library = @sidplay_library@ - xmmsdir = @xmmsdir@ - -! SUBDIRS = blur_scope sanalyzer opengl_spectrum - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = ---- 148,154 ---- - sidplay_library = @sidplay_library@ - xmmsdir = @xmmsdir@ - -! SUBDIRS = blur_scope sanalyzer - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = +--- Visualization/Makefile.in.orig Mon Jan 31 10:44:44 2000 ++++ Visualization/Makefile.in Sun Feb 27 01:37:39 2000 +@@ -125,7 +125,7 @@ + sidplay_library = @sidplay_library@ + xmmsdir = @xmmsdir@ + +-SUBDIRS = blur_scope sanalyzer opengl_spectrum ++SUBDIRS = blur_scope sanalyzer + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = diff --git a/multimedia/xmms/files/patch-ad b/multimedia/xmms/files/patch-ad index 69fc08dace8d..0b26a5e0f80b 100644 --- a/multimedia/xmms/files/patch-ad +++ b/multimedia/xmms/files/patch-ad @@ -5,7 +5,7 @@ fi - -+if [ x"${HAVE_ESD_OVERRIDE}" != x"" ]; then ++if [ x"${HAVE_ESOUND}" != x"yes" ]; then + have_esd=no +fi @@ -16,21 +16,12 @@ rm -f conf.mikmodtest - -+if [ x"${HAVE_MIKMOD_OVERRIDE}" != x"" ]; then ++if [ x"${HAVE_MIKMOD}" != x"yes" ]; then + have_mikmod=no +fi if test "x$have_mikmod" = xyes; then HAVE_MIKMOD_TRUE= -@@ -5549,7 +5553,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo @@ -7171,14 +7175,14 @@ if test -n "$GCC" @@ -48,3 +39,14 @@ ARCH_DEFINES="-DI386_ASSEM" arch_type=ix86 ;; +@@ -7885,10 +7889,6 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/multimedia/xmms/files/patch-ae b/multimedia/xmms/files/patch-ae index 6494be16d0a2..8eea92cf33e2 100644 --- a/multimedia/xmms/files/patch-ae +++ b/multimedia/xmms/files/patch-ae @@ -1,5 +1,17 @@ --- Makefile.in.orig Mon Jul 31 10:27:32 2000 +++ Makefile.in Mon Jul 31 10:27:49 2000 +@@ -147,7 +147,10 @@ + sidplay_library = @sidplay_library@ + xmmsdir = @xmmsdir@ + +-SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms gnomexmms po ++SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms po ++.ifdef HAVE_GNOME ++SUBDIRS += gnomexmms ++.endif + + bin_SCRIPTS = xmms-config + @@ -205,9 +205,9 @@ rm -f $(srcdir)/stamp-h.in; \ $(MAKE) $(srcdir)/stamp-h.in; \ diff --git a/multimedia/xmms/files/patch-af b/multimedia/xmms/files/patch-af new file mode 100644 index 000000000000..014ca1b56704 --- /dev/null +++ b/multimedia/xmms/files/patch-af @@ -0,0 +1,14 @@ +--- Output/Makefile.in.orig Mon Jan 31 10:44:32 2000 ++++ Output/Makefile.in Sun Feb 27 01:37:39 2000 +@@ -125,7 +125,10 @@ + sidplay_library = @sidplay_library@ + xmmsdir = @xmmsdir@ + +-SUBDIRS = OSS esd disk_writer ++SUBDIRS = OSS disk_writer ++.if defined(HAVE_ESOUND) || defined(HAVE_GNOME) ++SUBDIRS += esd ++.endif + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist index 09034c1b85fd..2e0b6b88c99e 100644 --- a/multimedia/xmms/pkg-plist +++ b/multimedia/xmms/pkg-plist @@ -32,6 +32,7 @@ lib/xmms/Output/libdisk_writer.so lib/xmms/Visualization/libbscope.so lib/xmms/Visualization/libsanalyzer.so share/aclocal/xmms.m4 +%%DATADIR%%/xmms/wmxmms.xpm share/locale/af/LC_MESSAGES/xmms.mo share/locale/bg/LC_MESSAGES/xmms.mo share/locale/ca/LC_MESSAGES/xmms.mo @@ -61,8 +62,7 @@ share/locale/uk/LC_MESSAGES/xmms.mo share/locale/wa/LC_MESSAGES/xmms.mo share/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo share/locale/zh_TW.Big5/LC_MESSAGES/xmms.mo -share/xmms/wmxmms.xpm -@dirrm share/xmms +@dirrm %%DATADIR%%/xmms @dirrm lib/xmms/Visualization @dirrm lib/xmms/Output @dirrm lib/xmms/Input diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile index 7a5e6e776000..7c6d698f0fab 100644 --- a/net-im/gaim/Makefile +++ b/net-im/gaim/Makefile @@ -5,44 +5,50 @@ # $FreeBSD$ # -PORTNAME= gaim -PORTVERSION= 0.10.1 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \ -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +PORTNAME= gaim +PORTVERSION= 0.10.1 +PORTREVISION= 1 +CATEGORIES= net +MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= jim@FreeBSD.org +MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +USE_BZIP2= yes +USE_X_PREFIX= yes +USE_GMAKE= yes +USE_GTK= yes +WANT_ESOUND= yes +WANT_GNOME= yes +USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" -.if defined(WITH_GNOME) -LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +MAN1= gaim.1 -GNU_CONFIGURE= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_X_PREFIX= yes -CONFIGURE_ARGS= --disable-esd +.include <bsd.port.pre.mk> -.if defined(WITH_GNOME) -CONFIGURE_ARGS+= --enable-gnome +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--enable-gnome --enable-panel .else -CONFIGURE_ARGS+= --disable-gnome +CONFIGURE_ARGS+=--disable-gnome +.endif +.if defined(HAVE_ESOUND) +USE_ESOUND= yes +CONFIGURE_ARGS+=--enable-esd +.else +CONFIGURE_ARGS+=--disable-esd .endif -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/src/gaim ${PREFIX}/bin - @${MKDIR} ${PREFIX}/share/gaim/pixmaps && ${CHMOD} a+rx ${PREFIX}/share/gaim/pixmaps - @${ECHO} "===> Installing pixmaps" - @${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/share/gaim/pixmaps +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net-im/gaim/files/patch-aa b/net-im/gaim/files/patch-aa new file mode 100644 index 000000000000..e01484100cf3 --- /dev/null +++ b/net-im/gaim/files/patch-aa @@ -0,0 +1,13 @@ +--- Makefile.in.orig Tue Oct 3 03:12:14 2000 ++++ Makefile.in Tue Oct 3 03:13:14 2000 +@@ -156,8 +156,8 @@ + @GNOMEBITS_TRUE@bitssounddir = $(bitssysconf)/sound/events + @GNOMEBITS_TRUE@bitssound_DATA = gaim.soundlist + +-pixmapdir = $(datadir)/apps/Internet +-pixmap_DATA = gaim.desktop ++@GNOMEAPPLET_TRUE@pixmapdir = $(datadir)/apps/Internet ++@GNOMEAPPLET_TRUE@pixmap_DATA = gaim.desktop + + SUBDIRS = m4 libfaim sounds plugins pixmaps doc po intl src + ACLOCAL_AMFLAGS = -I m4 diff --git a/net-im/gaim/files/patch-ab b/net-im/gaim/files/patch-ab new file mode 100644 index 000000000000..716dfc9761b5 --- /dev/null +++ b/net-im/gaim/files/patch-ab @@ -0,0 +1,22 @@ +--- pixmaps/Makefile.in.orig Tue Oct 3 02:42:15 2000 ++++ pixmaps/Makefile.in Tue Oct 3 02:48:38 2000 +@@ -128,8 +128,8 @@ + EXTRA_DIST = about_small.xpm add.xpm add_small.xpm admin_icon.xpm aimicon.xpm aimicon2.xpm angel.xpm aol_icon.xpm away.xpm away_icon.xpm away_small.xpm bgcolor.xpm big.xpm bigsmile.xpm block.xpm bold.xpm bsmile.xpm buddyadd.xpm buddychat.xpm buddydel.xpm burp.xpm cancel.xpm close.xpm close_small.xpm crossedlips.xpm cry.xpm daemon-buddyadd.xpm daemon-buddychat.xpm daemon-buddydel.xpm daemon-im.xpm daemon-info.xpm daemon-permadd.xpm daemon-permdel.xpm daemon.xpm dt_icon.xpm embarrassed.xpm exit_small.xpm export_small.xpm fgcolor.xpm fontface.xpm fontface2.xpm free_icon.xpm gaim.xpm gnome_add.xpm gnome_close.xpm gnome_preferences.xpm gnome_remove.xpm gnome/devil-connect.png gnome/devil-offline.png gnome/devil-online.png gnome/penguin-connect.png gnome/penguin-offline.png gnome/penguin-online.png group.xpm im.xpm import_small.xpm info.xpm italic.xpm join.xpm kiss.xpm link.xpm login_icon.xpm logo.xpm logout_icon.xpm luke03.xpm moneymouth.xpm msg_pending.xpm no_icon.xpm normal.xpm offline.xpm ok.xpm oneeye.xpm online.xpm palette.xpm peng_frown.xpm peng_smile.xpm peng_wink.xpm permadd.xpm permdel.xpm plugins_small.xpm pounce_small.xpm prefs_small.xpm refresh.xpm sad.xpm save.xpm scream.xpm search_small.xpm signing_on.xpm small.xpm smile.xpm smile8.xpm smile_happy.xpm smile_icon.xpm smile_sad.xpm smile_wink.xpm speaker.xpm strike.xpm tb_forward.xpm tb_search.xpm think.xpm tmp_send.xpm tongue.xpm underline.xpm warn.xpm wink.xpm wood.xpm yell.xpm + + +-pixmapdir = $(datadir)/pixmaps +-pixmap_DATA = gaim.xpm ++pixmapdir = $(datadir)/pixmaps/gaim ++pixmap_DATA = $(EXTRA_DIST) + + #gnomesysconf = `@GNOME_CONFIG@ --sysconfdir` + @GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir` +@@ -187,7 +187,7 @@ + + install-pixmapDATA: $(pixmap_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(pixmapdir) ++ $(mkinstalldirs) $(DESTDIR)$(pixmapdir) $(DESTDIR)$(pixmapdir)/gnome + @list='$(pixmap_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \ diff --git a/net-im/gaim/files/patch-ac b/net-im/gaim/files/patch-ac new file mode 100644 index 000000000000..6c5b292aa4ad --- /dev/null +++ b/net-im/gaim/files/patch-ac @@ -0,0 +1,53 @@ +--- src/Makefile.in.orig Tue Oct 3 16:00:11 2000 ++++ src/Makefile.in Tue Oct 3 16:05:56 2000 +@@ -123,12 +123,12 @@ + l = @l@ + perlpath = @perlpath@ + sedpath = @sedpath@ +-@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet ++@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet gaim + @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim +-@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c aim.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gnome_applet_mgr.c gtkhtml.c gtkticker.c html.c idle.c network.c oscar.c perl.c plugins.c prefs.c proxy.c rvous.c server.c sound.c ticker.c toc.c util.c +-@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a +-@GNOMEAPPLET_FALSE@gaim_SOURCES = about.c aim.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gnome_applet_mgr.c gtkhtml.c gtkticker.c html.c idle.c network.c oscar.c perl.c plugins.c prefs.c proxy.c rvous.c server.c sound.c ticker.c toc.c util.c +-@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = ../libfaim/libfaim.a ++gaim_applet_SOURCES = about.c aim.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gnome_applet_mgr.c gtkhtml.c gtkticker.c html.c idle.c network.c oscar.c perl.c plugins.c prefs.c proxy.c rvous.c server.c sound.c ticker.c toc.c util.c ++gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a ++gaim_SOURCES = about.c aim.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gnome_applet_mgr.c gtkhtml.c gtkticker.c html.c idle.c network.c oscar.c perl.c plugins.c prefs.c proxy.c rvous.c server.c sound.c ticker.c toc.c util.c ++gaim_DEPENDENCIES = ../libfaim/libfaim.a + + CFLAGS = @CFLAGS@ -DLOCALEDIR=\"$(prefix)/share/locale\" + +@@ -142,20 +142,20 @@ + DEFS = @DEFS@ -I. -I$(srcdir) -I.. + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ +-@GNOMEAPPLET_TRUE@gaim_applet_OBJECTS = about.o aim.o away.o browser.o \ +-@GNOMEAPPLET_TRUE@buddy.o buddy_chat.o conversation.o dialogs.o \ +-@GNOMEAPPLET_TRUE@gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \ +-@GNOMEAPPLET_TRUE@html.o idle.o network.o oscar.o perl.o plugins.o \ +-@GNOMEAPPLET_TRUE@prefs.o proxy.o rvous.o server.o sound.o ticker.o \ +-@GNOMEAPPLET_TRUE@toc.o util.o ++gaim_applet_OBJECTS = about.o aim.o away.o browser.o \ ++buddy.o buddy_chat.o conversation.o dialogs.o \ ++gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \ ++html.o idle.o network.o oscar.o perl.o plugins.o \ ++prefs.o proxy.o rvous.o server.o sound.o ticker.o \ ++toc.o util.o + gaim_applet_LDADD = $(LDADD) + gaim_applet_LDFLAGS = +-@GNOMEAPPLET_FALSE@gaim_OBJECTS = about.o aim.o away.o browser.o \ +-@GNOMEAPPLET_FALSE@buddy.o buddy_chat.o conversation.o dialogs.o \ +-@GNOMEAPPLET_FALSE@gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \ +-@GNOMEAPPLET_FALSE@html.o idle.o network.o oscar.o perl.o plugins.o \ +-@GNOMEAPPLET_FALSE@prefs.o proxy.o rvous.o server.o sound.o ticker.o \ +-@GNOMEAPPLET_FALSE@toc.o util.o ++gaim_OBJECTS = about.o aim.o away.o browser.o \ ++buddy.o buddy_chat.o conversation.o dialogs.o \ ++gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \ ++html.o idle.o network.o oscar.o perl.o plugins.o \ ++prefs.o proxy.o rvous.o server.o sound.o ticker.o \ ++toc.o util.o + gaim_LDADD = $(LDADD) + gaim_LDFLAGS = + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist index cd47b44d7c0c..604be8cc7416 100644 --- a/net-im/gaim/pkg-plist +++ b/net-im/gaim/pkg-plist @@ -1,104 +1,133 @@ +bin/au2h bin/gaim -share/gaim/pixmaps/about_small.xpm -share/gaim/pixmaps/add.xpm -share/gaim/pixmaps/add_small.xpm -share/gaim/pixmaps/admin_icon.xpm -share/gaim/pixmaps/aimicon.xpm -share/gaim/pixmaps/aimicon2.xpm -share/gaim/pixmaps/angel.xpm -share/gaim/pixmaps/aol_icon.xpm -share/gaim/pixmaps/away.xpm -share/gaim/pixmaps/away_icon.xpm -share/gaim/pixmaps/away_small.xpm -share/gaim/pixmaps/bgcolor.xpm -share/gaim/pixmaps/big.xpm -share/gaim/pixmaps/bigsmile.xpm -share/gaim/pixmaps/block.xpm -share/gaim/pixmaps/bold.xpm -share/gaim/pixmaps/bsmile.xpm -share/gaim/pixmaps/buddyadd.xpm -share/gaim/pixmaps/buddychat.xpm -share/gaim/pixmaps/buddydel.xpm -share/gaim/pixmaps/burp.xpm -share/gaim/pixmaps/cancel.xpm -share/gaim/pixmaps/close.xpm -share/gaim/pixmaps/close_small.xpm -share/gaim/pixmaps/crossedlips.xpm -share/gaim/pixmaps/cry.xpm -share/gaim/pixmaps/daemon-buddyadd.xpm -share/gaim/pixmaps/daemon-buddychat.xpm -share/gaim/pixmaps/daemon-buddydel.xpm -share/gaim/pixmaps/daemon-im.xpm -share/gaim/pixmaps/daemon-info.xpm -share/gaim/pixmaps/daemon-permadd.xpm -share/gaim/pixmaps/daemon-permdel.xpm -share/gaim/pixmaps/daemon.xpm -share/gaim/pixmaps/dt_icon.xpm -share/gaim/pixmaps/embarrassed.xpm -share/gaim/pixmaps/exit_small.xpm -share/gaim/pixmaps/export_small.xpm -share/gaim/pixmaps/fgcolor.xpm -share/gaim/pixmaps/fontface.xpm -share/gaim/pixmaps/fontface2.xpm -share/gaim/pixmaps/free_icon.xpm -share/gaim/pixmaps/gaim.xpm -share/gaim/pixmaps/gnome_add.xpm -share/gaim/pixmaps/gnome_close.xpm -share/gaim/pixmaps/gnome_preferences.xpm -share/gaim/pixmaps/gnome_remove.xpm -share/gaim/pixmaps/group.xpm -share/gaim/pixmaps/im.xpm -share/gaim/pixmaps/import_small.xpm -share/gaim/pixmaps/info.xpm -share/gaim/pixmaps/italic.xpm -share/gaim/pixmaps/join.xpm -share/gaim/pixmaps/kiss.xpm -share/gaim/pixmaps/link.xpm -share/gaim/pixmaps/login_icon.xpm -share/gaim/pixmaps/logo.xpm -share/gaim/pixmaps/logout_icon.xpm -share/gaim/pixmaps/luke03.xpm -share/gaim/pixmaps/moneymouth.xpm -share/gaim/pixmaps/msg_pending.xpm -share/gaim/pixmaps/no_icon.xpm -share/gaim/pixmaps/normal.xpm -share/gaim/pixmaps/offline.xpm -share/gaim/pixmaps/ok.xpm -share/gaim/pixmaps/oneeye.xpm -share/gaim/pixmaps/online.xpm -share/gaim/pixmaps/palette.xpm -share/gaim/pixmaps/peng_frown.xpm -share/gaim/pixmaps/peng_smile.xpm -share/gaim/pixmaps/peng_wink.xpm -share/gaim/pixmaps/permadd.xpm -share/gaim/pixmaps/permdel.xpm -share/gaim/pixmaps/plugins_small.xpm -share/gaim/pixmaps/pounce_small.xpm -share/gaim/pixmaps/prefs_small.xpm -share/gaim/pixmaps/refresh.xpm -share/gaim/pixmaps/sad.xpm -share/gaim/pixmaps/save.xpm -share/gaim/pixmaps/scream.xpm -share/gaim/pixmaps/search_small.xpm -share/gaim/pixmaps/signing_on.xpm -share/gaim/pixmaps/small.xpm -share/gaim/pixmaps/smile.xpm -share/gaim/pixmaps/smile8.xpm -share/gaim/pixmaps/smile_happy.xpm -share/gaim/pixmaps/smile_icon.xpm -share/gaim/pixmaps/smile_sad.xpm -share/gaim/pixmaps/smile_wink.xpm -share/gaim/pixmaps/speaker.xpm -share/gaim/pixmaps/strike.xpm -share/gaim/pixmaps/tb_forward.xpm -share/gaim/pixmaps/tb_search.xpm -share/gaim/pixmaps/think.xpm -share/gaim/pixmaps/tmp_send.xpm -share/gaim/pixmaps/tongue.xpm -share/gaim/pixmaps/underline.xpm -share/gaim/pixmaps/warn.xpm -share/gaim/pixmaps/wink.xpm -share/gaim/pixmaps/wood.xpm -share/gaim/pixmaps/yell.xpm -@dirrm share/gaim/pixmaps -@dirrm share/gaim +%%GNOME:%%bin/gaim_applet +%%GNOME:%%etc/CORBA/servers/gaim_applet.gnorba +%%GNOME:%%etc/sound/events/gaim.soundlist +lib/gaim/autorecon.so +lib/gaim/iconaway.so +lib/gaim/lagmeter.so +lib/gaim/notify.so +lib/gaim/spellchk.so +%%DATADIR%%/pixmaps/gaim/about_small.xpm +%%DATADIR%%/pixmaps/gaim/add.xpm +%%DATADIR%%/pixmaps/gaim/add_small.xpm +%%DATADIR%%/pixmaps/gaim/admin_icon.xpm +%%DATADIR%%/pixmaps/gaim/aimicon.xpm +%%DATADIR%%/pixmaps/gaim/aimicon2.xpm +%%DATADIR%%/pixmaps/gaim/angel.xpm +%%DATADIR%%/pixmaps/gaim/aol_icon.xpm +%%DATADIR%%/pixmaps/gaim/away.xpm +%%DATADIR%%/pixmaps/gaim/away_icon.xpm +%%DATADIR%%/pixmaps/gaim/away_small.xpm +%%DATADIR%%/pixmaps/gaim/bgcolor.xpm +%%DATADIR%%/pixmaps/gaim/big.xpm +%%DATADIR%%/pixmaps/gaim/bigsmile.xpm +%%DATADIR%%/pixmaps/gaim/block.xpm +%%DATADIR%%/pixmaps/gaim/bold.xpm +%%DATADIR%%/pixmaps/gaim/bsmile.xpm +%%DATADIR%%/pixmaps/gaim/buddyadd.xpm +%%DATADIR%%/pixmaps/gaim/buddychat.xpm +%%DATADIR%%/pixmaps/gaim/buddydel.xpm +%%DATADIR%%/pixmaps/gaim/burp.xpm +%%DATADIR%%/pixmaps/gaim/cancel.xpm +%%DATADIR%%/pixmaps/gaim/close.xpm +%%DATADIR%%/pixmaps/gaim/close_small.xpm +%%DATADIR%%/pixmaps/gaim/crossedlips.xpm +%%DATADIR%%/pixmaps/gaim/cry.xpm +%%DATADIR%%/pixmaps/gaim/daemon-buddyadd.xpm +%%DATADIR%%/pixmaps/gaim/daemon-buddychat.xpm +%%DATADIR%%/pixmaps/gaim/daemon-buddydel.xpm +%%DATADIR%%/pixmaps/gaim/daemon-im.xpm +%%DATADIR%%/pixmaps/gaim/daemon-info.xpm +%%DATADIR%%/pixmaps/gaim/daemon-permadd.xpm +%%DATADIR%%/pixmaps/gaim/daemon-permdel.xpm +%%DATADIR%%/pixmaps/gaim/daemon.xpm +%%DATADIR%%/pixmaps/gaim/dt_icon.xpm +%%DATADIR%%/pixmaps/gaim/embarrassed.xpm +%%DATADIR%%/pixmaps/gaim/exit_small.xpm +%%DATADIR%%/pixmaps/gaim/export_small.xpm +%%DATADIR%%/pixmaps/gaim/fgcolor.xpm +%%DATADIR%%/pixmaps/gaim/fontface.xpm +%%DATADIR%%/pixmaps/gaim/fontface2.xpm +%%DATADIR%%/pixmaps/gaim/free_icon.xpm +%%DATADIR%%/pixmaps/gaim/gaim.xpm +%%DATADIR%%/pixmaps/gaim/gnome/devil-connect.png +%%DATADIR%%/pixmaps/gaim/gnome/devil-offline.png +%%DATADIR%%/pixmaps/gaim/gnome/devil-online.png +%%DATADIR%%/pixmaps/gaim/gnome/penguin-connect.png +%%DATADIR%%/pixmaps/gaim/gnome/penguin-offline.png +%%DATADIR%%/pixmaps/gaim/gnome/penguin-online.png +%%DATADIR%%/pixmaps/gaim/gnome_add.xpm +%%DATADIR%%/pixmaps/gaim/gnome_close.xpm +%%DATADIR%%/pixmaps/gaim/gnome_preferences.xpm +%%DATADIR%%/pixmaps/gaim/gnome_remove.xpm +%%DATADIR%%/pixmaps/gaim/group.xpm +%%DATADIR%%/pixmaps/gaim/im.xpm +%%DATADIR%%/pixmaps/gaim/import_small.xpm +%%DATADIR%%/pixmaps/gaim/info.xpm +%%DATADIR%%/pixmaps/gaim/italic.xpm +%%DATADIR%%/pixmaps/gaim/join.xpm +%%DATADIR%%/pixmaps/gaim/kiss.xpm +%%DATADIR%%/pixmaps/gaim/link.xpm +%%DATADIR%%/pixmaps/gaim/login_icon.xpm +%%DATADIR%%/pixmaps/gaim/logo.xpm +%%DATADIR%%/pixmaps/gaim/logout_icon.xpm +%%DATADIR%%/pixmaps/gaim/luke03.xpm +%%DATADIR%%/pixmaps/gaim/moneymouth.xpm +%%DATADIR%%/pixmaps/gaim/msg_pending.xpm +%%DATADIR%%/pixmaps/gaim/no_icon.xpm +%%DATADIR%%/pixmaps/gaim/normal.xpm +%%DATADIR%%/pixmaps/gaim/offline.xpm +%%DATADIR%%/pixmaps/gaim/ok.xpm +%%DATADIR%%/pixmaps/gaim/oneeye.xpm +%%DATADIR%%/pixmaps/gaim/online.xpm +%%DATADIR%%/pixmaps/gaim/palette.xpm +%%DATADIR%%/pixmaps/gaim/peng_frown.xpm +%%DATADIR%%/pixmaps/gaim/peng_smile.xpm +%%DATADIR%%/pixmaps/gaim/peng_wink.xpm +%%DATADIR%%/pixmaps/gaim/permadd.xpm +%%DATADIR%%/pixmaps/gaim/permdel.xpm +%%DATADIR%%/pixmaps/gaim/plugins_small.xpm +%%DATADIR%%/pixmaps/gaim/pounce_small.xpm +%%DATADIR%%/pixmaps/gaim/prefs_small.xpm +%%DATADIR%%/pixmaps/gaim/refresh.xpm +%%DATADIR%%/pixmaps/gaim/sad.xpm +%%DATADIR%%/pixmaps/gaim/save.xpm +%%DATADIR%%/pixmaps/gaim/scream.xpm +%%DATADIR%%/pixmaps/gaim/search_small.xpm +%%DATADIR%%/pixmaps/gaim/signing_on.xpm +%%DATADIR%%/pixmaps/gaim/small.xpm +%%DATADIR%%/pixmaps/gaim/smile.xpm +%%DATADIR%%/pixmaps/gaim/smile8.xpm +%%DATADIR%%/pixmaps/gaim/smile_happy.xpm +%%DATADIR%%/pixmaps/gaim/smile_icon.xpm +%%DATADIR%%/pixmaps/gaim/smile_sad.xpm +%%DATADIR%%/pixmaps/gaim/smile_wink.xpm +%%DATADIR%%/pixmaps/gaim/speaker.xpm +%%DATADIR%%/pixmaps/gaim/strike.xpm +%%DATADIR%%/pixmaps/gaim/tb_forward.xpm +%%DATADIR%%/pixmaps/gaim/tb_search.xpm +%%DATADIR%%/pixmaps/gaim/think.xpm +%%DATADIR%%/pixmaps/gaim/tmp_send.xpm +%%DATADIR%%/pixmaps/gaim/tongue.xpm +%%DATADIR%%/pixmaps/gaim/underline.xpm +%%DATADIR%%/pixmaps/gaim/warn.xpm +%%DATADIR%%/pixmaps/gaim/wink.xpm +%%DATADIR%%/pixmaps/gaim/wood.xpm +%%DATADIR%%/pixmaps/gaim/yell.xpm +%%GNOME:%%share/gnome/applets/Network/gaim_applet.desktop +%%GNOME:%%share/gnome/apps/Internet/gaim.desktop +%%GNOME:%%share/gnome/pixmaps/gaim.xpm +%%GNOME:%%share/gnome/sounds/gaim/BuddyArrive.au +%%GNOME:%%share/gnome/sounds/gaim/BuddyLeave.au +%%GNOME:%%share/gnome/sounds/gaim/Receive.au +%%GNOME:%%share/gnome/sounds/gaim/Send.au +share/locale/de/LC_MESSAGES/gaim.mo +share/locale/es/LC_MESSAGES/gaim.mo +share/locale/fr/LC_MESSAGES/gaim.mo +share/locale/ko/LC_MESSAGES/gaim.mo +share/locale/zh_CN/LC_MESSAGES/gaim.mo +%%GNOME:%%@dirrm share/gnome/sounds/gaim +@dirrm %%DATADIR%%/pixmaps/gaim/gnome +@dirrm %%DATADIR%%/pixmaps/gaim +@dirrm lib/gaim diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile index e51496425fda..c51c4e9ec43d 100644 --- a/net-im/gicq/Makefile +++ b/net-im/gicq/Makefile @@ -14,18 +14,30 @@ MASTER_SITE_SUBDIR= flathill MAINTAINER= flathill@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - icq.0:${PORTSDIR}/net/libicq - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= icq.0:${PORTSDIR}/net/libicq USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-gnome --disable-nls +USE_GTK= yes +WANT_GNOME= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +.else +CONFIGURE_ARGS+=--without-gnome +.endif + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' + +.include <bsd.port.post.mk> diff --git a/net-im/gicq/files/patch-ac b/net-im/gicq/files/patch-ac new file mode 100644 index 000000000000..92a26e88bd61 --- /dev/null +++ b/net-im/gicq/files/patch-ac @@ -0,0 +1,13 @@ +--- Makefile.in.orig Mon Sep 6 23:36:43 1999 ++++ Makefile.in Mon Sep 6 23:37:18 1999 +@@ -116,8 +116,10 @@ + + SUBDIRS = macros intl po pixmaps src doc + ++.ifdef HAVE_GNOME + sysdir = $(datadir)/apps/Applications + sys_DATA = gicq.desktop ++.endif + + EXTRA_DIST = gicq.desktop + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/net-im/gicq/pkg-plist b/net-im/gicq/pkg-plist index ec71b337f897..67b051623192 100644 --- a/net-im/gicq/pkg-plist +++ b/net-im/gicq/pkg-plist @@ -1,6 +1,6 @@ bin/gicq -share/gnome/apps/Applications/gicq.desktop -share/gnome/help/gicq/C/index.html -share/gnome/help/gicq/C/topic.dat -@dirrm share/gnome/help/gicq/C -@dirrm share/gnome/help/gicq +%%GNOME:%%share/gnome/apps/Applications/gicq.desktop +%%DATADIR%%/help/gicq/C/index.html +%%DATADIR%%/help/gicq/C/topic.dat +@dirrm %%DATADIR%%/help/gicq/C +@dirrm %%DATADIR%%/help/gicq diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile index 7a5e6e776000..7c6d698f0fab 100644 --- a/net/gaim-snapshot/Makefile +++ b/net/gaim-snapshot/Makefile @@ -5,44 +5,50 @@ # $FreeBSD$ # -PORTNAME= gaim -PORTVERSION= 0.10.1 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \ -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +PORTNAME= gaim +PORTVERSION= 0.10.1 +PORTREVISION= 1 +CATEGORIES= net +MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= jim@FreeBSD.org +MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +USE_BZIP2= yes +USE_X_PREFIX= yes +USE_GMAKE= yes +USE_GTK= yes +WANT_ESOUND= yes +WANT_GNOME= yes +USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" -.if defined(WITH_GNOME) -LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +MAN1= gaim.1 -GNU_CONFIGURE= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_X_PREFIX= yes -CONFIGURE_ARGS= --disable-esd +.include <bsd.port.pre.mk> -.if defined(WITH_GNOME) -CONFIGURE_ARGS+= --enable-gnome +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--enable-gnome --enable-panel .else -CONFIGURE_ARGS+= --disable-gnome +CONFIGURE_ARGS+=--disable-gnome +.endif +.if defined(HAVE_ESOUND) +USE_ESOUND= yes +CONFIGURE_ARGS+=--enable-esd +.else +CONFIGURE_ARGS+=--disable-esd .endif -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/src/gaim ${PREFIX}/bin - @${MKDIR} ${PREFIX}/share/gaim/pixmaps && ${CHMOD} a+rx ${PREFIX}/share/gaim/pixmaps - @${ECHO} "===> Installing pixmaps" - @${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/share/gaim/pixmaps +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net/gaim-snapshot/files/patch-aa b/net/gaim-snapshot/files/patch-aa new file mode 100644 index 000000000000..e01484100cf3 --- /dev/null +++ b/net/gaim-snapshot/files/patch-aa @@ -0,0 +1,13 @@ +--- Makefile.in.orig Tue Oct 3 03:12:14 2000 ++++ Makefile.in Tue Oct 3 03:13:14 2000 +@@ -156,8 +156,8 @@ + @GNOMEBITS_TRUE@bitssounddir = $(bitssysconf)/sound/events + @GNOMEBITS_TRUE@bitssound_DATA = gaim.soundlist + +-pixmapdir = $(datadir)/apps/Internet +-pixmap_DATA = gaim.desktop ++@GNOMEAPPLET_TRUE@pixmapdir = $(datadir)/apps/Internet ++@GNOMEAPPLET_TRUE@pixmap_DATA = gaim.desktop + + SUBDIRS = m4 libfaim sounds plugins pixmaps doc po intl src + ACLOCAL_AMFLAGS = -I m4 diff --git a/net/gaim-snapshot/files/patch-ab b/net/gaim-snapshot/files/patch-ab new file mode 100644 index 000000000000..716dfc9761b5 --- /dev/null +++ b/net/gaim-snapshot/files/patch-ab @@ -0,0 +1,22 @@ +--- pixmaps/Makefile.in.orig Tue Oct 3 02:42:15 2000 ++++ pixmaps/Makefile.in Tue Oct 3 02:48:38 2000 +@@ -128,8 +128,8 @@ + EXTRA_DIST = about_small.xpm add.xpm add_small.xpm admin_icon.xpm aimicon.xpm aimicon2.xpm angel.xpm aol_icon.xpm away.xpm away_icon.xpm away_small.xpm bgcolor.xpm big.xpm bigsmile.xpm block.xpm bold.xpm bsmile.xpm buddyadd.xpm buddychat.xpm buddydel.xpm burp.xpm cancel.xpm close.xpm close_small.xpm crossedlips.xpm cry.xpm daemon-buddyadd.xpm daemon-buddychat.xpm daemon-buddydel.xpm daemon-im.xpm daemon-info.xpm daemon-permadd.xpm daemon-permdel.xpm daemon.xpm dt_icon.xpm embarrassed.xpm exit_small.xpm export_small.xpm fgcolor.xpm fontface.xpm fontface2.xpm free_icon.xpm gaim.xpm gnome_add.xpm gnome_close.xpm gnome_preferences.xpm gnome_remove.xpm gnome/devil-connect.png gnome/devil-offline.png gnome/devil-online.png gnome/penguin-connect.png gnome/penguin-offline.png gnome/penguin-online.png group.xpm im.xpm import_small.xpm info.xpm italic.xpm join.xpm kiss.xpm link.xpm login_icon.xpm logo.xpm logout_icon.xpm luke03.xpm moneymouth.xpm msg_pending.xpm no_icon.xpm normal.xpm offline.xpm ok.xpm oneeye.xpm online.xpm palette.xpm peng_frown.xpm peng_smile.xpm peng_wink.xpm permadd.xpm permdel.xpm plugins_small.xpm pounce_small.xpm prefs_small.xpm refresh.xpm sad.xpm save.xpm scream.xpm search_small.xpm signing_on.xpm small.xpm smile.xpm smile8.xpm smile_happy.xpm smile_icon.xpm smile_sad.xpm smile_wink.xpm speaker.xpm strike.xpm tb_forward.xpm tb_search.xpm think.xpm tmp_send.xpm tongue.xpm underline.xpm warn.xpm wink.xpm wood.xpm yell.xpm + + +-pixmapdir = $(datadir)/pixmaps +-pixmap_DATA = gaim.xpm ++pixmapdir = $(datadir)/pixmaps/gaim ++pixmap_DATA = $(EXTRA_DIST) + + #gnomesysconf = `@GNOME_CONFIG@ --sysconfdir` + @GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir` +@@ -187,7 +187,7 @@ + + install-pixmapDATA: $(pixmap_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(pixmapdir) ++ $(mkinstalldirs) $(DESTDIR)$(pixmapdir) $(DESTDIR)$(pixmapdir)/gnome + @list='$(pixmap_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \ diff --git a/net/gaim-snapshot/files/patch-ac b/net/gaim-snapshot/files/patch-ac new file mode 100644 index 000000000000..6c5b292aa4ad --- /dev/null +++ b/net/gaim-snapshot/files/patch-ac @@ -0,0 +1,53 @@ +--- src/Makefile.in.orig Tue Oct 3 16:00:11 2000 ++++ src/Makefile.in Tue Oct 3 16:05:56 2000 +@@ -123,12 +123,12 @@ + l = @l@ + perlpath = @perlpath@ + sedpath = @sedpath@ +-@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet ++@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet gaim + @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim +-@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c aim.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gnome_applet_mgr.c gtkhtml.c gtkticker.c html.c idle.c network.c oscar.c perl.c plugins.c prefs.c proxy.c rvous.c server.c sound.c ticker.c toc.c util.c +-@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a +-@GNOMEAPPLET_FALSE@gaim_SOURCES = about.c aim.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gnome_applet_mgr.c gtkhtml.c gtkticker.c html.c idle.c network.c oscar.c perl.c plugins.c prefs.c proxy.c rvous.c server.c sound.c ticker.c toc.c util.c +-@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = ../libfaim/libfaim.a ++gaim_applet_SOURCES = about.c aim.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gnome_applet_mgr.c gtkhtml.c gtkticker.c html.c idle.c network.c oscar.c perl.c plugins.c prefs.c proxy.c rvous.c server.c sound.c ticker.c toc.c util.c ++gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a ++gaim_SOURCES = about.c aim.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gnome_applet_mgr.c gtkhtml.c gtkticker.c html.c idle.c network.c oscar.c perl.c plugins.c prefs.c proxy.c rvous.c server.c sound.c ticker.c toc.c util.c ++gaim_DEPENDENCIES = ../libfaim/libfaim.a + + CFLAGS = @CFLAGS@ -DLOCALEDIR=\"$(prefix)/share/locale\" + +@@ -142,20 +142,20 @@ + DEFS = @DEFS@ -I. -I$(srcdir) -I.. + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ +-@GNOMEAPPLET_TRUE@gaim_applet_OBJECTS = about.o aim.o away.o browser.o \ +-@GNOMEAPPLET_TRUE@buddy.o buddy_chat.o conversation.o dialogs.o \ +-@GNOMEAPPLET_TRUE@gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \ +-@GNOMEAPPLET_TRUE@html.o idle.o network.o oscar.o perl.o plugins.o \ +-@GNOMEAPPLET_TRUE@prefs.o proxy.o rvous.o server.o sound.o ticker.o \ +-@GNOMEAPPLET_TRUE@toc.o util.o ++gaim_applet_OBJECTS = about.o aim.o away.o browser.o \ ++buddy.o buddy_chat.o conversation.o dialogs.o \ ++gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \ ++html.o idle.o network.o oscar.o perl.o plugins.o \ ++prefs.o proxy.o rvous.o server.o sound.o ticker.o \ ++toc.o util.o + gaim_applet_LDADD = $(LDADD) + gaim_applet_LDFLAGS = +-@GNOMEAPPLET_FALSE@gaim_OBJECTS = about.o aim.o away.o browser.o \ +-@GNOMEAPPLET_FALSE@buddy.o buddy_chat.o conversation.o dialogs.o \ +-@GNOMEAPPLET_FALSE@gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \ +-@GNOMEAPPLET_FALSE@html.o idle.o network.o oscar.o perl.o plugins.o \ +-@GNOMEAPPLET_FALSE@prefs.o proxy.o rvous.o server.o sound.o ticker.o \ +-@GNOMEAPPLET_FALSE@toc.o util.o ++gaim_OBJECTS = about.o aim.o away.o browser.o \ ++buddy.o buddy_chat.o conversation.o dialogs.o \ ++gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \ ++html.o idle.o network.o oscar.o perl.o plugins.o \ ++prefs.o proxy.o rvous.o server.o sound.o ticker.o \ ++toc.o util.o + gaim_LDADD = $(LDADD) + gaim_LDFLAGS = + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/net/gaim-snapshot/pkg-plist b/net/gaim-snapshot/pkg-plist index cd47b44d7c0c..604be8cc7416 100644 --- a/net/gaim-snapshot/pkg-plist +++ b/net/gaim-snapshot/pkg-plist @@ -1,104 +1,133 @@ +bin/au2h bin/gaim -share/gaim/pixmaps/about_small.xpm -share/gaim/pixmaps/add.xpm -share/gaim/pixmaps/add_small.xpm -share/gaim/pixmaps/admin_icon.xpm -share/gaim/pixmaps/aimicon.xpm -share/gaim/pixmaps/aimicon2.xpm -share/gaim/pixmaps/angel.xpm -share/gaim/pixmaps/aol_icon.xpm -share/gaim/pixmaps/away.xpm -share/gaim/pixmaps/away_icon.xpm -share/gaim/pixmaps/away_small.xpm -share/gaim/pixmaps/bgcolor.xpm -share/gaim/pixmaps/big.xpm -share/gaim/pixmaps/bigsmile.xpm -share/gaim/pixmaps/block.xpm -share/gaim/pixmaps/bold.xpm -share/gaim/pixmaps/bsmile.xpm -share/gaim/pixmaps/buddyadd.xpm -share/gaim/pixmaps/buddychat.xpm -share/gaim/pixmaps/buddydel.xpm -share/gaim/pixmaps/burp.xpm -share/gaim/pixmaps/cancel.xpm -share/gaim/pixmaps/close.xpm -share/gaim/pixmaps/close_small.xpm -share/gaim/pixmaps/crossedlips.xpm -share/gaim/pixmaps/cry.xpm -share/gaim/pixmaps/daemon-buddyadd.xpm -share/gaim/pixmaps/daemon-buddychat.xpm -share/gaim/pixmaps/daemon-buddydel.xpm -share/gaim/pixmaps/daemon-im.xpm -share/gaim/pixmaps/daemon-info.xpm -share/gaim/pixmaps/daemon-permadd.xpm -share/gaim/pixmaps/daemon-permdel.xpm -share/gaim/pixmaps/daemon.xpm -share/gaim/pixmaps/dt_icon.xpm -share/gaim/pixmaps/embarrassed.xpm -share/gaim/pixmaps/exit_small.xpm -share/gaim/pixmaps/export_small.xpm -share/gaim/pixmaps/fgcolor.xpm -share/gaim/pixmaps/fontface.xpm -share/gaim/pixmaps/fontface2.xpm -share/gaim/pixmaps/free_icon.xpm -share/gaim/pixmaps/gaim.xpm -share/gaim/pixmaps/gnome_add.xpm -share/gaim/pixmaps/gnome_close.xpm -share/gaim/pixmaps/gnome_preferences.xpm -share/gaim/pixmaps/gnome_remove.xpm -share/gaim/pixmaps/group.xpm -share/gaim/pixmaps/im.xpm -share/gaim/pixmaps/import_small.xpm -share/gaim/pixmaps/info.xpm -share/gaim/pixmaps/italic.xpm -share/gaim/pixmaps/join.xpm -share/gaim/pixmaps/kiss.xpm -share/gaim/pixmaps/link.xpm -share/gaim/pixmaps/login_icon.xpm -share/gaim/pixmaps/logo.xpm -share/gaim/pixmaps/logout_icon.xpm -share/gaim/pixmaps/luke03.xpm -share/gaim/pixmaps/moneymouth.xpm -share/gaim/pixmaps/msg_pending.xpm -share/gaim/pixmaps/no_icon.xpm -share/gaim/pixmaps/normal.xpm -share/gaim/pixmaps/offline.xpm -share/gaim/pixmaps/ok.xpm -share/gaim/pixmaps/oneeye.xpm -share/gaim/pixmaps/online.xpm -share/gaim/pixmaps/palette.xpm -share/gaim/pixmaps/peng_frown.xpm -share/gaim/pixmaps/peng_smile.xpm -share/gaim/pixmaps/peng_wink.xpm -share/gaim/pixmaps/permadd.xpm -share/gaim/pixmaps/permdel.xpm -share/gaim/pixmaps/plugins_small.xpm -share/gaim/pixmaps/pounce_small.xpm -share/gaim/pixmaps/prefs_small.xpm -share/gaim/pixmaps/refresh.xpm -share/gaim/pixmaps/sad.xpm -share/gaim/pixmaps/save.xpm -share/gaim/pixmaps/scream.xpm -share/gaim/pixmaps/search_small.xpm -share/gaim/pixmaps/signing_on.xpm -share/gaim/pixmaps/small.xpm -share/gaim/pixmaps/smile.xpm -share/gaim/pixmaps/smile8.xpm -share/gaim/pixmaps/smile_happy.xpm -share/gaim/pixmaps/smile_icon.xpm -share/gaim/pixmaps/smile_sad.xpm -share/gaim/pixmaps/smile_wink.xpm -share/gaim/pixmaps/speaker.xpm -share/gaim/pixmaps/strike.xpm -share/gaim/pixmaps/tb_forward.xpm -share/gaim/pixmaps/tb_search.xpm -share/gaim/pixmaps/think.xpm -share/gaim/pixmaps/tmp_send.xpm -share/gaim/pixmaps/tongue.xpm -share/gaim/pixmaps/underline.xpm -share/gaim/pixmaps/warn.xpm -share/gaim/pixmaps/wink.xpm -share/gaim/pixmaps/wood.xpm -share/gaim/pixmaps/yell.xpm -@dirrm share/gaim/pixmaps -@dirrm share/gaim +%%GNOME:%%bin/gaim_applet +%%GNOME:%%etc/CORBA/servers/gaim_applet.gnorba +%%GNOME:%%etc/sound/events/gaim.soundlist +lib/gaim/autorecon.so +lib/gaim/iconaway.so +lib/gaim/lagmeter.so +lib/gaim/notify.so +lib/gaim/spellchk.so +%%DATADIR%%/pixmaps/gaim/about_small.xpm +%%DATADIR%%/pixmaps/gaim/add.xpm +%%DATADIR%%/pixmaps/gaim/add_small.xpm +%%DATADIR%%/pixmaps/gaim/admin_icon.xpm +%%DATADIR%%/pixmaps/gaim/aimicon.xpm +%%DATADIR%%/pixmaps/gaim/aimicon2.xpm +%%DATADIR%%/pixmaps/gaim/angel.xpm +%%DATADIR%%/pixmaps/gaim/aol_icon.xpm +%%DATADIR%%/pixmaps/gaim/away.xpm +%%DATADIR%%/pixmaps/gaim/away_icon.xpm +%%DATADIR%%/pixmaps/gaim/away_small.xpm +%%DATADIR%%/pixmaps/gaim/bgcolor.xpm +%%DATADIR%%/pixmaps/gaim/big.xpm +%%DATADIR%%/pixmaps/gaim/bigsmile.xpm +%%DATADIR%%/pixmaps/gaim/block.xpm +%%DATADIR%%/pixmaps/gaim/bold.xpm +%%DATADIR%%/pixmaps/gaim/bsmile.xpm +%%DATADIR%%/pixmaps/gaim/buddyadd.xpm +%%DATADIR%%/pixmaps/gaim/buddychat.xpm +%%DATADIR%%/pixmaps/gaim/buddydel.xpm +%%DATADIR%%/pixmaps/gaim/burp.xpm +%%DATADIR%%/pixmaps/gaim/cancel.xpm +%%DATADIR%%/pixmaps/gaim/close.xpm +%%DATADIR%%/pixmaps/gaim/close_small.xpm +%%DATADIR%%/pixmaps/gaim/crossedlips.xpm +%%DATADIR%%/pixmaps/gaim/cry.xpm +%%DATADIR%%/pixmaps/gaim/daemon-buddyadd.xpm +%%DATADIR%%/pixmaps/gaim/daemon-buddychat.xpm +%%DATADIR%%/pixmaps/gaim/daemon-buddydel.xpm +%%DATADIR%%/pixmaps/gaim/daemon-im.xpm +%%DATADIR%%/pixmaps/gaim/daemon-info.xpm +%%DATADIR%%/pixmaps/gaim/daemon-permadd.xpm +%%DATADIR%%/pixmaps/gaim/daemon-permdel.xpm +%%DATADIR%%/pixmaps/gaim/daemon.xpm +%%DATADIR%%/pixmaps/gaim/dt_icon.xpm +%%DATADIR%%/pixmaps/gaim/embarrassed.xpm +%%DATADIR%%/pixmaps/gaim/exit_small.xpm +%%DATADIR%%/pixmaps/gaim/export_small.xpm +%%DATADIR%%/pixmaps/gaim/fgcolor.xpm +%%DATADIR%%/pixmaps/gaim/fontface.xpm +%%DATADIR%%/pixmaps/gaim/fontface2.xpm +%%DATADIR%%/pixmaps/gaim/free_icon.xpm +%%DATADIR%%/pixmaps/gaim/gaim.xpm +%%DATADIR%%/pixmaps/gaim/gnome/devil-connect.png +%%DATADIR%%/pixmaps/gaim/gnome/devil-offline.png +%%DATADIR%%/pixmaps/gaim/gnome/devil-online.png +%%DATADIR%%/pixmaps/gaim/gnome/penguin-connect.png +%%DATADIR%%/pixmaps/gaim/gnome/penguin-offline.png +%%DATADIR%%/pixmaps/gaim/gnome/penguin-online.png +%%DATADIR%%/pixmaps/gaim/gnome_add.xpm +%%DATADIR%%/pixmaps/gaim/gnome_close.xpm +%%DATADIR%%/pixmaps/gaim/gnome_preferences.xpm +%%DATADIR%%/pixmaps/gaim/gnome_remove.xpm +%%DATADIR%%/pixmaps/gaim/group.xpm +%%DATADIR%%/pixmaps/gaim/im.xpm +%%DATADIR%%/pixmaps/gaim/import_small.xpm +%%DATADIR%%/pixmaps/gaim/info.xpm +%%DATADIR%%/pixmaps/gaim/italic.xpm +%%DATADIR%%/pixmaps/gaim/join.xpm +%%DATADIR%%/pixmaps/gaim/kiss.xpm +%%DATADIR%%/pixmaps/gaim/link.xpm +%%DATADIR%%/pixmaps/gaim/login_icon.xpm +%%DATADIR%%/pixmaps/gaim/logo.xpm +%%DATADIR%%/pixmaps/gaim/logout_icon.xpm +%%DATADIR%%/pixmaps/gaim/luke03.xpm +%%DATADIR%%/pixmaps/gaim/moneymouth.xpm +%%DATADIR%%/pixmaps/gaim/msg_pending.xpm +%%DATADIR%%/pixmaps/gaim/no_icon.xpm +%%DATADIR%%/pixmaps/gaim/normal.xpm +%%DATADIR%%/pixmaps/gaim/offline.xpm +%%DATADIR%%/pixmaps/gaim/ok.xpm +%%DATADIR%%/pixmaps/gaim/oneeye.xpm +%%DATADIR%%/pixmaps/gaim/online.xpm +%%DATADIR%%/pixmaps/gaim/palette.xpm +%%DATADIR%%/pixmaps/gaim/peng_frown.xpm +%%DATADIR%%/pixmaps/gaim/peng_smile.xpm +%%DATADIR%%/pixmaps/gaim/peng_wink.xpm +%%DATADIR%%/pixmaps/gaim/permadd.xpm +%%DATADIR%%/pixmaps/gaim/permdel.xpm +%%DATADIR%%/pixmaps/gaim/plugins_small.xpm +%%DATADIR%%/pixmaps/gaim/pounce_small.xpm +%%DATADIR%%/pixmaps/gaim/prefs_small.xpm +%%DATADIR%%/pixmaps/gaim/refresh.xpm +%%DATADIR%%/pixmaps/gaim/sad.xpm +%%DATADIR%%/pixmaps/gaim/save.xpm +%%DATADIR%%/pixmaps/gaim/scream.xpm +%%DATADIR%%/pixmaps/gaim/search_small.xpm +%%DATADIR%%/pixmaps/gaim/signing_on.xpm +%%DATADIR%%/pixmaps/gaim/small.xpm +%%DATADIR%%/pixmaps/gaim/smile.xpm +%%DATADIR%%/pixmaps/gaim/smile8.xpm +%%DATADIR%%/pixmaps/gaim/smile_happy.xpm +%%DATADIR%%/pixmaps/gaim/smile_icon.xpm +%%DATADIR%%/pixmaps/gaim/smile_sad.xpm +%%DATADIR%%/pixmaps/gaim/smile_wink.xpm +%%DATADIR%%/pixmaps/gaim/speaker.xpm +%%DATADIR%%/pixmaps/gaim/strike.xpm +%%DATADIR%%/pixmaps/gaim/tb_forward.xpm +%%DATADIR%%/pixmaps/gaim/tb_search.xpm +%%DATADIR%%/pixmaps/gaim/think.xpm +%%DATADIR%%/pixmaps/gaim/tmp_send.xpm +%%DATADIR%%/pixmaps/gaim/tongue.xpm +%%DATADIR%%/pixmaps/gaim/underline.xpm +%%DATADIR%%/pixmaps/gaim/warn.xpm +%%DATADIR%%/pixmaps/gaim/wink.xpm +%%DATADIR%%/pixmaps/gaim/wood.xpm +%%DATADIR%%/pixmaps/gaim/yell.xpm +%%GNOME:%%share/gnome/applets/Network/gaim_applet.desktop +%%GNOME:%%share/gnome/apps/Internet/gaim.desktop +%%GNOME:%%share/gnome/pixmaps/gaim.xpm +%%GNOME:%%share/gnome/sounds/gaim/BuddyArrive.au +%%GNOME:%%share/gnome/sounds/gaim/BuddyLeave.au +%%GNOME:%%share/gnome/sounds/gaim/Receive.au +%%GNOME:%%share/gnome/sounds/gaim/Send.au +share/locale/de/LC_MESSAGES/gaim.mo +share/locale/es/LC_MESSAGES/gaim.mo +share/locale/fr/LC_MESSAGES/gaim.mo +share/locale/ko/LC_MESSAGES/gaim.mo +share/locale/zh_CN/LC_MESSAGES/gaim.mo +%%GNOME:%%@dirrm share/gnome/sounds/gaim +@dirrm %%DATADIR%%/pixmaps/gaim/gnome +@dirrm %%DATADIR%%/pixmaps/gaim +@dirrm lib/gaim diff --git a/net/gaim/Makefile b/net/gaim/Makefile index 7a5e6e776000..7c6d698f0fab 100644 --- a/net/gaim/Makefile +++ b/net/gaim/Makefile @@ -5,44 +5,50 @@ # $FreeBSD$ # -PORTNAME= gaim -PORTVERSION= 0.10.1 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \ -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +PORTNAME= gaim +PORTVERSION= 0.10.1 +PORTREVISION= 1 +CATEGORIES= net +MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= jim@FreeBSD.org +MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +USE_BZIP2= yes +USE_X_PREFIX= yes +USE_GMAKE= yes +USE_GTK= yes +WANT_ESOUND= yes +WANT_GNOME= yes +USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" -.if defined(WITH_GNOME) -LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +MAN1= gaim.1 -GNU_CONFIGURE= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_X_PREFIX= yes -CONFIGURE_ARGS= --disable-esd +.include <bsd.port.pre.mk> -.if defined(WITH_GNOME) -CONFIGURE_ARGS+= --enable-gnome +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--enable-gnome --enable-panel .else -CONFIGURE_ARGS+= --disable-gnome +CONFIGURE_ARGS+=--disable-gnome +.endif +.if defined(HAVE_ESOUND) +USE_ESOUND= yes +CONFIGURE_ARGS+=--enable-esd +.else +CONFIGURE_ARGS+=--disable-esd .endif -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/src/gaim ${PREFIX}/bin - @${MKDIR} ${PREFIX}/share/gaim/pixmaps && ${CHMOD} a+rx ${PREFIX}/share/gaim/pixmaps - @${ECHO} "===> Installing pixmaps" - @${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/share/gaim/pixmaps +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net/gaim/files/patch-aa b/net/gaim/files/patch-aa new file mode 100644 index 000000000000..e01484100cf3 --- /dev/null +++ b/net/gaim/files/patch-aa @@ -0,0 +1,13 @@ +--- Makefile.in.orig Tue Oct 3 03:12:14 2000 ++++ Makefile.in Tue Oct 3 03:13:14 2000 +@@ -156,8 +156,8 @@ + @GNOMEBITS_TRUE@bitssounddir = $(bitssysconf)/sound/events + @GNOMEBITS_TRUE@bitssound_DATA = gaim.soundlist + +-pixmapdir = $(datadir)/apps/Internet +-pixmap_DATA = gaim.desktop ++@GNOMEAPPLET_TRUE@pixmapdir = $(datadir)/apps/Internet ++@GNOMEAPPLET_TRUE@pixmap_DATA = gaim.desktop + + SUBDIRS = m4 libfaim sounds plugins pixmaps doc po intl src + ACLOCAL_AMFLAGS = -I m4 diff --git a/net/gaim/files/patch-ab b/net/gaim/files/patch-ab new file mode 100644 index 000000000000..716dfc9761b5 --- /dev/null +++ b/net/gaim/files/patch-ab @@ -0,0 +1,22 @@ +--- pixmaps/Makefile.in.orig Tue Oct 3 02:42:15 2000 ++++ pixmaps/Makefile.in Tue Oct 3 02:48:38 2000 +@@ -128,8 +128,8 @@ + EXTRA_DIST = about_small.xpm add.xpm add_small.xpm admin_icon.xpm aimicon.xpm aimicon2.xpm angel.xpm aol_icon.xpm away.xpm away_icon.xpm away_small.xpm bgcolor.xpm big.xpm bigsmile.xpm block.xpm bold.xpm bsmile.xpm buddyadd.xpm buddychat.xpm buddydel.xpm burp.xpm cancel.xpm close.xpm close_small.xpm crossedlips.xpm cry.xpm daemon-buddyadd.xpm daemon-buddychat.xpm daemon-buddydel.xpm daemon-im.xpm daemon-info.xpm daemon-permadd.xpm daemon-permdel.xpm daemon.xpm dt_icon.xpm embarrassed.xpm exit_small.xpm export_small.xpm fgcolor.xpm fontface.xpm fontface2.xpm free_icon.xpm gaim.xpm gnome_add.xpm gnome_close.xpm gnome_preferences.xpm gnome_remove.xpm gnome/devil-connect.png gnome/devil-offline.png gnome/devil-online.png gnome/penguin-connect.png gnome/penguin-offline.png gnome/penguin-online.png group.xpm im.xpm import_small.xpm info.xpm italic.xpm join.xpm kiss.xpm link.xpm login_icon.xpm logo.xpm logout_icon.xpm luke03.xpm moneymouth.xpm msg_pending.xpm no_icon.xpm normal.xpm offline.xpm ok.xpm oneeye.xpm online.xpm palette.xpm peng_frown.xpm peng_smile.xpm peng_wink.xpm permadd.xpm permdel.xpm plugins_small.xpm pounce_small.xpm prefs_small.xpm refresh.xpm sad.xpm save.xpm scream.xpm search_small.xpm signing_on.xpm small.xpm smile.xpm smile8.xpm smile_happy.xpm smile_icon.xpm smile_sad.xpm smile_wink.xpm speaker.xpm strike.xpm tb_forward.xpm tb_search.xpm think.xpm tmp_send.xpm tongue.xpm underline.xpm warn.xpm wink.xpm wood.xpm yell.xpm + + +-pixmapdir = $(datadir)/pixmaps +-pixmap_DATA = gaim.xpm ++pixmapdir = $(datadir)/pixmaps/gaim ++pixmap_DATA = $(EXTRA_DIST) + + #gnomesysconf = `@GNOME_CONFIG@ --sysconfdir` + @GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir` +@@ -187,7 +187,7 @@ + + install-pixmapDATA: $(pixmap_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(pixmapdir) ++ $(mkinstalldirs) $(DESTDIR)$(pixmapdir) $(DESTDIR)$(pixmapdir)/gnome + @list='$(pixmap_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \ diff --git a/net/gaim/files/patch-ac b/net/gaim/files/patch-ac new file mode 100644 index 000000000000..6c5b292aa4ad --- /dev/null +++ b/net/gaim/files/patch-ac @@ -0,0 +1,53 @@ +--- src/Makefile.in.orig Tue Oct 3 16:00:11 2000 ++++ src/Makefile.in Tue Oct 3 16:05:56 2000 +@@ -123,12 +123,12 @@ + l = @l@ + perlpath = @perlpath@ + sedpath = @sedpath@ +-@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet ++@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet gaim + @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim +-@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c aim.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gnome_applet_mgr.c gtkhtml.c gtkticker.c html.c idle.c network.c oscar.c perl.c plugins.c prefs.c proxy.c rvous.c server.c sound.c ticker.c toc.c util.c +-@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a +-@GNOMEAPPLET_FALSE@gaim_SOURCES = about.c aim.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gnome_applet_mgr.c gtkhtml.c gtkticker.c html.c idle.c network.c oscar.c perl.c plugins.c prefs.c proxy.c rvous.c server.c sound.c ticker.c toc.c util.c +-@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = ../libfaim/libfaim.a ++gaim_applet_SOURCES = about.c aim.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gnome_applet_mgr.c gtkhtml.c gtkticker.c html.c idle.c network.c oscar.c perl.c plugins.c prefs.c proxy.c rvous.c server.c sound.c ticker.c toc.c util.c ++gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a ++gaim_SOURCES = about.c aim.c away.c browser.c buddy.c buddy_chat.c conversation.c dialogs.c gaimrc.c gnome_applet_mgr.c gtkhtml.c gtkticker.c html.c idle.c network.c oscar.c perl.c plugins.c prefs.c proxy.c rvous.c server.c sound.c ticker.c toc.c util.c ++gaim_DEPENDENCIES = ../libfaim/libfaim.a + + CFLAGS = @CFLAGS@ -DLOCALEDIR=\"$(prefix)/share/locale\" + +@@ -142,20 +142,20 @@ + DEFS = @DEFS@ -I. -I$(srcdir) -I.. + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ +-@GNOMEAPPLET_TRUE@gaim_applet_OBJECTS = about.o aim.o away.o browser.o \ +-@GNOMEAPPLET_TRUE@buddy.o buddy_chat.o conversation.o dialogs.o \ +-@GNOMEAPPLET_TRUE@gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \ +-@GNOMEAPPLET_TRUE@html.o idle.o network.o oscar.o perl.o plugins.o \ +-@GNOMEAPPLET_TRUE@prefs.o proxy.o rvous.o server.o sound.o ticker.o \ +-@GNOMEAPPLET_TRUE@toc.o util.o ++gaim_applet_OBJECTS = about.o aim.o away.o browser.o \ ++buddy.o buddy_chat.o conversation.o dialogs.o \ ++gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \ ++html.o idle.o network.o oscar.o perl.o plugins.o \ ++prefs.o proxy.o rvous.o server.o sound.o ticker.o \ ++toc.o util.o + gaim_applet_LDADD = $(LDADD) + gaim_applet_LDFLAGS = +-@GNOMEAPPLET_FALSE@gaim_OBJECTS = about.o aim.o away.o browser.o \ +-@GNOMEAPPLET_FALSE@buddy.o buddy_chat.o conversation.o dialogs.o \ +-@GNOMEAPPLET_FALSE@gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \ +-@GNOMEAPPLET_FALSE@html.o idle.o network.o oscar.o perl.o plugins.o \ +-@GNOMEAPPLET_FALSE@prefs.o proxy.o rvous.o server.o sound.o ticker.o \ +-@GNOMEAPPLET_FALSE@toc.o util.o ++gaim_OBJECTS = about.o aim.o away.o browser.o \ ++buddy.o buddy_chat.o conversation.o dialogs.o \ ++gaimrc.o gnome_applet_mgr.o gtkhtml.o gtkticker.o \ ++html.o idle.o network.o oscar.o perl.o plugins.o \ ++prefs.o proxy.o rvous.o server.o sound.o ticker.o \ ++toc.o util.o + gaim_LDADD = $(LDADD) + gaim_LDFLAGS = + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist index cd47b44d7c0c..604be8cc7416 100644 --- a/net/gaim/pkg-plist +++ b/net/gaim/pkg-plist @@ -1,104 +1,133 @@ +bin/au2h bin/gaim -share/gaim/pixmaps/about_small.xpm -share/gaim/pixmaps/add.xpm -share/gaim/pixmaps/add_small.xpm -share/gaim/pixmaps/admin_icon.xpm -share/gaim/pixmaps/aimicon.xpm -share/gaim/pixmaps/aimicon2.xpm -share/gaim/pixmaps/angel.xpm -share/gaim/pixmaps/aol_icon.xpm -share/gaim/pixmaps/away.xpm -share/gaim/pixmaps/away_icon.xpm -share/gaim/pixmaps/away_small.xpm -share/gaim/pixmaps/bgcolor.xpm -share/gaim/pixmaps/big.xpm -share/gaim/pixmaps/bigsmile.xpm -share/gaim/pixmaps/block.xpm -share/gaim/pixmaps/bold.xpm -share/gaim/pixmaps/bsmile.xpm -share/gaim/pixmaps/buddyadd.xpm -share/gaim/pixmaps/buddychat.xpm -share/gaim/pixmaps/buddydel.xpm -share/gaim/pixmaps/burp.xpm -share/gaim/pixmaps/cancel.xpm -share/gaim/pixmaps/close.xpm -share/gaim/pixmaps/close_small.xpm -share/gaim/pixmaps/crossedlips.xpm -share/gaim/pixmaps/cry.xpm -share/gaim/pixmaps/daemon-buddyadd.xpm -share/gaim/pixmaps/daemon-buddychat.xpm -share/gaim/pixmaps/daemon-buddydel.xpm -share/gaim/pixmaps/daemon-im.xpm -share/gaim/pixmaps/daemon-info.xpm -share/gaim/pixmaps/daemon-permadd.xpm -share/gaim/pixmaps/daemon-permdel.xpm -share/gaim/pixmaps/daemon.xpm -share/gaim/pixmaps/dt_icon.xpm -share/gaim/pixmaps/embarrassed.xpm -share/gaim/pixmaps/exit_small.xpm -share/gaim/pixmaps/export_small.xpm -share/gaim/pixmaps/fgcolor.xpm -share/gaim/pixmaps/fontface.xpm -share/gaim/pixmaps/fontface2.xpm -share/gaim/pixmaps/free_icon.xpm -share/gaim/pixmaps/gaim.xpm -share/gaim/pixmaps/gnome_add.xpm -share/gaim/pixmaps/gnome_close.xpm -share/gaim/pixmaps/gnome_preferences.xpm -share/gaim/pixmaps/gnome_remove.xpm -share/gaim/pixmaps/group.xpm -share/gaim/pixmaps/im.xpm -share/gaim/pixmaps/import_small.xpm -share/gaim/pixmaps/info.xpm -share/gaim/pixmaps/italic.xpm -share/gaim/pixmaps/join.xpm -share/gaim/pixmaps/kiss.xpm -share/gaim/pixmaps/link.xpm -share/gaim/pixmaps/login_icon.xpm -share/gaim/pixmaps/logo.xpm -share/gaim/pixmaps/logout_icon.xpm -share/gaim/pixmaps/luke03.xpm -share/gaim/pixmaps/moneymouth.xpm -share/gaim/pixmaps/msg_pending.xpm -share/gaim/pixmaps/no_icon.xpm -share/gaim/pixmaps/normal.xpm -share/gaim/pixmaps/offline.xpm -share/gaim/pixmaps/ok.xpm -share/gaim/pixmaps/oneeye.xpm -share/gaim/pixmaps/online.xpm -share/gaim/pixmaps/palette.xpm -share/gaim/pixmaps/peng_frown.xpm -share/gaim/pixmaps/peng_smile.xpm -share/gaim/pixmaps/peng_wink.xpm -share/gaim/pixmaps/permadd.xpm -share/gaim/pixmaps/permdel.xpm -share/gaim/pixmaps/plugins_small.xpm -share/gaim/pixmaps/pounce_small.xpm -share/gaim/pixmaps/prefs_small.xpm -share/gaim/pixmaps/refresh.xpm -share/gaim/pixmaps/sad.xpm -share/gaim/pixmaps/save.xpm -share/gaim/pixmaps/scream.xpm -share/gaim/pixmaps/search_small.xpm -share/gaim/pixmaps/signing_on.xpm -share/gaim/pixmaps/small.xpm -share/gaim/pixmaps/smile.xpm -share/gaim/pixmaps/smile8.xpm -share/gaim/pixmaps/smile_happy.xpm -share/gaim/pixmaps/smile_icon.xpm -share/gaim/pixmaps/smile_sad.xpm -share/gaim/pixmaps/smile_wink.xpm -share/gaim/pixmaps/speaker.xpm -share/gaim/pixmaps/strike.xpm -share/gaim/pixmaps/tb_forward.xpm -share/gaim/pixmaps/tb_search.xpm -share/gaim/pixmaps/think.xpm -share/gaim/pixmaps/tmp_send.xpm -share/gaim/pixmaps/tongue.xpm -share/gaim/pixmaps/underline.xpm -share/gaim/pixmaps/warn.xpm -share/gaim/pixmaps/wink.xpm -share/gaim/pixmaps/wood.xpm -share/gaim/pixmaps/yell.xpm -@dirrm share/gaim/pixmaps -@dirrm share/gaim +%%GNOME:%%bin/gaim_applet +%%GNOME:%%etc/CORBA/servers/gaim_applet.gnorba +%%GNOME:%%etc/sound/events/gaim.soundlist +lib/gaim/autorecon.so +lib/gaim/iconaway.so +lib/gaim/lagmeter.so +lib/gaim/notify.so +lib/gaim/spellchk.so +%%DATADIR%%/pixmaps/gaim/about_small.xpm +%%DATADIR%%/pixmaps/gaim/add.xpm +%%DATADIR%%/pixmaps/gaim/add_small.xpm +%%DATADIR%%/pixmaps/gaim/admin_icon.xpm +%%DATADIR%%/pixmaps/gaim/aimicon.xpm +%%DATADIR%%/pixmaps/gaim/aimicon2.xpm +%%DATADIR%%/pixmaps/gaim/angel.xpm +%%DATADIR%%/pixmaps/gaim/aol_icon.xpm +%%DATADIR%%/pixmaps/gaim/away.xpm +%%DATADIR%%/pixmaps/gaim/away_icon.xpm +%%DATADIR%%/pixmaps/gaim/away_small.xpm +%%DATADIR%%/pixmaps/gaim/bgcolor.xpm +%%DATADIR%%/pixmaps/gaim/big.xpm +%%DATADIR%%/pixmaps/gaim/bigsmile.xpm +%%DATADIR%%/pixmaps/gaim/block.xpm +%%DATADIR%%/pixmaps/gaim/bold.xpm +%%DATADIR%%/pixmaps/gaim/bsmile.xpm +%%DATADIR%%/pixmaps/gaim/buddyadd.xpm +%%DATADIR%%/pixmaps/gaim/buddychat.xpm +%%DATADIR%%/pixmaps/gaim/buddydel.xpm +%%DATADIR%%/pixmaps/gaim/burp.xpm +%%DATADIR%%/pixmaps/gaim/cancel.xpm +%%DATADIR%%/pixmaps/gaim/close.xpm +%%DATADIR%%/pixmaps/gaim/close_small.xpm +%%DATADIR%%/pixmaps/gaim/crossedlips.xpm +%%DATADIR%%/pixmaps/gaim/cry.xpm +%%DATADIR%%/pixmaps/gaim/daemon-buddyadd.xpm +%%DATADIR%%/pixmaps/gaim/daemon-buddychat.xpm +%%DATADIR%%/pixmaps/gaim/daemon-buddydel.xpm +%%DATADIR%%/pixmaps/gaim/daemon-im.xpm +%%DATADIR%%/pixmaps/gaim/daemon-info.xpm +%%DATADIR%%/pixmaps/gaim/daemon-permadd.xpm +%%DATADIR%%/pixmaps/gaim/daemon-permdel.xpm +%%DATADIR%%/pixmaps/gaim/daemon.xpm +%%DATADIR%%/pixmaps/gaim/dt_icon.xpm +%%DATADIR%%/pixmaps/gaim/embarrassed.xpm +%%DATADIR%%/pixmaps/gaim/exit_small.xpm +%%DATADIR%%/pixmaps/gaim/export_small.xpm +%%DATADIR%%/pixmaps/gaim/fgcolor.xpm +%%DATADIR%%/pixmaps/gaim/fontface.xpm +%%DATADIR%%/pixmaps/gaim/fontface2.xpm +%%DATADIR%%/pixmaps/gaim/free_icon.xpm +%%DATADIR%%/pixmaps/gaim/gaim.xpm +%%DATADIR%%/pixmaps/gaim/gnome/devil-connect.png +%%DATADIR%%/pixmaps/gaim/gnome/devil-offline.png +%%DATADIR%%/pixmaps/gaim/gnome/devil-online.png +%%DATADIR%%/pixmaps/gaim/gnome/penguin-connect.png +%%DATADIR%%/pixmaps/gaim/gnome/penguin-offline.png +%%DATADIR%%/pixmaps/gaim/gnome/penguin-online.png +%%DATADIR%%/pixmaps/gaim/gnome_add.xpm +%%DATADIR%%/pixmaps/gaim/gnome_close.xpm +%%DATADIR%%/pixmaps/gaim/gnome_preferences.xpm +%%DATADIR%%/pixmaps/gaim/gnome_remove.xpm +%%DATADIR%%/pixmaps/gaim/group.xpm +%%DATADIR%%/pixmaps/gaim/im.xpm +%%DATADIR%%/pixmaps/gaim/import_small.xpm +%%DATADIR%%/pixmaps/gaim/info.xpm +%%DATADIR%%/pixmaps/gaim/italic.xpm +%%DATADIR%%/pixmaps/gaim/join.xpm +%%DATADIR%%/pixmaps/gaim/kiss.xpm +%%DATADIR%%/pixmaps/gaim/link.xpm +%%DATADIR%%/pixmaps/gaim/login_icon.xpm +%%DATADIR%%/pixmaps/gaim/logo.xpm +%%DATADIR%%/pixmaps/gaim/logout_icon.xpm +%%DATADIR%%/pixmaps/gaim/luke03.xpm +%%DATADIR%%/pixmaps/gaim/moneymouth.xpm +%%DATADIR%%/pixmaps/gaim/msg_pending.xpm +%%DATADIR%%/pixmaps/gaim/no_icon.xpm +%%DATADIR%%/pixmaps/gaim/normal.xpm +%%DATADIR%%/pixmaps/gaim/offline.xpm +%%DATADIR%%/pixmaps/gaim/ok.xpm +%%DATADIR%%/pixmaps/gaim/oneeye.xpm +%%DATADIR%%/pixmaps/gaim/online.xpm +%%DATADIR%%/pixmaps/gaim/palette.xpm +%%DATADIR%%/pixmaps/gaim/peng_frown.xpm +%%DATADIR%%/pixmaps/gaim/peng_smile.xpm +%%DATADIR%%/pixmaps/gaim/peng_wink.xpm +%%DATADIR%%/pixmaps/gaim/permadd.xpm +%%DATADIR%%/pixmaps/gaim/permdel.xpm +%%DATADIR%%/pixmaps/gaim/plugins_small.xpm +%%DATADIR%%/pixmaps/gaim/pounce_small.xpm +%%DATADIR%%/pixmaps/gaim/prefs_small.xpm +%%DATADIR%%/pixmaps/gaim/refresh.xpm +%%DATADIR%%/pixmaps/gaim/sad.xpm +%%DATADIR%%/pixmaps/gaim/save.xpm +%%DATADIR%%/pixmaps/gaim/scream.xpm +%%DATADIR%%/pixmaps/gaim/search_small.xpm +%%DATADIR%%/pixmaps/gaim/signing_on.xpm +%%DATADIR%%/pixmaps/gaim/small.xpm +%%DATADIR%%/pixmaps/gaim/smile.xpm +%%DATADIR%%/pixmaps/gaim/smile8.xpm +%%DATADIR%%/pixmaps/gaim/smile_happy.xpm +%%DATADIR%%/pixmaps/gaim/smile_icon.xpm +%%DATADIR%%/pixmaps/gaim/smile_sad.xpm +%%DATADIR%%/pixmaps/gaim/smile_wink.xpm +%%DATADIR%%/pixmaps/gaim/speaker.xpm +%%DATADIR%%/pixmaps/gaim/strike.xpm +%%DATADIR%%/pixmaps/gaim/tb_forward.xpm +%%DATADIR%%/pixmaps/gaim/tb_search.xpm +%%DATADIR%%/pixmaps/gaim/think.xpm +%%DATADIR%%/pixmaps/gaim/tmp_send.xpm +%%DATADIR%%/pixmaps/gaim/tongue.xpm +%%DATADIR%%/pixmaps/gaim/underline.xpm +%%DATADIR%%/pixmaps/gaim/warn.xpm +%%DATADIR%%/pixmaps/gaim/wink.xpm +%%DATADIR%%/pixmaps/gaim/wood.xpm +%%DATADIR%%/pixmaps/gaim/yell.xpm +%%GNOME:%%share/gnome/applets/Network/gaim_applet.desktop +%%GNOME:%%share/gnome/apps/Internet/gaim.desktop +%%GNOME:%%share/gnome/pixmaps/gaim.xpm +%%GNOME:%%share/gnome/sounds/gaim/BuddyArrive.au +%%GNOME:%%share/gnome/sounds/gaim/BuddyLeave.au +%%GNOME:%%share/gnome/sounds/gaim/Receive.au +%%GNOME:%%share/gnome/sounds/gaim/Send.au +share/locale/de/LC_MESSAGES/gaim.mo +share/locale/es/LC_MESSAGES/gaim.mo +share/locale/fr/LC_MESSAGES/gaim.mo +share/locale/ko/LC_MESSAGES/gaim.mo +share/locale/zh_CN/LC_MESSAGES/gaim.mo +%%GNOME:%%@dirrm share/gnome/sounds/gaim +@dirrm %%DATADIR%%/pixmaps/gaim/gnome +@dirrm %%DATADIR%%/pixmaps/gaim +@dirrm lib/gaim diff --git a/net/gicq/Makefile b/net/gicq/Makefile index e51496425fda..c51c4e9ec43d 100644 --- a/net/gicq/Makefile +++ b/net/gicq/Makefile @@ -14,18 +14,30 @@ MASTER_SITE_SUBDIR= flathill MAINTAINER= flathill@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - icq.0:${PORTSDIR}/net/libicq - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= icq.0:${PORTSDIR}/net/libicq USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-gnome --disable-nls +USE_GTK= yes +WANT_GNOME= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +.else +CONFIGURE_ARGS+=--without-gnome +.endif + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' + +.include <bsd.port.post.mk> diff --git a/net/gicq/files/patch-ac b/net/gicq/files/patch-ac new file mode 100644 index 000000000000..92a26e88bd61 --- /dev/null +++ b/net/gicq/files/patch-ac @@ -0,0 +1,13 @@ +--- Makefile.in.orig Mon Sep 6 23:36:43 1999 ++++ Makefile.in Mon Sep 6 23:37:18 1999 +@@ -116,8 +116,10 @@ + + SUBDIRS = macros intl po pixmaps src doc + ++.ifdef HAVE_GNOME + sysdir = $(datadir)/apps/Applications + sys_DATA = gicq.desktop ++.endif + + EXTRA_DIST = gicq.desktop + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/net/gicq/pkg-plist b/net/gicq/pkg-plist index ec71b337f897..67b051623192 100644 --- a/net/gicq/pkg-plist +++ b/net/gicq/pkg-plist @@ -1,6 +1,6 @@ bin/gicq -share/gnome/apps/Applications/gicq.desktop -share/gnome/help/gicq/C/index.html -share/gnome/help/gicq/C/topic.dat -@dirrm share/gnome/help/gicq/C -@dirrm share/gnome/help/gicq +%%GNOME:%%share/gnome/apps/Applications/gicq.desktop +%%DATADIR%%/help/gicq/C/index.html +%%DATADIR%%/help/gicq/C/topic.dat +@dirrm %%DATADIR%%/help/gicq/C +@dirrm %%DATADIR%%/help/gicq diff --git a/sysutils/guitar/Makefile b/sysutils/guitar/Makefile index 46c45278a7a4..f0e181c22c7d 100644 --- a/sysutils/guitar/Makefile +++ b/sysutils/guitar/Makefile @@ -13,23 +13,22 @@ MASTER_SITES= http://disq.bir.net.tr/guitar/ \ MAINTAINER= domi@saargate.de -LIB_DEPENDS= gtk12.3:${PORTSDIR}/x11-toolkits/gtk12 - USE_GMAKE= yes USE_X_PREFIX= yes +USE_GTK= yes +WANT_GNOME= yes GNU_CONFIGURE= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" +.include <bsd.port.pre.mk> -.if defined(NO_GNOME) -CONFIGURE_ARGS += --disable-gnome +.if defined(HAVE_GNOME) +USE_GNOME= yes .else -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs +CONFIGURE_ARGS+=--disable-gnome .endif do-install: - @ ${INSTALL_PROGRAM} ${WRKSRC}/src/guitar ${PREFIX}/bin - @ ${INSTALL_SCRIPT} ${SCRIPTDIR}/bsdtar2gnutar ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/guitar ${PREFIX}/bin + ${INSTALL_SCRIPT} ${SCRIPTDIR}/bsdtar2gnutar ${PREFIX}/bin -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/ipsc/Makefile b/sysutils/ipsc/Makefile index 2fc1a2e8641e..cd8ead0cd169 100644 --- a/sysutils/ipsc/Makefile +++ b/sysutils/ipsc/Makefile @@ -9,43 +9,34 @@ PORTNAME= ipsc PORTVERSION= 0.4.2 CATEGORIES= sysutils gnome MASTER_SITES= http://ipsc.sourceforge.net/dist/ipsc/ -DISTNAME= ${PKGNAME}-src +DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= jeremy@external.org BUILD_DEPENDS= ${WRKDIRPREFIX}${PORTSDIR}/sysutils/prips/work/prips/prips.o:${PORTSDIR}/sysutils/prips:build -.if defined(WITH_GNOME) -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif -.if defined(WITH_GNOME) -USE_XLIB= YES -.endif WRKSRC= ${WRKDIR}/ipsc/src -post-extract: - @${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../prips/work/prips \ - ${WRKDIR}/prips +WANT_GNOME= yes -pre-build: -.if defined(WITH_GNOME) -PLIST= ${PKGDIR}/PLIST.gnome +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_X_PREFIX= yes +USE_GNOME= yes ALL_TARGET= all .else ALL_TARGET= ipsc .endif -post-build: -.if defined(WITH_GNOME) - @${ECHO_MSG} "" - @${ECHO_MSG} "Don't forget to define WITH_GNOME when installing" - @${ECHO_MSG} "" -.endif +post-extract: + @${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../prips/work/prips \ + ${WRKDIR}/prips do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/ipsc ${PREFIX}/bin -.if defined(WITH_GNOME) - @${INSTALL_PROGRAM} ${WRKSRC}/gipsc ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/ipsc ${PREFIX}/bin +.if defined(HAVE_GNOME) + ${INSTALL_PROGRAM} ${WRKSRC}/gipsc ${PREFIX}/bin .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/ipsc/pkg-plist b/sysutils/ipsc/pkg-plist index c0fc224ade20..5921d23e46cd 100644 --- a/sysutils/ipsc/pkg-plist +++ b/sysutils/ipsc/pkg-plist @@ -1 +1,2 @@ bin/ipsc +%%GNOME:%%bin/gipsc diff --git a/x11-toolkits/rep-gtk/Makefile b/x11-toolkits/rep-gtk/Makefile index 4d4768ca4906..8cabca1d70a2 100644 --- a/x11-toolkits/rep-gtk/Makefile +++ b/x11-toolkits/rep-gtk/Makefile @@ -14,34 +14,27 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - rep.10:${PORTSDIR}/lang/librep -.if !defined(WITHOUT_GNOME) -LIB_DEPENDS+= glade.4:${PORTSDIR}/devel/libglade \ - gnome.4:${PORTSDIR}/x11/gnomelibs \ - gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf -.endif - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +LIB_DEPENDS= rep.10:${PORTSDIR}/lang/librep PLIST_SUB= GNUHOST=${ARCH}--freebsd${OSREL} USE_X_PREFIX= yes USE_GMAKE= yes +USE_GTK= yes +WANT_GNOME= yes GNU_CONFIGURE= yes -.if defined(WITHOUT_GNOME) -CONFIGURE_ARGS= --without-libglade --without-gnome --without-gdk-pixbuf \ - --without-gnome-canvas-pixbuf -PLIST_SUB+= GNOME:="@comment " -.else +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" + +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +LIB_DEPENDS+= glade.4:${PORTSDIR}/devel/libglade CONFIGURE_ARGS= --with-gnome --with-libglade --with-gdk-pixbuf \ --with-gnome-canvas-pixbuf -PLIST_SUB+= GNOME:="" +.else +CONFIGURE_ARGS= --without-libglade --without-gnome --without-gdk-pixbuf \ + --without-gnome-canvas-pixbuf .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - LIBS="-L${LOCALBASE}/lib" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile index 4d4768ca4906..8cabca1d70a2 100644 --- a/x11-toolkits/rep-gtk2/Makefile +++ b/x11-toolkits/rep-gtk2/Makefile @@ -14,34 +14,27 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - rep.10:${PORTSDIR}/lang/librep -.if !defined(WITHOUT_GNOME) -LIB_DEPENDS+= glade.4:${PORTSDIR}/devel/libglade \ - gnome.4:${PORTSDIR}/x11/gnomelibs \ - gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf -.endif - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +LIB_DEPENDS= rep.10:${PORTSDIR}/lang/librep PLIST_SUB= GNUHOST=${ARCH}--freebsd${OSREL} USE_X_PREFIX= yes USE_GMAKE= yes +USE_GTK= yes +WANT_GNOME= yes GNU_CONFIGURE= yes -.if defined(WITHOUT_GNOME) -CONFIGURE_ARGS= --without-libglade --without-gnome --without-gdk-pixbuf \ - --without-gnome-canvas-pixbuf -PLIST_SUB+= GNOME:="@comment " -.else +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" + +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +LIB_DEPENDS+= glade.4:${PORTSDIR}/devel/libglade CONFIGURE_ARGS= --with-gnome --with-libglade --with-gdk-pixbuf \ --with-gnome-canvas-pixbuf -PLIST_SUB+= GNOME:="" +.else +CONFIGURE_ARGS= --without-libglade --without-gnome --without-gdk-pixbuf \ + --without-gnome-canvas-pixbuf .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - LIBS="-L${LOCALBASE}/lib" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile index ef2487324a6e..7a61bba5a5d6 100644 --- a/x11-toolkits/vdk/Makefile +++ b/x11-toolkits/vdk/Makefile @@ -12,18 +12,22 @@ MASTER_SITES= http://download.sourceforge.net/vdkbuilder/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_NEWGCC= yes USE_X_PREFIX= yes +USE_GTK= yes +WANT_GNOME= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= vdk-config.1 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+= --enable-gnome +.endif + +.include <bsd.port.post.mk> diff --git a/x11-toolkits/vdk/files/patch-aa b/x11-toolkits/vdk/files/patch-aa new file mode 100644 index 000000000000..5e288ffe0cbf --- /dev/null +++ b/x11-toolkits/vdk/files/patch-aa @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sun Feb 27 20:55:41 2000 ++++ Makefile.in Sun Feb 27 20:55:56 2000 +@@ -129,7 +129,7 @@ + EXTRA_DIST = autogen.sh configure aclocal.m4 BUGS + + +-m4datadir = $(datadir)/aclocal ++m4datadir = $(prefix)/share/aclocal + m4data_DATA = vdk.m4 + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/x11-toolkits/vdk/pkg-plist b/x11-toolkits/vdk/pkg-plist index 8ea69586fe80..60b8a0e218cc 100644 --- a/x11-toolkits/vdk/pkg-plist +++ b/x11-toolkits/vdk/pkg-plist @@ -104,15 +104,12 @@ include/vdk/vdktypes.h include/vdk/vdkutils.h include/vdk/widcontain.h lib/libvdk.a -lib/libvdk.la lib/libvdk.so lib/libvdk.so.3 lib/libvdkcompo.a -lib/libvdkcompo.la lib/libvdkcompo.so lib/libvdkcompo.so.3 lib/libvdkgnome.a -lib/libvdkgnome.la lib/libvdkgnome.so lib/libvdkgnome.so.3 share/aclocal/vdk.m4 diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile index 722e3123c988..98f6115b35e8 100644 --- a/x11-toolkits/vdkbuilder/Makefile +++ b/x11-toolkits/vdkbuilder/Makefile @@ -14,15 +14,23 @@ MAINTAINER= nakai@FreeBSD.org LIB_DEPENDS= vdk.3:${PORTSDIR}/x11-toolkits/vdk -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_NEWGCC= yes USE_GMAKE= yes USE_X_PREFIX= yes +USE_GTK= yes +WANT_GNOME= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib -lgnuregex" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--enable-gnome +.else +CONFIGURE_ARGS+=--enable-gnome=no +.endif + +.include <bsd.port.post.mk> diff --git a/x11-toolkits/vdkbuilder/pkg-plist b/x11-toolkits/vdkbuilder/pkg-plist index 858b07971d1a..8ca1c1e0f70c 100644 --- a/x11-toolkits/vdkbuilder/pkg-plist +++ b/x11-toolkits/vdkbuilder/pkg-plist @@ -112,72 +112,67 @@ include/vdkb/vdksynted.h include/vdkb/vdkxpmbrowser.h include/vdkb/waitcursor.h lib/libvdkbcalendar.a -lib/libvdkbcalendar.la lib/libvdkbcalendar.so lib/libvdkbcalendar.so.0 lib/libvdkbdatabox.a -lib/libvdkbdatabox.la lib/libvdkbdatabox.so lib/libvdkbdatabox.so.1 lib/libvdkbdclock.a -lib/libvdkbdclock.la lib/libvdkbdclock.so lib/libvdkbdclock.so.0 lib/libvdkcalendar.a -lib/libvdkcalendar.la lib/libvdkcalendar.so lib/libvdkcalendar.so.1 lib/libvdkdclock.a -lib/libvdkdclock.la lib/libvdkdclock.so lib/libvdkdclock.so.1 +share/gnome/pixmaps/vdkb.png +%%DATADIR%%/vdkb/res/AUTHORS +%%DATADIR%%/vdkb/res/COPYING +%%DATADIR%%/vdkb/res/ChangeLog +%%DATADIR%%/vdkb/res/INSTALL +%%DATADIR%%/vdkb/res/NEWS +%%DATADIR%%/vdkb/res/README +%%DATADIR%%/vdkb/res/autogen.sh +%%DATADIR%%/vdkb/res/cpphints +%%DATADIR%%/vdkb/res/desk.gif +%%DATADIR%%/vdkb/res/filedlg.gif +%%DATADIR%%/vdkb/res/fixed.gif +%%DATADIR%%/vdkb/res/index.htm +%%DATADIR%%/vdkb/res/logo.gif +%%DATADIR%%/vdkb/res/logo.xpm +%%DATADIR%%/vdkb/res/newprj.gif +%%DATADIR%%/vdkb/res/plugins.db +%%DATADIR%%/vdkb/res/prjman.gif +%%DATADIR%%/vdkb/res/prjwiz.gif +%%DATADIR%%/vdkb/res/refindex.htm +%%DATADIR%%/vdkb/res/run.gif +%%DATADIR%%/vdkb/res/saveprj.gif +%%DATADIR%%/vdkb/res/step1.0.gif +%%DATADIR%%/vdkb/res/step2.gif +%%DATADIR%%/vdkb/res/step3.gif +%%DATADIR%%/vdkb/res/tokens.db +%%DATADIR%%/vdkb/res/tutor1.htm +%%DATADIR%%/vdkb/res/tutor2.htm +%%DATADIR%%/vdkb/res/tutor3.htm +%%DATADIR%%/vdkb/res/tutor4.htm +%%DATADIR%%/vdkb/res/vdkapp.htm +%%DATADIR%%/vdkb/res/vdkb.png +%%DATADIR%%/vdkb/res/vdkbide.defaults +%%DATADIR%%/vdkb/res/vdkbmaker.gif +%%DATADIR%%/vdkb/res/vdkbrc +%%DATADIR%%/vdkb/res/vdkcanvas.htm +%%DATADIR%%/vdkb/res/vdkchkbut.htm +%%DATADIR%%/vdkb/res/vdkform.htm +%%DATADIR%%/vdkb/res/vdklogo.gif +%%DATADIR%%/vdkb/res/vdkobjcont.htm +%%DATADIR%%/vdkb/res/vdkobject.htm +%%DATADIR%%/vdkb/res/vdkpaned.htm +%%DATADIR%%/vdkb/res/vdkscrolled.htm +%%DATADIR%%/vdkb/res/wi1.gif share/locale/da/LC_MESSAGES/vdkbuilder.mo share/locale/de/LC_MESSAGES/vdkbuilder.mo share/locale/it/LC_MESSAGES/vdkbuilder.mo -share/pixmaps/vdkb.png -share/vdkb/res/AUTHORS -share/vdkb/res/COPYING -share/vdkb/res/ChangeLog -share/vdkb/res/INSTALL -share/vdkb/res/NEWS -share/vdkb/res/README -share/vdkb/res/autogen.sh -share/vdkb/res/cpphints -share/vdkb/res/desk.gif -share/vdkb/res/filedlg.gif -share/vdkb/res/fixed.gif -share/vdkb/res/index.htm -share/vdkb/res/logo.gif -share/vdkb/res/logo.xpm -share/vdkb/res/newprj.gif -share/vdkb/res/plugins.db -share/vdkb/res/prjman.gif -share/vdkb/res/prjwiz.gif -share/vdkb/res/refindex.htm -share/vdkb/res/run.gif -share/vdkb/res/saveprj.gif -share/vdkb/res/step1.0.gif -share/vdkb/res/step2.gif -share/vdkb/res/step3.gif -share/vdkb/res/tokens.db -share/vdkb/res/tutor1.htm -share/vdkb/res/tutor2.htm -share/vdkb/res/tutor3.htm -share/vdkb/res/tutor4.htm -share/vdkb/res/vdkapp.htm -share/vdkb/res/vdkb.png -share/vdkb/res/vdkbide.defaults -share/vdkb/res/vdkbmaker.gif -share/vdkb/res/vdkbrc -share/vdkb/res/vdkcanvas.htm -share/vdkb/res/vdkchkbut.htm -share/vdkb/res/vdkform.htm -share/vdkb/res/vdklogo.gif -share/vdkb/res/vdkobjcont.htm -share/vdkb/res/vdkobject.htm -share/vdkb/res/vdkpaned.htm -share/vdkb/res/vdkscrolled.htm -share/vdkb/res/wi1.gif +@dirrm %%DATADIR%%/vdkb/res +@dirrm %%DATADIR%%/vdkb @dirrm include/vdkb -@dirrm share/vdkb/res -@dirrm share/vdkb diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile index 5d841c6e80b0..60fb9dce3397 100644 --- a/x11-wm/sawfish/Makefile +++ b/x11-wm/sawfish/Makefile @@ -13,41 +13,44 @@ MASTER_SITE_SUBDIR= sawmill MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - Imlib.5:${PORTSDIR}/graphics/imlib \ - rep.10:${PORTSDIR}/lang/librep -.if !defined(WITHOUT_GNOME) -LIB_DEPENDS+= capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter -.endif +LIB_DEPENDS= rep.10:${PORTSDIR}/lang/librep BUILD_DEPENDS= ${X11BASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk RUN_DEPENDS= ${X11BASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - PLIST_SUB= GNUHOST=${ARCH}--freebsd${OSREL} VERSION=${PORTVERSION} USE_X_PREFIX= yes USE_GMAKE= yes +USE_IMLIB= yes +WANT_GNOME= yes USE_AUTOCONF= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share \ - --datadir=${PREFIX}/share --with-readline -.if !defined(WITHOUT_GNOME) -CONFIGURE_ARGS+= --enable-capplet +CONFIGURE_ARGS= --with-readline +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" + +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--enable-capplet PLIST_SUB+= GNOME:="" .else -CONFIGURE_ARGS+= --disable-capplet \ - --disable-gnome-widgets \ - --without-gdk-pixbuf +CONFIGURE_ARGS+=--disable-capplet \ + --disable-gnome-widgets \ + --without-gdk-pixbuf PLIST_SUB+= GNOME:="@comment " .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - LIBS="-L${LOCALBASE}/lib -lxpg4" pre-patch: - find ${WRKSRC} \( -name "*.jl" -or -name "*.jl.in" \) | \ + @${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' + @find ${WRKSRC} \( -name "*.jl" -or -name "*.jl.in" \) | \ xargs ${GREP} -l "../locale" | \ xargs ${PERL} -pi -e "s|\.\./locale|../../../locale|g" @@ -56,4 +59,4 @@ post-install: --entry="* sawfish: (sawfish). sawfish programming manual" \ ${PREFIX}/info/sawfish.info ${PREFIX}/info/dir -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-wm/sawfish/files/patch-ac b/x11-wm/sawfish/files/patch-ac index b2d9d3adef51..438809a9f989 100644 --- a/x11-wm/sawfish/files/patch-ac +++ b/x11-wm/sawfish/files/patch-ac @@ -5,7 +5,7 @@ sawfishdir='${datadir}/sawfish' lispdir='${sawfishdir}/${version}/lisp' -localedir='${sawfishdir}/${version}/locale' -+localedir='${datadir}/locale' ++localedir='${prefix}/share/locale' sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}' dnl Checks for programs. diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile index 5d841c6e80b0..60fb9dce3397 100644 --- a/x11-wm/sawfish2/Makefile +++ b/x11-wm/sawfish2/Makefile @@ -13,41 +13,44 @@ MASTER_SITE_SUBDIR= sawmill MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - Imlib.5:${PORTSDIR}/graphics/imlib \ - rep.10:${PORTSDIR}/lang/librep -.if !defined(WITHOUT_GNOME) -LIB_DEPENDS+= capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter -.endif +LIB_DEPENDS= rep.10:${PORTSDIR}/lang/librep BUILD_DEPENDS= ${X11BASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk RUN_DEPENDS= ${X11BASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - PLIST_SUB= GNUHOST=${ARCH}--freebsd${OSREL} VERSION=${PORTVERSION} USE_X_PREFIX= yes USE_GMAKE= yes +USE_IMLIB= yes +WANT_GNOME= yes USE_AUTOCONF= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share \ - --datadir=${PREFIX}/share --with-readline -.if !defined(WITHOUT_GNOME) -CONFIGURE_ARGS+= --enable-capplet +CONFIGURE_ARGS= --with-readline +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" + +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--enable-capplet PLIST_SUB+= GNOME:="" .else -CONFIGURE_ARGS+= --disable-capplet \ - --disable-gnome-widgets \ - --without-gdk-pixbuf +CONFIGURE_ARGS+=--disable-capplet \ + --disable-gnome-widgets \ + --without-gdk-pixbuf PLIST_SUB+= GNOME:="@comment " .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - LIBS="-L${LOCALBASE}/lib -lxpg4" pre-patch: - find ${WRKSRC} \( -name "*.jl" -or -name "*.jl.in" \) | \ + @${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' + @find ${WRKSRC} \( -name "*.jl" -or -name "*.jl.in" \) | \ xargs ${GREP} -l "../locale" | \ xargs ${PERL} -pi -e "s|\.\./locale|../../../locale|g" @@ -56,4 +59,4 @@ post-install: --entry="* sawfish: (sawfish). sawfish programming manual" \ ${PREFIX}/info/sawfish.info ${PREFIX}/info/dir -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-wm/sawfish2/files/patch-ac b/x11-wm/sawfish2/files/patch-ac index b2d9d3adef51..438809a9f989 100644 --- a/x11-wm/sawfish2/files/patch-ac +++ b/x11-wm/sawfish2/files/patch-ac @@ -5,7 +5,7 @@ sawfishdir='${datadir}/sawfish' lispdir='${sawfishdir}/${version}/lisp' -localedir='${sawfishdir}/${version}/locale' -+localedir='${datadir}/locale' ++localedir='${prefix}/share/locale' sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}' dnl Checks for programs. diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile index 404233d2de4b..07ec1f74de9a 100644 --- a/x11-wm/windowmaker-i18n/Makefile +++ b/x11-wm/windowmaker-i18n/Makefile @@ -27,6 +27,7 @@ USE_BZIP2= yes USE_PERL5= yes USE_X_PREFIX= yes USE_XPM= yes +WANT_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= X11BASE=${X11BASE} LOCALBASE=${LOCALBASE} \ @@ -49,25 +50,24 @@ MASTER_SITES+= ftp://muse.brain.riken.go.jp/pub/ja.po/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${JA_CATALOGFILE}${EXTRACT_SUFX} .endif -.if defined(WITH_GNOME) +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) CONFIGURE_ARGS+= --enable-gnome .endif + .if defined(WITH_KDE) CONFIGURE_ARGS+= --enable-kde -.endif - +.else .SILENT: -.if !defined(WITH_KDE) && !defined(WITH_GNOME) pre-extract: - ${ECHO} "You can add hooks for Gnome and KDE by defining WITH_GNOME and/or WITH_KDE" + @${ECHO} "You can add hooks for KDE by defining WITH_KDE" .endif post-extract: @cd ${WRKSRC} && \ ${TAR} xfz libwmfun-0.0.3.tar.gz -.include <bsd.port.pre.mk> - 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 diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index ee77eee9a08a..b343b31d1116 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -23,14 +23,16 @@ LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ PropList.2:${PORTSDIR}/devel/libPropList USE_BZIP2= yes +USE_PERL5= yes USE_X_PREFIX= yes USE_XPM= yes +WANT_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= X11BASE=${X11BASE} LIBS=-L${LOCALBASE}/lib \ CPPFLAGS=-I${LOCALBASE}/include CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \ - --with-nlsdir=${LOCALBASE}/lib/locale \ + --with-nlsdir=${PREFIX}/share/locale \ --with-libs-from="-L${LOCALBASE}/lib" \ --with-incs-from="-I${LOCALBASE}/include" \ --with-appspath="${PREFIX}/GNUstep/Apps" \ @@ -41,25 +43,24 @@ MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x \ DATAFILES= WindowMaker-extra-0.1.tar.bz2 -.if defined(WITH_GNOME) +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) CONFIGURE_ARGS+= --enable-gnome .endif .if defined(WITH_KDE) CONFIGURE_ARGS+= --enable-kde +.else +.SILENT: +pre-extract: + @${ECHO} "You can add hooks for KDE by defining WITH_KDE" .endif .if defined(WITH_SINGLE_ICON) CONFIGURE_ARGS+= --enable-single-icon .endif -.SILENT: - -.if !defined(WITH_KDE) && !defined(WITH_GNOME) -pre-extract: - ${ECHO} "You can add hooks for Gnome and KDE by defining WITH_GNOME and/or WITH_KDE" -.endif - post-extract: @cd ${WRKSRC} && \ ${TAR} xfz libwmfun-0.0.3.tar.gz @@ -77,4 +78,4 @@ post-install: ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET} ${MKDIR} ${PREFIX}/share/WindowMaker/Sounds -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile index 123ad2e48f0f..a7b920b5d896 100644 --- a/x11-wm/wmakerconf/Makefile +++ b/x11-wm/wmakerconf/Makefile @@ -12,34 +12,33 @@ MASTER_SITES= http://ulli.linuxave.net/wmakerconf/ MAINTAINER= dr@domix.de -RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker \ - rpm:${PORTSDIR}/misc/rpm \ - bunzip2:${PORTSDIR}/archivers/bzip2 \ - wget:${PORTSDIR}/ftp/wget -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - Imlib.5:${PORTSDIR}/graphics/imlib \ - PropList.2:${PORTSDIR}/devel/libPropList \ +RUN_DEPENDS= rpm:${PORTSDIR}/misc/rpm \ + bunzip2:${PORTSDIR}/archivers/bzip2 +LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ png.4:${PORTSDIR}/graphics/png \ wraster.3:${PORTSDIR}/x11-wm/windowmaker \ wmfun.0:${PORTSDIR}/x11-wm/windowmaker -BUILD_DEPENDS= bunzip2:${PORTSDIR}/archivers/bzip2 \ - wget:${PORTSDIR}/ftp/wget -GNU_CONFIGURE= yes -USE_GMAKE= yes USE_BZIP2= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes +USE_PERL5= yes +USE_GMAKE= yes USE_XPM= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_IMLIB= yes +WANT_GNOME= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-wmakerdir="${X11BASE}/share/WindowMaker" + +.include <bsd.port.pre.mk> -.if exists(${X11BASE}/bin/gnome-config) -RUN_DEPENDS+= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter +.if defined(HAVE_GNOME) +BUILD_DEPENDS+= gnome2wmaker:${PORTSDIR}/x11-wm/gnome2wmaker +RUN_DEPENDS+= gnome2wmaker:${PORTSDIR}/x11-wm/gnome2wmaker PLIST_SUB+= GNOME:="" .else PLIST_SUB+= GNOME:="@comment " .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-wm/wmakerconf/files/patch-aa b/x11-wm/wmakerconf/files/patch-aa new file mode 100644 index 000000000000..0c4a504e26da --- /dev/null +++ b/x11-wm/wmakerconf/files/patch-aa @@ -0,0 +1,10 @@ +--- scripts/wget.pl.orig Thu Mar 16 09:11:14 2000 ++++ scripts/wget.pl Fri Apr 7 22:06:14 2000 +@@ -1,6 +1,6 @@ + #! /usr/bin/perl + quit ("Wget not installed") if $wwwget eq ""; + +-$rc = system ("$wwwget --quiet -c --tries=0 -O$tmpfile '$url'"); ++$rc = system ("$wwwget --q -o $tmpfile '$url'"); + + quit ("HTTP response error.") if $rc; diff --git a/x11-wm/wmakerconf/files/patch-ab b/x11-wm/wmakerconf/files/patch-ab index 8698e267b2fc..54de78f5e6dc 100644 --- a/x11-wm/wmakerconf/files/patch-ab +++ b/x11-wm/wmakerconf/files/patch-ab @@ -1,11 +1,11 @@ ---- configure.orig Thu Jun 29 10:44:12 2000 -+++ configure Thu Jun 29 10:44:16 2000 -@@ -964,7 +964,7 @@ - echo $ac_n "checking for GNOME apps directory""... $ac_c" 1>&6 - echo "configure:966: checking for GNOME apps directory" >&5 - GNOMEAPPS=`$gnomecfg --datadir` -- GNOMEAPPS="$GNOMEAPPS/gnome/apps/Settings" -+ GNOMEAPPS="$GNOMEAPPS/apps/Settings" - GNOMEAPP="wmakerconf.desktop" - echo "$ac_t""$GNOMEAPPS" 1>&6 - fi +--- configure.orig Sun Jan 23 06:43:09 2000 ++++ configure Mon Jan 31 01:07:06 2000 +@@ -2807,7 +2807,7 @@ + www_support="yes" + else + echo "$ac_t"""no"" 1>&6 +- for ac_prog in lynx wget ++ for ac_prog in lynx fetch + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 |