cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Maintenance update to logjam 4.5.3, in prevision of newer gtk2.

Browse Source 
Cleanup Makefile, update PLIST, fix dependencies while here.

ok ajacoutot@
This commit is contained in:
landry 2008-10-28 15:20:50 +00:00
parent 868deda82f
commit 8a16896bf5
5 changed files with 55 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
misc/logjam/Makefile
View File

@ -1,15 +1,13 @@
# $OpenBSD: Makefile,v 1.18 2008/06/05 00:53:22 sthen Exp $
# $OpenBSD: Makefile,v 1.19 2008/10/28 15:20:50 landry Exp $
COMMENT = gtk livejournal client
VERSION= 4.0.1
DISTNAME= logjam-${VERSION}
PKGNAME= ${DISTNAME}p8
DISTNAME = logjam-4.5.3
CATEGORIES = misc x11
HOMEPAGE = http://logjam.danga.com/
# GPL
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
@ -17,25 +15,27 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB = X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xcomposite \
Xdamage Xrandr Xrender atk-1.0 c cairo crypto expat \
fontconfig freetype glitz idn m pango-1.0 \
pangocairo-1.0 pangoft2-1.0 pixman-1 png ssl z
fontconfig freetype glib-2.0 glitz gmodule-2.0 \
gobject-2.0 gthread-2.0 idn m pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pcre pixman-1 png pthread ssl z
MASTER_SITES = http://logjam.danga.com/download/
EXTRACT_SUFX = .tar.bz2
MODULES = devel/gettext
LIB_DEPENDS= glib-2.0,gobject-2.0,gmodule-2.0::devel/glib2 \
gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \
LIB_DEPENDS = gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \
sqlite3::databases/sqlite3 \
curl.>=2::net/curl \
xml2::textproc/libxml
PORTHOME= ${WRKDIR}
CONFIGURE_ARGS+= --without-gnome
CONFIGURE_ARGS+= --with-xmms=runtime
RUN_DEPENDS = ::devel/desktop-file-utils
USE_X11 = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --without-gnome \
--without-librsvg \
--without-gtkspell
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

10
misc/logjam/distinfo
View File

@ -1,5 +1,5 @@
MD5 (logjam-4.0.1.tar.gz) = 12FtXgOt2LinnYRLXhHxvg==
RMD160 (logjam-4.0.1.tar.gz) = kVuDt3IncsZyKmpHA40TyGEQDhI=
SHA1 (logjam-4.0.1.tar.gz) = xo4dIK4AMOAOHBoME3W5/MdHkJU=
SHA256 (logjam-4.0.1.tar.gz) = qFCDL6+oI8rnUsiAgZze9v3GyM9xOykfwPS9OV/EzT8=
SIZE (logjam-4.0.1.tar.gz) = 256368
MD5 (logjam-4.5.3.tar.bz2) = SAksAOH0Dr7kMbTgBxricw==
RMD160 (logjam-4.5.3.tar.bz2) = LINBeK43yVYhgUuBhSxSjyELrtI=
SHA1 (logjam-4.5.3.tar.bz2) = Bc/pKwRpb6S3229L2R4/W1l1e+o=
SHA256 (logjam-4.5.3.tar.bz2) = rnbCLDH3znXfoj2UUQsEI7zzAqYi1NI5HEMqEnxQAYQ=
SIZE (logjam-4.5.3.tar.bz2) = 748831

22
misc/logjam/patches/patch-configure
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2004/11/17 23:47:13 espie Exp $
--- configure.orig Thu Nov 18 00:41:48 2004
+++ configure Thu Nov 18 00:44:12 2004
@@ -1502,8 +1502,10 @@ ac_config_commands="$ac_config_commands
BASEMODULES="gtk+-2.0 libxml-2.0"
HAVE_GTKSPELL=yes
+: ${WANT_GTKSPELL:=no}
succeeded=no
+if test $WANT_GTKSPELL = yes; then
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -1591,6 +1593,7 @@ echo "${ECHO_T}$LOGJAM_LIBS" >&6
fi
fi
+fi
if test $succeeded = yes; then
:
else

37
misc/logjam/patches/patch-src_ljtypes_c
View File

@ -1,37 +0,0 @@
$OpenBSD: patch-src_ljtypes_c,v 1.2 2004/01/02 22:09:23 espie Exp $
--- src/ljtypes.c.orig 2002-12-04 05:55:54.000000000 +0100
+++ src/ljtypes.c 2004-01-02 23:03:20.000000000 +0100
@@ -279,12 +279,12 @@ addtextchildenc(xmlDocPtr doc, xmlNodePt
#define XML_ENTRY_META_GET(A) \
if ((!strcmp(cur->name, #A))) { \
- entry->##A = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); \
+ entry->A = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); \
}
#define XML_ENTRY_META_SET(A) \
- if (entry->##A) \
- addtextchildenc(doc, root, #A, entry->##A);
+ if (entry->A) \
+ addtextchildenc(doc, root, #A, entry->A);
static xmlDocPtr
entry_to_xml(Entry *entry) {
@@ -443,7 +443,7 @@ static gboolean
rfc822_load_entry(const char *key, const char *val, Entry *entry) {
#define RFC822_GET(A) \
if (g_ascii_strcasecmp(key, #A) == 0) { \
- entry->##A = g_strdup(val); \
+ entry->A = g_strdup(val); \
}
RFC822_GET(subject)
@@ -662,7 +662,7 @@ entry_from_user_editor(const char *filen
gchar *editor =
(getenv("VISUAL") ? getenv("VISUAL") :
getenv("EDITOR") ? getenv("EDITOR") : "vi");
- execlp(editor, editor, filename, NULL);
+ execlp(editor, editor, filename, (void *)NULL);
_exit(0);
}

33
misc/logjam/pkg/PLIST
View File

@ -1,10 +1,25 @@
@comment $OpenBSD: PLIST,v 1.3 2005/09/05 12:42:33 espie Exp $
bin/logjam
@comment $OpenBSD: PLIST,v 1.4 2008/10/28 15:20:50 landry Exp $
@bin bin/logjam
@man man/man1/logjam.1
@comment share/locale/en_GB/
@comment share/locale/en_GB/LC_MESSAGES/
@comment share/locale/en_GB/LC_MESSAGES/logjam.mo
@comment share/locale/he/LC_MESSAGES/logjam.mo
@comment share/locale/ru_RU/
@comment share/locale/ru_RU/LC_MESSAGES/
@comment share/locale/ru_RU/LC_MESSAGES/logjam.mo
share/applications/logjam.desktop
share/locale/de/LC_MESSAGES/logjam.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/logjam.mo
share/locale/en_US.UTF-8/
share/locale/en_US.UTF-8/LC_MESSAGES/
share/locale/en_US.UTF-8/LC_MESSAGES/logjam.mo
share/locale/es/LC_MESSAGES/logjam.mo
share/locale/he/LC_MESSAGES/logjam.mo
share/locale/ja/LC_MESSAGES/logjam.mo
share/locale/ru_RU/
share/locale/ru_RU/LC_MESSAGES/
share/locale/ru_RU/LC_MESSAGES/logjam.mo
share/locale/uk_UA/
share/locale/uk_UA/LC_MESSAGES/
share/locale/uk_UA/LC_MESSAGES/logjam.mo
share/pixmaps/
share/pixmaps/logjam_goat.png
share/pixmaps/logjam_pencil.png
@exec %D/bin/update-desktop-database
@unexec %D/bin/update-desktop-database