aboutsummaryrefslogtreecommitdiff
path: root/mbone
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2007-01-30 10:25:34 +0000
committerPav Lucistnik <pav@FreeBSD.org>2007-01-30 10:25:34 +0000
commit2df76eb0a73bb59d817aa60758a5f10e3e544c3b (patch)
tree07e10c49034b87755dafb03956ad93c5363e0bb7 /mbone
parent1c97f613254a72e0ae97ea8d817ebe38096d6949 (diff)
downloadports-2df76eb0a73bb59d817aa60758a5f10e3e544c3b.tar.gz
ports-2df76eb0a73bb59d817aa60758a5f10e3e544c3b.zip
- Remove support for a.out format and PORTOBJFORMAT variable from individual
ports With hat: portmgr
Notes
Notes: svn path=/head/; revision=183698
Diffstat (limited to 'mbone')
-rw-r--r--mbone/vic/files/patch-configure.in23
-rw-r--r--mbone/wb/Makefile9
2 files changed, 15 insertions, 17 deletions
diff --git a/mbone/vic/files/patch-configure.in b/mbone/vic/files/patch-configure.in
index a603fa09b660..4d687b5fd931 100644
--- a/mbone/vic/files/patch-configure.in
+++ b/mbone/vic/files/patch-configure.in
@@ -1,16 +1,19 @@
---- configure.in.org Mon May 7 15:30:01 2001
-+++ configure.in Mon May 7 15:31:32 2001
-@@ -72,8 +72,7 @@
- if test -r /usr/include/linux/videodev.h ; then
- V_OBJ_GRABBER="video/grabber-video4linux.o $V_OBJ_GRABBER"
+--- configure.in.orig Thu Jul 10 16:55:43 2003
++++ configure.in Sat Jan 27 01:57:23 2007
+@@ -76,12 +76,6 @@
+ V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-video4linux.o"
+ fi
fi
-#if test -r /usr/local/lib/libspigot.a -a ${PORTOBJFORMAT} != elf; then
-if test -r /usr/local/lib/libspigot.a ; then
-+if test -r /usr/local/lib/libspigot.a -a ${PORTOBJFORMAT} != elf; then
- V_OBJ_GRABBER="video/grabber-spigot.o $V_OBJ_GRABBER"
- V_LIB_GRABBER="$V_LIB_GRABBER -lspigot"
- V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I/usr/local/include"
-@@ -249,6 +248,7 @@
+- V_OBJ_GRABBER="video/grabber-spigot.o $V_OBJ_GRABBER"
+- V_LIB_GRABBER="$V_LIB_GRABBER -lspigot"
+- V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I/usr/local/include"
+-fi
+ if test "$qcamdir" != "" ; then
+ V_OBJ_GRABBER="video/grabber-qcam.o $V_OBJ_GRABBER"
+ V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I$qcamdir"
+@@ -254,6 +248,7 @@
else
V_DEFINE="$V_DEFINE -DFreeBSD"
fi
diff --git a/mbone/wb/Makefile b/mbone/wb/Makefile
index 4f865b3f9338..83a0ce98bbd0 100644
--- a/mbone/wb/Makefile
+++ b/mbone/wb/Makefile
@@ -17,16 +17,11 @@ COMMENT= A shared drawing (whiteboard) tool using multicast
NO_WRKSUBDIR= yes
NO_BUILD= yes
USE_X_PREFIX= yes
+STRIP=
# ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do.
USE_GHOSTSCRIPT_RUN= yes
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-STRIP=
-.endif
-
pre-everything::
.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
@${ECHO} ""
@@ -45,4 +40,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/lblwb.ps ${PREFIX}/share/doc/wb
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>