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

* Don't use bundled strlcat or strlcpy

Browse Source 
* Use the right config dir, allowing something else than /etc as side effect
* Reorder entries
* Bump package

jasper@ ok; maintainer is on holidays but jasper believes he'll be ok
with this, so commiting with his bless.
This commit is contained in:
fgsch 2007-10-13 16:05:13 +00:00
parent 3a366c4880
commit c56c35159a
3 changed files with 61 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
www/mplayerplug-in/Makefile
View File

@ -1,14 +1,15 @@
# $OpenBSD: Makefile,v 1.1.1.1 2007/10/12 19:57:56 jasper Exp $
# $OpenBSD: Makefile,v 1.2 2007/10/13 16:05:13 fgsch Exp $
SHARED_ONLY= Yes
COMMENT= embedded video player for mozilla
DISTNAME= mplayerplug-in-3.45
PKGNAME= ${DISTNAME}p0
CATEGORIES= www
HOMEPAGE= http://mplayerplug-in.sourceforge.net/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mplayerplug-in/}
MAINTAINER= Gleydson Soares <gsoares@trusted.com.br>
@ -24,21 +25,22 @@ WANTLIB= ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama \
gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0 \
pangocairo-1.0 pangoft2-1.0 png z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mplayerplug-in/}
MODULES= devel/gettext
USE_GMAKE= yes
USE_X11= yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${X11BASE}/include -DBSD" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_ARGS= --enable-gmp
BUILD_DEPENDS= :mozilla-firefox-devel-*:www/mozilla-firefox,-devel
RUN_DEPENDS= ::www/mozilla-firefox \
::x11/mplayer
USE_X11= yes
USE_GMAKE= yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-gmp
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${X11BASE}/include -DBSD" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
NO_REGRESS= Yes
WRKDIST= ${WRKDIR}/mplayerplug-in/
@ -51,6 +53,10 @@ COMPONENTS= mplayerplug-in.xpt mplayerplug-in-wmp.xpt \
mplayerplug-in-qt.xpt mplayerplug-in-rm.xpt \
mplayerplug-in-gmp.xpt mplayerplug-in-dvx.xpt
post-patch:
@perl -pi -e 's|/etc|${SYSCONFDIR}/mplayerplug-in|g' \
${WRKDIST}/Source/plugin-setup.cpp
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/mozilla-firefox/plugins
${INSTALL_DATA_DIR} ${PREFIX}/mozilla-firefox/components

35
www/mplayerplug-in/patches/patch-Makefile_in
View File

@ -1,6 +1,35 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/10/12 19:57:56 jasper Exp $
--- Makefile.in.orig Wed Oct 10 17:09:01 2007
+++ Makefile.in Wed Oct 10 17:09:29 2007
$OpenBSD: patch-Makefile_in,v 1.2 2007/10/13 16:05:13 fgsch Exp $
--- Makefile.in.orig Fri Jan 19 19:17:53 2007
+++ Makefile.in Sat Oct 13 16:34:24 2007
@@ -17,22 +17,22 @@ LDFLAGS= @LDFLAGS@ @LDFLAGS64@ @LIBS@ @XEXT_LIBS@ @XPM
LIBOBJS= @LIBOBJS@
OBJ= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \
plugin-support.o plugin-setup.o plugin-list.o plugin-ui.o \
- plugin-threads.o strlcpy.o strlcat.o $(LIBOBJS)
+ plugin-threads.o $(LIBOBJS)
OBJ_WMP= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \
plugin-support.o plugin-setup-wmp.o plugin-list.o plugin-ui.o \
- plugin-threads.o strlcpy.o strlcat.o $(LIBOBJS)
+ plugin-threads.o $(LIBOBJS)
OBJ_QT= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \
plugin-support.o plugin-setup-qt.o plugin-list.o plugin-ui.o \
- plugin-threads.o strlcpy.o strlcat.o $(LIBOBJS)
+ plugin-threads.o $(LIBOBJS)
OBJ_RM= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \
plugin-support.o plugin-setup-rm.o plugin-list.o plugin-ui.o \
- plugin-threads.o strlcpy.o strlcat.o $(LIBOBJS)
+ plugin-threads.o $(LIBOBJS)
OBJ_GMP= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \
plugin-support.o plugin-setup-gmp.o plugin-list.o plugin-ui.o \
- plugin-threads.o strlcpy.o strlcat.o $(LIBOBJS)
+ plugin-threads.o $(LIBOBJS)
OBJ_DVX= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \
plugin-support.o plugin-setup-dvx.o plugin-list.o plugin-ui.o \
- plugin-threads.o strlcpy.o strlcat.o $(LIBOBJS)
+ plugin-threads.o $(LIBOBJS)
INSTALL = @INSTALL@
SHAREDTARGET=mplayerplug-in
NP_HEADERS= include/npplat.h include/pluginbase.h
@@ -135,7 +135,7 @@ strlcpy.o: extras/strlcpy.c $(HEADERS)
clean:

12
www/mplayerplug-in/patches/patch-configure Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.1 2007/10/13 16:05:13 fgsch Exp $
--- configure.orig Sat Oct 13 16:33:26 2007
+++ configure Sat Oct 13 16:33:54 2007
@@ -9534,7 +9534,7 @@ done
#AC_REPLACE_FUNCS([memmem strlcpy strlcat])
-for ac_func in memmem
+for ac_func in memmem strlcpy strlcat
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5